Changeset 5963

Timestamp:

08/19/07 19:15:53 (1 year ago)

Author:

adrian

Message:

Refactored get_sql_flush() to DatabaseOperations?.sql_flush(). Refs #5106

Files:

• django/trunk/django/core/management/sql.py (modified) (1 diff)
• django/trunk/django/db/backends/ado_mssql/base.py (modified) (1 diff)
• django/trunk/django/db/backends/dummy/base.py (modified) (1 diff)
• django/trunk/django/db/backends/__init__.py (modified) (1 diff)
• django/trunk/django/db/backends/mysql/base.py (modified) (2 diffs)
• django/trunk/django/db/backends/mysql_old/base.py (modified) (2 diffs)
• django/trunk/django/db/backends/oracle/base.py (modified) (2 diffs)
• django/trunk/django/db/backends/postgresql/base.py (modified) (2 diffs)
• django/trunk/django/db/backends/postgresql_psycopg2/base.py (modified) (2 diffs)
• django/trunk/django/db/backends/sqlite3/base.py (modified) (2 diffs)

django/trunk/django/core/management/sql.py

@@ -179 +179 @@
-
-def sql_flush(style):
-
-backend
-backend.get_
+.
+connection
+connection.ops.
-    return statements
-

django/trunk/django/db/backends/ado_mssql/base.py

@@ -110 +110 @@
-    return "ON %s" % quote_name(tablespace)
-
-def get_sql_flush(style, tables, sequences):
-    """Return a list of SQL statements required to remove all data from
-    all tables in the database (without actually removing the tables
-    themselves) and put the database in an empty 'initial' state
-    """
-    # Return a list of 'TRUNCATE x;', 'TRUNCATE y;', 'TRUNCATE z;'... style SQL statements
-    # TODO - SQL not actually tested against ADO MSSQL yet!
-    # TODO - autoincrement indices reset required? See other get_sql_flush() implementations
-    sql_list = ['%s %s;' % \
-                (style.SQL_KEYWORD('TRUNCATE'),
-                 style.SQL_FIELD(quote_name(table))
-                 )  for table in tables]
-
-def get_sql_sequence_reset(style, model_list):
-    "Returns a list of the SQL statements to reset sequences for the given models."

django/trunk/django/db/backends/dummy/base.py

@@ -45 +45 @@
-dictfetchall = complain
-get_start_transaction_sql = complain
-get_sql_flush = complain
-get_sql_sequence_reset = complain
-

django/trunk/django/db/backends/__init__.py

