dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed problem with case in migrations

Browse Source
This commit is contained in:
mdipierro
2012-08-31 13:32:22 -05:00
parent 665a5cdee2
commit e82982d25d
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.0.3 (2012-08-31 11:08:15) stable Version 2.0.3 (2012-08-31 13:32:07) stable
gluon/dal.py
+7 -5
View File
@@ -943,7 +943,8 @@ class BaseAdapter(ConnectionPool):
if not isinstance(v,dict): if not isinstance(v,dict):
v=dict(type='unkown',sql=v) v=dict(type='unkown',sql=v)
return k.lower(),v return k.lower(),v
### make sure all field names are lower case to avoid conflicts # make sure all field names are lower case to avoid
# migrations because of case cahnge
sql_fields = dict(map(fix,sql_fields.iteritems())) sql_fields = dict(map(fix,sql_fields.iteritems()))
sql_fields_old = dict(map(fix,sql_fields_old.iteritems())) sql_fields_old = dict(map(fix,sql_fields_old.iteritems()))
sql_fields_aux = dict(map(fix,sql_fields_aux.iteritems())) sql_fields_aux = dict(map(fix,sql_fields_aux.iteritems()))
@@ -993,10 +994,11 @@ class BaseAdapter(ConnectionPool):
query = ['ALTER TABLE %s DROP %s;' % (tablename, key)] query = ['ALTER TABLE %s DROP %s;' % (tablename, key)]
metadata_change = True metadata_change = True
elif sql_fields[key]['sql'] != sql_fields_old[key]['sql'] \ elif sql_fields[key]['sql'] != sql_fields_old[key]['sql'] \
and not isinstance(table[key].type, SQLCustomType) \ and not (key in table.fields and
and not table[key].type.startswith('reference')\ isinstance(table[key].type, SQLCustomType)) \
and not table[key].type.startswith('double')\ and not sql_fields[key]['type'].startswith('reference')\
and not table[key].type.startswith('id'): and not sql_fields[key]['type'].startswith('double')\
and not sql_fields[key]['type'].startswith('id'):
sql_fields_current[key] = sql_fields[key] sql_fields_current[key] = sql_fields[key]
t = tablename t = tablename
tt = sql_fields_aux[key]['sql'].replace(', ', new_add) tt = sql_fields_aux[key]['sql'].replace(', ', new_add)