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

SQL(debug=True) logs migration info

Browse Source
This commit is contained in:
mdipierro
2012-08-31 11:08:20 -05:00
parent 515e7f3dab
commit a973276ad6
2 changed files with 9 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 10:21:33) stable Version 2.0.3 (2012-08-31 11:08:15) stable
gluon/dal.py
+8 -5
View File
@@ -935,7 +935,8 @@ class BaseAdapter(ConnectionPool):
logfile, logfile,
fake_migrate=False, fake_migrate=False,
): ):
table._db._migrated.append(table._tablename) db = table._db
db._migrated.append(table._tablename)
tablename = table._tablename tablename = table._tablename
def fix(item): def fix(item):
k,v=item k,v=item
@@ -946,6 +947,8 @@ class BaseAdapter(ConnectionPool):
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()))
if db._debug:
logging.debug('migrating %s to %s' % (sql_fields_old,sql_fields))
keys = sql_fields.keys() keys = sql_fields.keys()
for key in sql_fields_old: for key in sql_fields_old:
@@ -1019,7 +1022,7 @@ class BaseAdapter(ConnectionPool):
if query: if query:
logfile.write('timestamp: %s\n' logfile.write('timestamp: %s\n'
% datetime.datetime.today().isoformat()) % datetime.datetime.today().isoformat())
table._db['_lastsql'] = '\n'.join(query) db['_lastsql'] = '\n'.join(query)
for sub_query in query: for sub_query in query:
logfile.write(sub_query + '\n') logfile.write(sub_query + '\n')
if not fake_migrate: if not fake_migrate:
@@ -1027,8 +1030,8 @@ class BaseAdapter(ConnectionPool):
# Caveat: mysql, oracle and firebird do not allow multiple alter table # Caveat: mysql, oracle and firebird do not allow multiple alter table
# in one transaction so we must commit partial transactions and # in one transaction so we must commit partial transactions and
# update table._dbt after alter table. # update table._dbt after alter table.
if table._db._adapter.commit_on_alter_table: if db._adapter.commit_on_alter_table:
table._db.commit() db.commit()
tfile = self.file_open(table._dbt, 'w') tfile = self.file_open(table._dbt, 'w')
cPickle.dump(sql_fields_current, tfile) cPickle.dump(sql_fields_current, tfile)
self.file_close(tfile) self.file_close(tfile)
@@ -1042,7 +1045,7 @@ class BaseAdapter(ConnectionPool):
if metadata_change and \ if metadata_change and \
not (query and self.dbengine in ('mysql','oracle','firebird')): not (query and self.dbengine in ('mysql','oracle','firebird')):
table._db.commit() db.commit()
tfile = self.file_open(table._dbt, 'w') tfile = self.file_open(table._dbt, 'w')
cPickle.dump(sql_fields_current, tfile) cPickle.dump(sql_fields_current, tfile)
self.file_close(tfile) self.file_close(tfile)