diff options
| author | Shai Berger <shai@platonix.com> | 2014-05-28 21:16:24 +0300 |
|---|---|---|
| committer | Shai Berger <shai@platonix.com> | 2014-05-28 21:26:08 +0300 |
| commit | b8b1fbd4c1c42d3cf84d67c1923716842025680b (patch) | |
| tree | 641c2d3131ddd5b6ad1de46f912819509c14e992 | |
| parent | 5f135e6a0b77e76649aac48434740cc703e843ff (diff) | |
[1.7.x] Set straight the sense of 'uppercases_column_names' feature flag
| -rw-r--r-- | django/db/backends/__init__.py | 2 | ||||
| -rw-r--r-- | django/db/backends/oracle/base.py | 2 | ||||
| -rw-r--r-- | tests/inspectdb/tests.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/django/db/backends/__init__.py b/django/db/backends/__init__.py index 3ad1440bda..90d99b14cc 100644 --- a/django/db/backends/__init__.py +++ b/django/db/backends/__init__.py @@ -738,7 +738,7 @@ class BaseDatabaseFeatures(object): # Suffix for backends that don't support "SELECT xxx;" queries. bare_select_suffix = '' - 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) |