Skip to content

Commit

Permalink
schema-evolution:
Browse files Browse the repository at this point in the history 
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



git-svn-id: http://code.djangoproject.com/svn/django/branches/schema-evolution@5787 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
@keredson
keredson committed Aug 2, 2007
1 parent 38c1cd7 commit fd77e42
Show file tree
Hide file tree
Showing 6 changed files with 137 additions and 60 deletions.
12 changes: 5 additions & 7 deletions django/core/management.py
View file
Expand Up @@ -569,7 +569,7 @@ def get_sql_evolution_check_for_new_fields(klass, new_table_name):
data_type = f.get_internal_type()
col_type = data_types[data_type]
if col_type is not None:
output.append( backend.get_add_column_sql( db_table, f.column, style.SQL_COLTYPE(col_type % rel_field.__dict__), f.null, f.unique, f.primary_key ) )
output.extend( backend.get_add_column_sql( db_table, f.column, style.SQL_COLTYPE(col_type % rel_field.__dict__), f.null, f.unique, f.primary_key ) )
return output

def get_sql_evolution_check_for_changed_model_name(klass):
Expand All @@ -580,9 +580,9 @@ def get_sql_evolution_check_for_changed_model_name(klass):
if klass._meta.db_table in table_list:
return [], None
if klass._meta.aka in table_list:
return [ backend.get_change_table_name_sql( klass._meta.db_table, klass._meta.aka) ], klass._meta.aka
return backend.get_change_table_name_sql( klass._meta.db_table, klass._meta.aka), klass._meta.aka
elif len(set(klass._meta.aka) & set(table_list))==1:
return [ backend.get_change_table_name_sql( klass._meta.db_table, klass._meta.aka[0]) ], klass._meta.aka[0]
return backend.get_change_table_name_sql( klass._meta.db_table, klass._meta.aka[0]), klass._meta.aka[0]
else:
return [], None

Expand All @@ -608,14 +608,12 @@ def get_sql_evolution_check_for_changed_field_name(klass, new_table_name):
data_type = f.get_internal_type()
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:
col_def += style.SQL_KEYWORD(' UNIQUE')
if f.primary_key:
col_def += style.SQL_KEYWORD(' PRIMARY KEY')
field_output.append( backend.get_change_column_name_sql( klass._meta.db_table, introspection.get_indexes(cursor,db_table), backend.quote_name(old_col), backend.quote_name(f.column), col_def ) )
output.append(' '.join(field_output))
output.extend( backend.get_change_column_name_sql( klass._meta.db_table, introspection.get_indexes(cursor,db_table), old_col, f.column, col_def ) )
return output

def get_sql_evolution_check_for_changed_field_flags(klass, new_table_name):
Expand Down Expand Up @@ -666,7 +664,7 @@ def get_sql_evolution_check_for_changed_field_flags(klass, new_table_name):
# col_def += ' '+ style.SQL_KEYWORD('UNIQUE')
# if f.primary_key:
# col_def += ' '+ style.SQL_KEYWORD('PRIMARY KEY')
output.append( backend.get_change_column_def_sql( db_table, cf, col_type_def, f.null, f.unique, f.primary_key ) )
output.extend( backend.get_change_column_def_sql( db_table, cf, col_type_def, f.null, f.unique, f.primary_key ) )
#print db_table, cf, f.maxlength, introspection.get_known_column_flags(cursor, db_table, cf)
return output

