Changeset 5787

Timestamp:

08/02/07 16:17:23 (1 year ago)

Author:

danderson

Message:

schema-evolution:
added sqlite3 unit tests
greatly expanded the number of evolutions supported by the sqlite3 backend
changed all get_<evolution_type> calls to return lists of strings
fixed sqlite3 get_indexes introspection

Files:

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

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

@@ -570 +570 @@
-            col_type = data_types[data_type]
-            if col_type is not None:
-app
+ext
-    return output
-
@@ -581 +581 @@
-        return [], None
-    if klass._meta.aka in table_list:
-[ backend.get_change_table_name_sql( klass._meta.db_table, klass._meta.aka) ]
+backend.get_change_table_name_sql( klass._meta.db_table, klass._meta.aka)
-    elif len(set(klass._meta.aka) & set(table_list))==1:
-[ backend.get_change_table_name_sql( klass._meta.db_table, klass._meta.aka[0]) ]
+backend.get_change_table_name_sql( klass._meta.db_table, klass._meta.aka[0])
-    else:
-        return [], None
@@ -609 +609 @@
-            col_type = data_types[data_type]
-            if col_type is not None:
-                field_output = []
-                col_def = style.SQL_COLTYPE(col_type % rel_field.__dict__) +' '+ style.SQL_KEYWORD('%sNULL' % (not f.null and 'NOT ' or ''))
-                if f.unique:
@@ -615 +614 @@
-                if f.primary_key:
-                    col_def += style.SQL_KEYWORD(' PRIMARY KEY')
-
-
+
-    return output
-    
@@ -667 +665 @@
-#                if f.primary_key:
-#                    col_def += ' '+ style.SQL_KEYWORD('PRIMARY KEY')
-app
+ext
-                    #print db_table, cf, f.maxlength, introspection.get_known_column_flags(cursor, db_table, cf)
-    return output

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