@@ -140 +140 @@
-        """
-        return 'RANDOM()'
+
+    def sql_flush(self, style, tables, sequences):
+        """
+        Returns a list of SQL statements required to remove all data from
+        the given database tables (without actually removing the tables
+        themselves).
+
+        The `style` argument is a Style object as returned by either
+        color_style() or no_style() in django.core.management.color.
+        """
+        raise NotImplementedError()

django/trunk/django/db/backends/mysql/base.py

@@ -87 +87 @@
-    def random_function_sql(self):
-        return 'RAND()'
+
+    def sql_flush(self, style, tables, sequences):
+        # NB: The generated SQL below is specific to MySQL
+        # 'TRUNCATE x;', 'TRUNCATE y;', 'TRUNCATE z;'... style SQL statements
+        # to clear all tables of all data
+        if tables:
+            sql = ['SET FOREIGN_KEY_CHECKS = 0;']
+            for table in tables:
+                sql.append('%s %s;' % (style.SQL_KEYWORD('TRUNCATE'), style.SQL_FIELD(quote_name(table))))
+            sql.append('SET FOREIGN_KEY_CHECKS = 1;')
+
+            # 'ALTER TABLE table AUTO_INCREMENT = 1;'... style SQL statements
+            # to reset sequence indices
+            sql.extend(["%s %s %s %s %s;" % \
+                (style.SQL_KEYWORD('ALTER'),
+                 style.SQL_KEYWORD('TABLE'),
+                 style.SQL_TABLE(quote_name(sequence['table'])),
+                 style.SQL_KEYWORD('AUTO_INCREMENT'),
+                 style.SQL_FIELD('= 1'),
+                ) for sequence in sequences])
+            return sql
+        else:
+            return []
-
-class DatabaseWrapper(BaseDatabaseWrapper):
@@ -169 +192 @@
-    return "BEGIN;"
-
-def get_sql_flush(style, tables, sequences):
-    """Return a list of SQL statements required to remove all data from
-    all tables in the database (without actually removing the tables
-    themselves) and put the database in an empty 'initial' state
-
-    """
-    # NB: The generated SQL below is specific to MySQL
-    # 'TRUNCATE x;', 'TRUNCATE y;', 'TRUNCATE z;'... style SQL statements
-    # to clear all tables of all data
-    if tables:
-        sql = ['SET FOREIGN_KEY_CHECKS = 0;'] + \
-              ['%s %s;' % \
-                (style.SQL_KEYWORD('TRUNCATE'),
-                 style.SQL_FIELD(quote_name(table))
-                )  for table in tables] + \
-              ['SET FOREIGN_KEY_CHECKS = 1;']
-
-        # 'ALTER TABLE table AUTO_INCREMENT = 1;'... style SQL statements
-        # to reset sequence indices
-        sql.extend(["%s %s %s %s %s;" % \
-            (style.SQL_KEYWORD('ALTER'),
-             style.SQL_KEYWORD('TABLE'),
-             style.SQL_TABLE(quote_name(sequence['table'])),
-             style.SQL_KEYWORD('AUTO_INCREMENT'),
-             style.SQL_FIELD('= 1'),
-            ) for sequence in sequences])
-        return sql
-    else:
-        return []
-
-def get_sql_sequence_reset(style, model_list):
-    "Returns a list of the SQL statements to reset sequences for the given models."

django/trunk/django/db/backends/mysql_old/base.py

@@ -97 +97 @@
-    def random_function_sql(self):
-        return 'RAND()'
+
+    def sql_flush(self, style, tables, sequences):
+        # NB: The generated SQL below is specific to MySQL
+        # 'TRUNCATE x;', 'TRUNCATE y;', 'TRUNCATE z;'... style SQL statements
+        # to clear all tables of all data
+        if tables:
+            sql = ['SET FOREIGN_KEY_CHECKS = 0;']
+            for table in tables:
+                sql.append('%s %s;' % (style.SQL_KEYWORD('TRUNCATE'), style.SQL_FIELD(quote_name(table))))
+            sql.append('SET FOREIGN_KEY_CHECKS = 1;')
+
+            # 'ALTER TABLE table AUTO_INCREMENT = 1;'... style SQL statements
+            # to reset sequence indices
+            sql.extend(["%s %s %s %s %s;" % \
+                (style.SQL_KEYWORD('ALTER'),
+                 style.SQL_KEYWORD('TABLE'),
+                 style.SQL_TABLE(quote_name(sequence['table'])),
+                 style.SQL_KEYWORD('AUTO_INCREMENT'),
+                 style.SQL_FIELD('= 1'),
+                ) for sequence in sequences])
+            return sql
+        else:
+            return []
-
-class DatabaseWrapper(BaseDatabaseWrapper):
@@ -188 +211 @@
-    return "BEGIN;"
-
-def get_sql_flush(style, tables, sequences):
-    """Return a list of SQL statements required to remove all data from
-    all tables in the database (without actually removing the tables
-    themselves) and put the database in an empty 'initial' state
-
-    """
-    # NB: The generated SQL below is specific to MySQL
-    # 'TRUNCATE x;', 'TRUNCATE y;', 'TRUNCATE z;'... style SQL statements
-    # to clear all tables of all data
-    if tables:
-        sql = ['SET FOREIGN_KEY_CHECKS = 0;'] + \
-              ['%s %s;' % \
-                (style.SQL_KEYWORD('TRUNCATE'),
-                 style.SQL_FIELD(quote_name(table))
-                )  for table in tables] + \
-              ['SET FOREIGN_KEY_CHECKS = 1;']
-
-        # 'ALTER TABLE table AUTO_INCREMENT = 1;'... style SQL statements
-        # to reset sequence indices
-        sql.extend(["%s %s %s %s %s;" % \
-            (style.SQL_KEYWORD('ALTER'),
-             style.SQL_KEYWORD('TABLE'),
-             style.SQL_TABLE(quote_name(sequence['table'])),
-             style.SQL_KEYWORD('AUTO_INCREMENT'),
-             style.SQL_FIELD('= 1'),
-            ) for sequence in sequences])
-        return sql
-    else:
-        return []
-
-def get_sql_sequence_reset(style, model_list):
-    "Returns a list of the SQL statements to reset sequences for the given models."

django/trunk/django/db/backends/oracle/base.py

@@ -73 +73 @@
-    def random_function_sql(self):
-        return "DBMS_RANDOM.RANDOM"
+
+    def sql_flush(self, style, tables, sequences):
+        # Return a list of 'TRUNCATE x;', 'TRUNCATE y;',
+        # 'TRUNCATE z;'... style SQL statements
+        if tables:
+            # Oracle does support TRUNCATE, but it seems to get us into
+            # FK referential trouble, whereas DELETE FROM table works.
+            sql = ['%s %s %s;' % \
+                    (style.SQL_KEYWORD('DELETE'),
+                     style.SQL_KEYWORD('FROM'),
+                     style.SQL_FIELD(quote_name(table))
+                     ) for table in tables]
+            # Since we've just deleted all the rows, running our sequence
+            # ALTER code will reset the sequence to 0.
+            for sequence_info in sequences:
+                table_name = sequence_info['table']
+                seq_name = get_sequence_name(table_name)
+                query = _get_sequence_reset_sql() % {'sequence':seq_name, 'table':quote_name(table_name)}
+                sql.append(query)
+            return sql
+        else:
+            return []
-
-class DatabaseWrapper(BaseDatabaseWrapper):
@@ -218 +240 @@
-        END;
-        /"""
-
-def get_sql_flush(style, tables, sequences):
-    """Return a list of SQL statements required to remove all data from
-    all tables in the database (without actually removing the tables
-    themselves) and put the database in an empty 'initial' state
-    """
-    # Return a list of 'TRUNCATE x;', 'TRUNCATE y;',
-    # 'TRUNCATE z;'... style SQL statements
-    if tables:
-        # Oracle does support TRUNCATE, but it seems to get us into
-        # FK referential trouble, whereas DELETE FROM table works.
-        sql = ['%s %s %s;' % \
-                (style.SQL_KEYWORD('DELETE'),
-                 style.SQL_KEYWORD('FROM'),
-                 style.SQL_FIELD(quote_name(table))
-                 ) for table in tables]
-        # Since we've just deleted all the rows, running our sequence
-        # ALTER code will reset the sequence to 0.
-        for sequence_info in sequences:
-            table_name = sequence_info['table']
-            seq_name = get_sequence_name(table_name)
-            query = _get_sequence_reset_sql() % {'sequence':seq_name,
-                                                 'table':quote_name(table_name)}
-            sql.append(query)
-        return sql
-    else:
-        return []
-
-def get_sequence_name(table):

