Changeset 5784

Timestamp:

08/01/07 12:51:59 (1 year ago)

Author:

danderson

Message:

schema-evolution:
fixed postgresql constraint lookup after a table rename bug
pulled table renames into the backends
added postgresql unit tests

Files:

• django/branches/schema-evolution/django/core/management.py (modified) (4 diffs)
• django/branches/schema-evolution/django/db/backends/mysql/base.py (modified) (1 diff)
• django/branches/schema-evolution/django/db/backends/postgresql/base.py (modified) (1 diff)
• django/branches/schema-evolution/django/db/backends/postgresql/introspection.py (modified) (1 diff)
• django/branches/schema-evolution/django/db/backends/sqlite3/base.py (modified) (1 diff)
• django/branches/schema-evolution/tests/modeltests/schema_evolution/models.py (modified) (3 diffs)

django/branches/schema-evolution/django/core/management.py

@@ -6 +6 @@
-from optparse import OptionParser
-from django.utils import termcolors
+from django.conf import settings
-import os, re, shutil, sys, textwrap
-
@@ -592 +593 @@
-        return [], None
-    if klass._meta.aka in table_list:
-'ALTER TABLE '+ backend.quote_name(klass._meta.aka) +' RENAME TO '+ backend.quote_name(klass._meta.db_table) + ';'
+backend.get_change_table_name_sql( klass._meta.db_table, klass._meta.aka)
-    elif len(set(klass._meta.aka) & set(table_list))==1:
-'ALTER TABLE '+ backend.quote_name(klass._meta.aka[0]) +' RENAME TO '+ backend.quote_name(klass._meta.db_table) + ';'
+backend.get_change_table_name_sql( klass._meta.db_table, klass._meta.aka[0])
-    else:
-        return [], None
@@ -644 +645 @@
-    for f in opts.fields:
-        existing_fields = introspection.get_columns(cursor,db_table)
+#        print existing_fields
-        cf = None # current field, ie what it is before any renames
-        if f.column in existing_fields:
@@ -656 +658 @@
-        if data_types.has_key(data_type):
-            column_flags = introspection.get_known_column_flags(cursor, db_table, cf)
+#            print db_table, cf, column_flags
-            if column_flags['allow_null']!=f.null or \
-                    ( not f.primary_key and isinstance(f, CharField) and column_flags['maxlength']!=str(f.maxlength) ) or \
-                    ( not f.primary_key and isinstance(f, SlugField) and column_flags['maxlength']!=str(f.maxlength) ) or \
-column_flags['unique']!=f.unique
+( column_flags['unique']!=f.unique and ( settings.DATABASE_ENGINE!='postgresql' or not f.primary_key ) )
-                    column_flags['primary_key']!=f.primary_key:
-                    #column_flags['foreign_key']!=f.foreign_key:

django/branches/schema-evolution/django/db/backends/mysql/base.py

@@ -243 +243 @@
-    return []
-
+def get_change_table_name_sql( table_name, old_table_name ):
+    return 'ALTER TABLE '+ quote_name(old_table_name) +' RENAME TO '+ quote_name(table_name) + ';'
+
-def get_change_column_name_sql( table_name, indexes, old_col_name, new_col_name, col_def ):
-    # mysql doesn't support column renames (AFAIK), so we fake it

django/branches/schema-evolution/django/db/backends/postgresql/base.py

@@ -283 +283 @@
-    return smart_unicode(s)
-
+def get_change_table_name_sql( table_name, old_table_name ):
+    output = []
+    output.append('ALTER TABLE '+ quote_name(old_table_name) +' RENAME TO '+ quote_name(table_name) + ';')
+    return '\n'.join(output)
+
-def get_change_column_name_sql( table_name, indexes, old_col_name, new_col_name, col_def ):
-    # TODO: only supports a single primary key so far

django/branches/schema-evolution/django/db/backends/postgresql/introspection.py

@@ -98 +98 @@
-    unique_conname = None
-    shared_unique_connames = set()
- where pg_constraint.conrelid=pg_attribute.attrelid and pg_attribute.attnum=any(pg_constraint.conkey) and pg_constraint.conname~'^
+, pg_class where pg_constraint.conrelid=pg_class.oid and pg_constraint.conrelid=pg_attribute.attrelid and pg_attribute.attnum=any(pg_constraint.conkey) and pg_class.relname='
-    for row in cursor.fetchall():
+#        print row
-        if row[2] == column_name:
-            if row[1]=='p': dict['primary_key'] = True

