summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShai Berger <shai@platonix.com>2014-05-28 21:16:24 +0300
committerShai Berger <shai@platonix.com>2014-05-28 21:16:24 +0300
commit69337d485cd3f8cc938bebbf2d01121e0d688889 (patch)
tree207b977d587bb5b03a274f95b75ae3a2dc67f010
parent7e3cf3cfd27e53ced0a1fc65a02849f78a292d3d (diff)
Set straight the sense of 'uppercases_column_names' feature flag
-rw-r--r--django/db/backends/__init__.py2
-rw-r--r--django/db/backends/oracle/base.py2
-rw-r--r--tests/inspectdb/tests.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/django/db/backends/__init__.py b/django/db/backends/__init__.py
index 1b12a41caf..3868b41e0d 100644
--- a/django/db/backends/__init__.py
+++ b/django/db/backends/__init__.py
@@ -649,7 +649,7 @@ class BaseDatabaseFeatures(object):
# If NULL is implied on columns without needing to be explicitly specified
implied_column_null = False
- uppercases_column_names = True
+ uppercases_column_names = False
def __init__(self, connection):
self.connection = connection
diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py
index 20378fc2c1..d46e770437 100644
--- a/django/db/backends/oracle/base.py
+++ b/django/db/backends/oracle/base.py
@@ -120,7 +120,7 @@ class DatabaseFeatures(BaseDatabaseFeatures):
connection_persists_old_columns = True
closed_cursor_error_class = InterfaceError
bare_select_suffix = " FROM DUAL"
- uppercases_column_names = False
+ uppercases_column_names = True
class DatabaseOperations(BaseDatabaseOperations):
diff --git a/tests/inspectdb/tests.py b/tests/inspectdb/tests.py
index 92a5a02dbd..3e587e45bd 100644
--- a/tests/inspectdb/tests.py
+++ b/tests/inspectdb/tests.py
@@ -176,7 +176,7 @@ class InspectDBTestCase(TestCase):
out = StringIO()
call_command('inspectdb', stdout=out)
output = out.getvalue()
- base_name = 'field' if not connection.features.uppercases_column_names else 'Field'
+ base_name = 'Field' if not connection.features.uppercases_column_names else 'field'
self.assertIn("field = models.IntegerField()", output)
self.assertIn("field_field = models.IntegerField(db_column='%s_')" % base_name, output)
self.assertIn("field_field_0 = models.IntegerField(db_column='%s__')" % base_name, output)