django/trunk/django/db/backends/postgresql/base.py

@@ -73 +73 @@
-        cursor.execute("SELECT CURRVAL('\"%s_%s_seq\"')" % (table_name, pk_name))
-        return cursor.fetchone()[0]
+
+    def sql_flush(self, style, tables, sequences):
+        if tables:
+            if postgres_version[0] >= 8 and postgres_version[1] >= 1:
+                # Postgres 8.1+ can do 'TRUNCATE x, y, z...;'. In fact, it *has to*
+                # in order to be able to truncate tables referenced by a foreign
+                # key in any other table. The result is a single SQL TRUNCATE
+                # statement.
+                sql = ['%s %s;' % \
+                    (style.SQL_KEYWORD('TRUNCATE'),
+                     style.SQL_FIELD(', '.join([quote_name(table) for table in tables]))
+                )]
+            else:
+                # Older versions of Postgres can't do TRUNCATE in a single call, so
+                # they must use a simple delete.
+                sql = ['%s %s %s;' % \
+                        (style.SQL_KEYWORD('DELETE'),
+                         style.SQL_KEYWORD('FROM'),
+                         style.SQL_FIELD(quote_name(table))
+                         ) for table in tables]
+
+            # 'ALTER SEQUENCE sequence_name RESTART WITH 1;'... style SQL statements
+            # to reset sequence indices
+            for sequence_info in sequences:
+                table_name = sequence_info['table']
+                column_name = sequence_info['column']
+                if column_name and len(column_name)>0:
+                    # sequence name in this case will be <table>_<column>_seq
+                    sql.append("%s %s %s %s %s %s;" % \
+                        (style.SQL_KEYWORD('ALTER'),
+                        style.SQL_KEYWORD('SEQUENCE'),
+                        style.SQL_FIELD(quote_name('%s_%s_seq' % (table_name, column_name))),
+                        style.SQL_KEYWORD('RESTART'),
+                        style.SQL_KEYWORD('WITH'),
+                        style.SQL_FIELD('1')
+                        )
+                    )
+                else:
+                    # sequence name in this case will be <table>_id_seq
+                    sql.append("%s %s %s %s %s %s;" % \
+                        (style.SQL_KEYWORD('ALTER'),
+                         style.SQL_KEYWORD('SEQUENCE'),
+                         style.SQL_FIELD(quote_name('%s_id_seq' % table_name)),
+                         style.SQL_KEYWORD('RESTART'),
+                         style.SQL_KEYWORD('WITH'),
+                         style.SQL_FIELD('1')
+                         )
+                    )
+            return sql
+        else:
+            return []
-
-class DatabaseWrapper(BaseDatabaseWrapper):
@@ -134 +185 @@
-def get_start_transaction_sql():
-    return "BEGIN;"
-
-def get_sql_flush(style, tables, sequences):
-    """Return a list of SQL statements required to remove all data from
-    all tables in the database (without actually removing the tables
-    themselves) and put the database in an empty 'initial' state
-
-    """
-    if tables:
-        if postgres_version[0] >= 8 and postgres_version[1] >= 1:
-            # Postgres 8.1+ can do 'TRUNCATE x, y, z...;'. In fact, it *has to*
-            # in order to be able to truncate tables referenced by a foreign
-            # key in any other table. The result is a single SQL TRUNCATE
-            # statement.
-            sql = ['%s %s;' % \
-                (style.SQL_KEYWORD('TRUNCATE'),
-                 style.SQL_FIELD(', '.join([quote_name(table) for table in tables]))
-            )]
-        else:
-            # Older versions of Postgres can't do TRUNCATE in a single call, so
-            # they must use a simple delete.
-            sql = ['%s %s %s;' % \
-                    (style.SQL_KEYWORD('DELETE'),
-                     style.SQL_KEYWORD('FROM'),
-                     style.SQL_FIELD(quote_name(table))
-                     ) for table in tables]
-
-        # 'ALTER SEQUENCE sequence_name RESTART WITH 1;'... style SQL statements
-        # to reset sequence indices
-        for sequence_info in sequences:
-            table_name = sequence_info['table']
-            column_name = sequence_info['column']
-            if column_name and len(column_name)>0:
-                # sequence name in this case will be <table>_<column>_seq
-                sql.append("%s %s %s %s %s %s;" % \
-                    (style.SQL_KEYWORD('ALTER'),
-                    style.SQL_KEYWORD('SEQUENCE'),
-                    style.SQL_FIELD(quote_name('%s_%s_seq' % (table_name, column_name))),
-                    style.SQL_KEYWORD('RESTART'),
-                    style.SQL_KEYWORD('WITH'),
-                    style.SQL_FIELD('1')
-                    )
-                )
-            else:
-                # sequence name in this case will be <table>_id_seq
-                sql.append("%s %s %s %s %s %s;" % \
-                    (style.SQL_KEYWORD('ALTER'),
-                     style.SQL_KEYWORD('SEQUENCE'),
-                     style.SQL_FIELD(quote_name('%s_id_seq' % table_name)),
-                     style.SQL_KEYWORD('RESTART'),
-                     style.SQL_KEYWORD('WITH'),
-                     style.SQL_FIELD('1')
-                     )
-                )
-        return sql
-    else:
-        return []
-
-def get_sql_sequence_reset(style, model_list):