@@ -245 +245 @@
-
-def get_change_table_name_sql( table_name, old_table_name ):
-'ALTER TABLE '+ quote_name(old_table_name) +' RENAME TO '+ quote_name(table_name) + ';'
+['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 ):
@@ -255 +255 @@
-    output = []
-    output.append( 'ALTER TABLE '+ quote_name(table_name) +' CHANGE COLUMN '+ quote_name(old_col_name) +' '+ quote_name(new_col_name) +' '+ col_def + ';' )
-'\n'.join(output)
+output
-
-def get_change_column_def_sql( table_name, col_name, col_type, null, unique, primary_key ):
@@ -265 +265 @@
-        col_def += ' '+ 'PRIMARY KEY'
-    output.append( 'ALTER TABLE '+ quote_name(table_name) +' MODIFY COLUMN '+ quote_name(col_name) +' '+ col_def + ';' )
-'\n'.join(output)
+output
-
-def get_add_column_sql( table_name, col_name, col_type, null, unique, primary_key  ):
@@ -281 +281 @@
-        field_output.append(('PRIMARY KEY'))
-    output.append(' '.join(field_output) + ';')
-'\n'.join(output)
+output
-
-def get_drop_column_sql( table_name, col_name ):

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

@@ -287 +287 @@
-    output = []
-    output.append('ALTER TABLE '+ quote_name(old_table_name) +' RENAME TO '+ quote_name(table_name) + ';')
-'\n'.join(output)
+output
-
-def get_change_column_name_sql( table_name, indexes, old_col_name, new_col_name, col_def ):
@@ -296 +296 @@
-    output = []
-    output.append( 'ALTER TABLE '+ quote_name(table_name) +' RENAME COLUMN '+ quote_name(old_col_name) +' TO '+ quote_name(new_col_name) +';' )
-'\n'.join(output)
+output
-
-def get_change_column_def_sql( table_name, col_name, col_type, null, unique, primary_key ):
@@ -309 +309 @@
-        output.append( 'ALTER TABLE '+ quote_name(table_name) +' ADD CONSTRAINT '+ table_name +'_'+ col_name +'_unique_constraint UNIQUE('+ col_name +');' )
-    
-'\n'.join(output)
+output
-
-def get_add_column_sql( table_name, col_name, col_type, null, unique, primary_key  ):
@@ -318 +318 @@
-    if unique:
-        output.append( 'ALTER TABLE '+ quote_name(table_name) +' ADD CONSTRAINT '+ table_name +'_'+ col_name +'_unique_constraint UNIQUE('+ col_name +');' )
-'\n'.join(output)
+output
-    
-def get_drop_column_sql( table_name, col_name ):

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

@@ -218 +218 @@
-
-def get_change_table_name_sql( table_name, old_table_name ):
-'ALTER TABLE '+ quote_name(old_table_name) +' RENAME TO '+ quote_name(table_name) + ';'
+['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 ):
-    # sqlite doesn't support column renames, so we fake it
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-def get_change_column_def_sql( table_name, col_name, col_type, null, unique, primary_key ):
-    # sqlite doesn't support column modifications, so we fake it
+
+    model = get_model_from_table_name(table_name)
+    if not model: return ['-- model not found']
+    output = []
+    output.append( '-- FYI: sqlite does not support changing columns, so we create a new '+ quote_name(table_name) +' and delete the old  (ie, this could take a while)' )
+
+    tmp_table_name = table_name + '_1337_TMP' # unlikely to produce a namespace conflict
+    output.extend( get_change_table_name_sql( tmp_table_name, table_name ) )
+    output.extend( management._get_sql_model_create(model, set())[0] )
+
+    old_cols = []
+    for f in model._meta.fields:
+        old_cols.append( quote_name(f.column) )
+
+    output.append( 'INSERT INTO '+ quote_name(table_name) +' SELECT '+ ','.join(old_cols) +' FROM '+ quote_name(tmp_table_name) +';' )
+    output.append( 'DROP TABLE '+ quote_name(tmp_table_name) +';' )
+
+    return output
+
+
+
+
+
+
+
+
+
+
+
-    output = []
-    col_def = col_type +' '+ ('%sNULL' % (not null and 'NOT ' or ''))
@@ -242 +281 @@
-    # TODO: fake via renaming the table, building a new one and deleting the old
-    output.append('-- sqlite does not support column modifications '+ quote_name(table_name) +'.'+ quote_name(col_name) +' to '+ col_def)
-'\n'.join(output)
+output
-    
-def get_add_column_sql( table_name, col_name, col_type, null, unique, primary_key  ):
@@ -258 +297 @@
-        field_output.append(('PRIMARY KEY'))
-    output.append(' '.join(field_output) + ';')
-'\n'.join(output)
+output
-
-def get_drop_column_sql( table_name, col_name ):
@@ -265 +304 @@
-    output.append( '-- FYI: sqlite does not support deleting columns, so we create a new '+ quote_name(col_name) +' and delete the old  (ie, this could take a while)' )
-    tmp_table_name = table_name + '_1337_TMP' # unlikely to produce a namespace conflict
-app
+ext
-    output.extend( management._get_sql_model_create(model, set())[0] )
-    new_cols = []

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

@@ -27 +27 @@
-    """
-    indexes = {}
-    for info in _table_info(cursor, table_name):
-        indexes[info['name']] = {'primary_key': info['pk'] != 0,
-                                 'unique': False}
-    cursor.execute('PRAGMA index_list(%s)' % quote_name(table_name))
-    # seq, name, unique
@@ -37 +34 @@
-        cursor.execute('PRAGMA index_info(%s)' % quote_name(index))
-        info = cursor.fetchall()
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    return indexes
-

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

@@ -45 +45 @@
->>> sql = backend.get_drop_column_sql( 'schema_evolution_person', 'gender' )
->>> print sql
-
-cursor.execute(sql
+
+for s in sql: cursor.execute(s
-0L
->>> management.get_sql_evolution(app)
@@ -59 +59 @@
-0L
->>> management.get_sql_evolution(app)
-as the following may cause data loss, it/they must be run manually', u'-- 
+the following may cause data loss', u'
-
-# reset the db
@@ -104 +104 @@
-
-# delete a column, so it looks like we've recently added a field
-cursor.execute( backend.get_drop_column_sql( 'schema_evolution_person', 'gender' ) 
-
-\\n
+for sql in backend.get_drop_column_sql( 'schema_evolution_person', 'gender' ): cursor.execute(sql
+
+', '
-
-# reset the db
@@ -112 +112 @@
-
-# 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 ) 
-
-as the following may cause data loss, it/they must be run manually', u'-- 
+for sql in backend.get_add_column_sql( 'schema_evolution_person', 'gender_nothere', 'varchar(1)', True, False, False ): cursor.execute(sql
+
+the following may cause data loss', u'
-
-# reset the db
@@ -120 +120 @@
-
-# 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)' ) 
+for sql in backend.get_change_column_name_sql( 'schema_evolution_person', {}, 'gender2', 'gender_old', 'varchar(1)' ): cursor.execute(sql
->>> management.get_sql_evolution(app)
-['ALTER TABLE "schema_evolution_person" RENAME COLUMN "gender_old" TO "gender2";']
@@ -128 +128 @@
-
-# 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' ) 
+for sql in backend.get_change_table_name_sql( 'schema_evolution_personold', 'schema_evolution_person' ): cursor.execute(sql
->>> management.get_sql_evolution(app)
-['ALTER TABLE "schema_evolution_personold" RENAME TO "schema_evolution_person";']
@@ -136 +136 @@
-
-# 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 ) 
-
-\\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";\\n
+for sql in backend.get_change_column_def_sql( 'schema_evolution_person', 'name', 'varchar(10)', True, False, False ): cursor.execute(sql
+
+', 'UPDATE "schema_evolution_person" SET "name_tmp" = "name";', 'ALTER TABLE "schema_evolution_person" DROP COLUMN "name";', 'ALTER TABLE "schema_evolution_person" RENAME COLUMN "name_tmp" TO "name";', '
-
-"""
@@ -172 +172 @@
->>> cursor.execute( 'CREATE TABLE "schema_evolution_person" ( "id" integer NOT NULL UNIQUE PRIMARY KEY, "name" varchar(20) NOT NULL, "gender" varchar(1) NOT NULL, "gender2" varchar(1) NOT NULL, "gender_new" varchar(1) NOT NULL );' ).__class__
-<class 'django.db.backends.sqlite3.base.SQLiteCursorWrapper'>
-
+
+
+
+
-['-- warning: the following may cause data loss', u'-- FYI: sqlite does not support deleting columns, so we create a new "gender_new" and delete the old  (ie, this could take a while)', 'ALTER TABLE "schema_evolution_person" RENAME TO "schema_evolution_person_1337_TMP";', 'CREATE TABLE "schema_evolution_person" (\\n    "id" integer NOT NULL UNIQUE PRIMARY KEY,\\n    "name" varchar(20) NOT NULL,\\n    "gender" varchar(1) NOT NULL,\\n    "gender2" varchar(1) NOT NULL\\n)\\n;', 'INSERT INTO "schema_evolution_person" SELECT "id","name","gender","gender2" FROM "schema_evolution_person_1337_TMP";', 'DROP TABLE "schema_evolution_person_1337_TMP";', '-- end warning']
+>>> for s in sql: cursor.execute(s).__class__
+<class 'django.db.backends.sqlite3.base.SQLiteCursorWrapper'>
+<class 'django.db.backends.sqlite3.base.SQLiteCursorWrapper'>
+<class 'django.db.backends.sqlite3.base.SQLiteCursorWrapper'>
+<class 'django.db.backends.sqlite3.base.SQLiteCursorWrapper'>
+<class 'django.db.backends.sqlite3.base.SQLiteCursorWrapper'>
+<class 'django.db.backends.sqlite3.base.SQLiteCursorWrapper'>
+<class 'django.db.backends.sqlite3.base.SQLiteCursorWrapper'>
+>>> cursor.execute('select * from "schema_evolution_person";').__class__
+<class 'django.db.backends.sqlite3.base.SQLiteCursorWrapper'>
+>>> cursor.fetchall()[0]
+(1, u'2', u'3', u'4')
-
-# reset the db
@@ -181 +196 @@
-<class 'django.db.backends.sqlite3.base.SQLiteCursorWrapper'>
-
-"""
-
-crap = """
-
-# rename column, so it looks like we've recently renamed a field
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-# rename table, so it looks like we've recently renamed a model
-
+
+
->>> management.get_sql_evolution(app)
-['ALTER TABLE "schema_evolution_personold" RENAME TO "schema_evolution_person";']
-
-# reset the db
-
+
+
+
+
-
-# change column flags, so it looks like we've recently changed a column flag
-
-
-
-
-
-
+
+
+
+
+
+
+
+