From 9fbdd6a05b43fe86394cfb569076ce7c0b9e9e66 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 11 Jul 2012 09:15:35 -0500 Subject: [PATCH] table._migrated, db._migrated --- VERSION | 2 +- gluon/dal.py | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 74e91ff6..43e2cea1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-07-10 20:40:42) dev +Version 2.00.0 (2012-07-11 09:15:31) dev diff --git a/gluon/dal.py b/gluon/dal.py index d233beba..1ce192fa 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -769,10 +769,10 @@ class BaseAdapter(ConnectionPool): on_delete_action = field.ondelete) if hasattr(table,'_primarykey'): - query = '''CREATE TABLE %s(\n %s,\n %s) %s''' % \ + query = "CREATE TABLE %s(\n %s,\n %s) %s" % \ (tablename, fields, self.PRIMARY_KEY(', '.join(table._primarykey)),other) else: - query = '''CREATE TABLE %s(\n %s\n)%s''' % \ + query = "CREATE TABLE %s(\n %s\n)%s" % \ (tablename, fields, other) if self.uri.startswith('sqlite:///') or self.uri.startswith('spatialite:///'): @@ -841,6 +841,8 @@ class BaseAdapter(ConnectionPool): logfile, fake_migrate=False, ): + table._migrated = True + table._db._migrate.append(table._tablename) tablename = table._tablename def fix(item): k,v=item @@ -6452,6 +6454,7 @@ class DAL(dict): self._referee_name = '%(table)s' self._bigint_id = bigint_id self._debug = debug + self._migrated = [] if not str(attempts).isdigit() or attempts < 0: attempts = 5 if uri: @@ -7086,6 +7089,7 @@ class Table(dict): self._trigger_name = args.get('trigger_name',None) or \ db and db._adapter.trigger_name(tablename) self._common_filter = args.get('common_filter', None) + self._migrated = False self._before_insert = [] self._before_update = [lambda self,fs:self.delete_uploaded_files(fs)] @@ -7762,7 +7766,7 @@ class Expression(object): return Query(self.db, self.db._adapter.REGEXP, self, value) def belongs(self, *value): - ''' + """ Accepts the following inputs: field.belongs(1,2) field.belongs((1,2)) @@ -7770,7 +7774,7 @@ class Expression(object): Does NOT accept: field.belongs(1) - ''' + """ if len(value) == 1: value = value[0] if isinstance(value,Query):