django/trunk/django/db/backends/postgresql_psycopg2/base.py

@@ -35 +35 @@
-        cursor.execute("SELECT CURRVAL('\"%s_%s_seq\"')" % (table_name, pk_name))
-        return cursor.fetchone()[0]
+
+    def sql_flush(self, style, tables, sequences):
+        if tables:
+            if postgres_version[0] >= 8 and postgres_version[1] >= 1:
+                # Postgres 8.1+ can do 'TRUNCATE x, y, z...;'. In fact, it *has to*
+                # in order to be able to truncate tables referenced by a foreign
+                # key in any other table. The result is a single SQL TRUNCATE
+                # statement.
+                sql = ['%s %s;' % \
+                    (style.SQL_KEYWORD('TRUNCATE'),
+                     style.SQL_FIELD(', '.join([quote_name(table) for table in tables]))
+                )]
+            else:
+                # Older versions of Postgres can't do TRUNCATE in a single call, so
+                # they must use a simple delete.
+                sql = ['%s %s %s;' % \
+                        (style.SQL_KEYWORD('DELETE'),
+                         style.SQL_KEYWORD('FROM'),
+                         style.SQL_FIELD(quote_name(table))
+                         ) for table in tables]
+
+            # 'ALTER SEQUENCE sequence_name RESTART WITH 1;'... style SQL statements
+            # to reset sequence indices
+            for sequence_info in sequences:
+                table_name = sequence_info['table']
+                column_name = sequence_info['column']
+                if column_name and len(column_name)>0:
+                    # sequence name in this case will be <table>_<column>_seq
+                    sql.append("%s %s %s %s %s %s;" % \
+                        (style.SQL_KEYWORD('ALTER'),
+                        style.SQL_KEYWORD('SEQUENCE'),
+                        style.SQL_FIELD(quote_name('%s_%s_seq' % (table_name, column_name))),
+                        style.SQL_KEYWORD('RESTART'),
+                        style.SQL_KEYWORD('WITH'),
+                        style.SQL_FIELD('1')
+                        )
+                    )
+                else:
+                    # sequence name in this case will be <table>_id_seq
+                    sql.append("%s %s %s %s %s %s;" % \
+                        (style.SQL_KEYWORD('ALTER'),
+                         style.SQL_KEYWORD('SEQUENCE'),
+                         style.SQL_FIELD(quote_name('%s_id_seq' % table_name)),
+                         style.SQL_KEYWORD('RESTART'),
+                         style.SQL_KEYWORD('WITH'),
+                         style.SQL_FIELD('1')
+                         )
+                    )
+            return sql
+        else:
+            return []
-
-class DatabaseWrapper(BaseDatabaseWrapper):
@@ -89 +140 @@
-    return "BEGIN;"
-
-def get_sql_flush(style, tables, sequences):
-    """Return a list of SQL statements required to remove all data from
-    all tables in the database (without actually removing the tables
-    themselves) and put the database in an empty 'initial' state
-    """
-    if tables:
-        if postgres_version[0] >= 8 and postgres_version[1] >= 1:
-            # Postgres 8.1+ can do 'TRUNCATE x, y, z...;'. In fact, it *has to* in order to be able to
-            # truncate tables referenced by a foreign key in any other table. The result is a
-            # single SQL TRUNCATE statement
-            sql = ['%s %s;' % \
-                    (style.SQL_KEYWORD('TRUNCATE'),
-                     style.SQL_FIELD(', '.join([quote_name(table) for table in tables]))
-                    )]
-        else:
-            sql = ['%s %s %s;' % \
-                    (style.SQL_KEYWORD('DELETE'),
-                     style.SQL_KEYWORD('FROM'),
-                     style.SQL_FIELD(quote_name(table))
-                     ) for table in tables]
-
-        # 'ALTER SEQUENCE sequence_name RESTART WITH 1;'... style SQL statements
-        # to reset sequence indices
-        for sequence in sequences:
-            table_name = sequence['table']
-            column_name = sequence['column']
-            if column_name and len(column_name) > 0:
-                # sequence name in this case will be <table>_<column>_seq
-                sql.append("%s %s %s %s %s %s;" % \
-                    (style.SQL_KEYWORD('ALTER'),
-                     style.SQL_KEYWORD('SEQUENCE'),
-                     style.SQL_FIELD(quote_name('%s_%s_seq' % (table_name, column_name))),
-                     style.SQL_KEYWORD('RESTART'),
-                     style.SQL_KEYWORD('WITH'),
-                     style.SQL_FIELD('1')
-                     )
-                )
-            else:
-                # sequence name in this case will be <table>_id_seq
-                sql.append("%s %s %s %s %s %s;" % \
-                    (style.SQL_KEYWORD('ALTER'),
-                     style.SQL_KEYWORD('SEQUENCE'),
-                     style.SQL_FIELD(quote_name('%s_id_seq' % table_name)),
-                     style.SQL_KEYWORD('RESTART'),
-                     style.SQL_KEYWORD('WITH'),
-                     style.SQL_FIELD('1')
-                     )
-                )
-        return sql
-    else:
-        return []
-
-def get_sql_sequence_reset(style, model_list):
-    "Returns a list of the SQL statements to reset sequences for the given models."