Expand Down
8 changes: 4 additions & 4 deletions django/db/backends/mysql/base.py
View file
Expand Up @@ -244,7 +244,7 @@ def get_sql_sequence_reset(style, model_list):
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) + ';'
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
Expand All @@ -254,7 +254,7 @@ def get_change_column_name_sql( table_name, indexes, old_col_name, new_col_name,
if indexes[key]['primary_key']: pk_name = key
output = []
output.append( 'ALTER TABLE '+ quote_name(table_name) +' CHANGE COLUMN '+ quote_name(old_col_name) +' '+ quote_name(new_col_name) +' '+ col_def + ';' )
return '\n'.join(output)
return output

def get_change_column_def_sql( table_name, col_name, col_type, null, unique, primary_key ):
output = []
Expand All @@ -264,7 +264,7 @@ def get_change_column_def_sql( table_name, col_name, col_type, null, unique, pri
if primary_key:
col_def += ' '+ 'PRIMARY KEY'
output.append( 'ALTER TABLE '+ quote_name(table_name) +' MODIFY COLUMN '+ quote_name(col_name) +' '+ col_def + ';' )
return '\n'.join(output)
return output

def get_add_column_sql( table_name, col_name, col_type, null, unique, primary_key ):
output = []
Expand All @@ -280,7 +280,7 @@ def get_add_column_sql( table_name, col_name, col_type, null, unique, primary_ke
if primary_key:
field_output.append(('PRIMARY KEY'))
output.append(' '.join(field_output) + ';')
return '\n'.join(output)
return output

def get_drop_column_sql( table_name, col_name ):
output = []
Expand Down
8 changes: 4 additions & 4 deletions django/db/backends/postgresql/base.py
View file
Expand Up @@ -286,7 +286,7 @@ def typecast_string(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)
return 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
Expand All @@ -295,7 +295,7 @@ def get_change_column_name_sql( table_name, indexes, old_col_name, new_col_name,
if indexes[key]['primary_key']: pk_name = key
output = []
output.append( 'ALTER TABLE '+ quote_name(table_name) +' RENAME COLUMN '+ quote_name(old_col_name) +' TO '+ quote_name(new_col_name) +';' )
return '\n'.join(output)
return output

def get_change_column_def_sql( table_name, col_name, col_type, null, unique, primary_key ):
output = []
Expand All @@ -308,7 +308,7 @@ def get_change_column_def_sql( table_name, col_name, col_type, null, unique, pri
if unique:
output.append( 'ALTER TABLE '+ quote_name(table_name) +' ADD CONSTRAINT '+ table_name +'_'+ col_name +'_unique_constraint UNIQUE('+ col_name +');' )

return '\n'.join(output)
return output

def get_add_column_sql( table_name, col_name, col_type, null, unique, primary_key ):
output = []
Expand All @@ -317,7 +317,7 @@ def get_add_column_sql( table_name, col_name, col_type, null, unique, primary_ke
output.append( 'ALTER TABLE '+ quote_name(table_name) +' ALTER COLUMN '+ quote_name(col_name) +' SET NOT NULL;' )
if unique:
output.append( 'ALTER TABLE '+ quote_name(table_name) +' ADD CONSTRAINT '+ table_name +'_'+ col_name +'_unique_constraint UNIQUE('+ col_name +');' )
return '\n'.join(output)
return output

def get_drop_column_sql( table_name, col_name ):
output = []
Expand Down
63 changes: 51 additions & 12 deletions django/db/backends/sqlite3/base.py
View file
Expand Up @@ -217,22 +217,61 @@ def _sqlite_regexp(re_pattern, re_string):
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) + ';'
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 ):
# sqlite doesn't support column renames, so we fake it
# TODO: only supports a single primary key so far
pk_name = None
for key in indexes.keys():
if indexes[key]['primary_key']: pk_name = key
model = get_model_from_table_name(table_name)
output = []
output.append( 'ALTER TABLE '+ quote_name(table_name) +' ADD COLUMN '+ quote_name(new_col_name) +' '+ col_def + ';' )
output.append( 'UPDATE '+ quote_name(table_name) +' SET '+ new_col_name +' = '+ old_col_name +' WHERE '+ pk_name +'=(select '+ pk_name +' from '+ table_name +');' )
output.append( '-- FYI: sqlite does not support deleting columns, so '+ quote_name(old_col_name) +' remains as cruft' )
return '\n'.join(output)
output.append( '-- FYI: sqlite does not support renaming 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:
if f.column != new_col_name:
old_cols.append( quote_name(f.column) )
else:
old_cols.append( quote_name(old_col_name) )

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

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 ''))
if unique or primary_key:
Expand All @@ -241,7 +280,7 @@ def get_change_column_def_sql( table_name, col_name, col_type, null, unique, pri
col_def += ' '+ 'PRIMARY KEY'
# 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)
return '\n'.join(output)
return output

def get_add_column_sql( table_name, col_name, col_type, null, unique, primary_key ):
output = []
Expand All @@ -257,14 +296,14 @@ def get_add_column_sql( table_name, col_name, col_type, null, unique, primary_ke
if primary_key:
field_output.append(('PRIMARY KEY'))
output.append(' '.join(field_output) + ';')
return '\n'.join(output)
return output

def get_drop_column_sql( table_name, col_name ):
model = get_model_from_table_name(table_name)
output = []
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
output.append( get_change_table_name_sql( tmp_table_name, table_name ) )
output.extend( get_change_table_name_sql( tmp_table_name, table_name ) )
output.extend( management._get_sql_model_create(model, set())[0] )
new_cols = []
for f in model._meta.fields:
Expand Down
18 changes: 10 additions & 8 deletions django/db/backends/sqlite3/introspection.py
View file
Expand Up @@ -26,21 +26,23 @@ def get_indexes(cursor, table_name):
'unique': boolean representing whether it's a unique index}
"""
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
for index, unique in [(field[1], field[2]) for field in cursor.fetchall()]:
if not unique:
continue
cursor.execute('PRAGMA index_info(%s)' % quote_name(index))
info = cursor.fetchall()
# Skip indexes across multiple fields
if len(info) != 1:
continue
name = info[0][2] # seqno, cid, name
indexes[name]['unique'] = True
for x in info:
name = x[2] # seqno, cid, name
cursor.execute('PRAGMA table_info(%s)' % quote_name(table_name))
for row in cursor.fetchall():
if row[1]==name:
indexes[name] = {'primary_key': False, 'unique': False}
if row[2]=='integer':
indexes[name]['primary_key'] = True
else:
indexes[name]['unique'] = True
return indexes

def get_columns(cursor, table_name):
Expand Down

0 comments on commit fd77e42

Please sign in to comment.