diff --git a/django/db/backends/ado_mssql/base.py b/django/db/backends/ado_mssql/base.py index 33800980a8..17c83195c5 100644 --- a/django/db/backends/ado_mssql/base.py +++ b/django/db/backends/ado_mssql/base.py @@ -89,7 +89,7 @@ class DatabaseWrapper(local): allows_group_by_ordinal = True allows_unique_and_pk = True -returns_dates_as_strings = False +needs_datetime_string_cast = True supports_constraints = True uses_case_insensitive_names = False diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py index e5756dc4b0..38a385208a 100644 --- a/django/db/backends/mysql/base.py +++ b/django/db/backends/mysql/base.py @@ -132,7 +132,7 @@ class DatabaseWrapper(local): allows_group_by_ordinal = True allows_unique_and_pk = True -returns_dates_as_strings = True # MySQLdb requires a typecast for dates +needs_datetime_string_cast = True # MySQLdb requires a typecast for dates supports_constraints = True uses_case_insensitive_names = False diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py index 4e6314d32e..d277e5b6f7 100644 --- a/django/db/backends/oracle/base.py +++ b/django/db/backends/oracle/base.py @@ -61,7 +61,7 @@ class DatabaseWrapper(local): allows_group_by_ordinal = False allows_unique_and_pk = False # Suppress UNIQUE/PK for Oracle (ORA-02259) -returns_dates_as_strings = False +needs_datetime_string_cast = False supports_constraints = True uses_case_insensitive_names = True diff --git a/django/db/backends/oracle/creation.py b/django/db/backends/oracle/creation.py index c1387a7ff8..c3326cf843 100644 --- a/django/db/backends/oracle/creation.py +++ b/django/db/backends/oracle/creation.py @@ -81,6 +81,8 @@ def destroy_test_db(settings, connection, backend, old_database_name, verbosity= settings.DATABASE_NAME = old_database_name #settings.DATABASE_USER = 'old_user' #settings.DATABASE_PASSWORD = 'old_password' + settings.DATABASE_USER = 'mboersma' + settings.DATABASE_PASSWORD = 'password' cursor = connection.cursor() time.sleep(1) # To avoid "database is being accessed by other users" errors. diff --git a/django/db/backends/postgresql/base.py b/django/db/backends/postgresql/base.py index fd3ef87c45..db92ef5df0 100644 --- a/django/db/backends/postgresql/base.py +++ b/django/db/backends/postgresql/base.py @@ -63,7 +63,7 @@ class DatabaseWrapper(local): allows_group_by_ordinal = True allows_unique_and_pk = True -returns_dates_as_strings = False +needs_datetime_string_cast = True supports_constraints = True uses_case_insensitive_names = False diff --git a/django/db/backends/postgresql_psycopg2/base.py b/django/db/backends/postgresql_psycopg2/base.py index b2722d8d99..1392db7e13 100644 --- a/django/db/backends/postgresql_psycopg2/base.py +++ b/django/db/backends/postgresql_psycopg2/base.py @@ -64,7 +64,7 @@ class DatabaseWrapper(local): allows_group_by_ordinal = True allows_unique_and_pk = True -returns_dates_as_strings = False +needs_datetime_string_cast = False supports_constraints = True uses_case_insensitive_names = True diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py index c92e83a6ad..dd08011e2e 100644 --- a/django/db/backends/sqlite3/base.py +++ b/django/db/backends/sqlite3/base.py @@ -100,7 +100,7 @@ class SQLiteCursorWrapper(Database.Cursor): allows_group_by_ordinal = True allows_unique_and_pk = True -returns_dates_as_strings = True +needs_datetime_string_cast = True supports_constraints = False uses_case_insensitive_names = False diff --git a/django/db/models/query.py b/django/db/models/query.py index 53a17c23d7..231c5c12b0 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -567,7 +567,7 @@ class DateQuerySet(QuerySet): stmt = fmt % (date_trunc_sql, sql, group_by, self._order) cursor = connection.cursor() cursor.execute(stmt, params) - if backend.returns_dates_as_strings: + if backend.needs_datetime_string_cast: return [typecast_timestamp(str(row[0])) for row in cursor.fetchall()] else: return [row[0] for row in cursor.fetchall()]