django/branches/schema-evolution/django/db/backends/sqlite3/base.py

@@ -214 +214 @@
-    except:
-        return False
+
+def get_change_table_name_sql( table_name, old_table_name ):
+    return 'ALTER TABLE '+ quote_name(old_table_name) +' RENAME TO '+ quote_name(table_name) + ';'
-
-def get_change_column_name_sql( table_name, indexes, old_col_name, new_col_name, col_def ):

django/branches/schema-evolution/tests/modeltests/schema_evolution/models.py

@@ -4 +4 @@
-
-from django.db import models
+from django.conf import settings
-
-GENDER_CHOICES = (
@@ -28 +29 @@
->>> app = models.get_apps()[-1]
->>> cursor = connection.cursor()
+"""}
-
+if settings.DATABASE_ENGINE == 'mysql':
+    __test__['API_TESTS'] += """
-# the table as it is supposed to be
->>> create_table_sql = management.get_sql_all(app)
@@ -86 +90 @@
->>> management.get_sql_evolution(app)
-['ALTER TABLE `schema_evolution_person` MODIFY COLUMN `name` varchar(20) NOT NULL;']
+"""
-
+if settings.DATABASE_ENGINE == 'postgresql':
+    __test__['API_TESTS'] += """
+# the table as it is supposed to be
+>>> create_table_sql = management.get_sql_all(app)
+>>> print create_table_sql
+['CREATE TABLE "schema_evolution_person" (\\n    "id" serial NOT NULL PRIMARY KEY,\\n    "name" varchar(20) NOT NULL,\\n    "gender" varchar(1) NOT NULL,\\n    "gender2" varchar(1) NOT NULL\\n)\\n;']
-
-
+
+
+
-
+# delete a column, so it looks like we've recently added a field
+>>> cursor.execute( backend.get_drop_column_sql( 'schema_evolution_person', 'gender' ) )
+>>> management.get_sql_evolution(app)
+['ALTER TABLE "schema_evolution_person" ADD COLUMN "gender" varchar(1);\\nALTER TABLE "schema_evolution_person" ALTER COLUMN "gender" SET NOT NULL;']
+
+# reset the db
+>>> cursor.execute('DROP TABLE schema_evolution_person;'); cursor.execute(create_table_sql[0])
+
+# add a column, so it looks like we've recently deleted a field
+>>> cursor.execute( backend.get_add_column_sql( 'schema_evolution_person', 'gender_nothere', 'varchar(1)', True, False, False ) )
+>>> management.get_sql_evolution(app)
+['-- warning: as the following may cause data loss, it/they must be run manually', u'-- ALTER TABLE "schema_evolution_person" DROP COLUMN "gender_nothere";', '-- end warning']
+
+# reset the db
+>>> cursor.execute('DROP TABLE schema_evolution_person;'); cursor.execute(create_table_sql[0])
+
+# rename column, so it looks like we've recently renamed a field
+>>> cursor.execute( backend.get_change_column_name_sql( 'schema_evolution_person', {}, 'gender2', 'gender_old', 'varchar(1)' ) )
+>>> management.get_sql_evolution(app)
+['ALTER TABLE "schema_evolution_person" RENAME COLUMN "gender_old" TO "gender2";']
+
+# reset the db
+>>> cursor.execute('DROP TABLE schema_evolution_person;'); cursor.execute(create_table_sql[0])
+
+# rename table, so it looks like we've recently renamed a model
+>>> cursor.execute( backend.get_change_table_name_sql( 'schema_evolution_personold', 'schema_evolution_person' ) )
+>>> management.get_sql_evolution(app)
+['ALTER TABLE "schema_evolution_personold" RENAME TO "schema_evolution_person";']
+
+# reset the db
+>>> cursor.execute(create_table_sql[0])
+
+# change column flags, so it looks like we've recently changed a column flag
+>>> cursor.execute( backend.get_change_column_def_sql( 'schema_evolution_person', 'name', 'varchar(10)', True, False, False ) )
+>>> management.get_sql_evolution(app)
+['ALTER TABLE "schema_evolution_person" ADD COLUMN "name_tmp" varchar(20);\\nUPDATE "schema_evolution_person" SET "name_tmp" = "name";\\nALTER TABLE "schema_evolution_person" DROP COLUMN "name";\\nALTER TABLE "schema_evolution_person" RENAME COLUMN "name_tmp" TO "name";\\nALTER TABLE "schema_evolution_person" ALTER COLUMN "name" SET NOT NULL;']
+
+"""
+