django/trunk/django/db/backends/sqlite3/base.py

@@ -51 +51 @@
-    def pk_default_value(self):
-        return 'NULL'
+
+    def sql_flush(self, style, tables, sequences):
+        # NB: The generated SQL below is specific to SQLite
+        # Note: The DELETE FROM... SQL generated below works for SQLite databases
+        # because constraints don't exist
+        sql = ['%s %s %s;' % \
+                (style.SQL_KEYWORD('DELETE'),
+                 style.SQL_KEYWORD('FROM'),
+                 style.SQL_FIELD(quote_name(table))
+                 ) for table in tables]
+        # Note: No requirement for reset of auto-incremented indices (cf. other
+        # sql_flush() implementations). Just return SQL at this point
+        return sql
-
-class DatabaseWrapper(BaseDatabaseWrapper):
@@ -122 +135 @@
-    return "BEGIN;"
-
-def get_sql_flush(style, tables, sequences):
-    """
-    Return a list of SQL statements required to remove all data from
-    all tables in the database (without actually removing the tables
-    themselves) and put the database in an empty 'initial' state
-    """
-    # NB: The generated SQL below is specific to SQLite
-    # Note: The DELETE FROM... SQL generated below works for SQLite databases
-    # because constraints don't exist
-    sql = ['%s %s %s;' % \
-            (style.SQL_KEYWORD('DELETE'),
-             style.SQL_KEYWORD('FROM'),
-             style.SQL_FIELD(quote_name(table))
-             ) for table in tables]
-    # Note: No requirement for reset of auto-incremented indices (cf. other
-    # get_sql_flush() implementations). Just return SQL at this point
-    return sql
-
-def get_sql_sequence_reset(style, model_list):
-    "Returns a list of the SQL statements to reset sequences for the given models."