more cleanup, Table.__init__ still needs lots of work
This commit is contained in:
@@ -1 +1 @@
|
|||||||
Version 2.00.0 (2012-08-18 10:03:45) dev
|
Version 2.00.0 (2012-08-18 10:11:20) dev
|
||||||
|
|||||||
+6
-11
@@ -6944,18 +6944,13 @@ def index():
|
|||||||
table = table_class(self, tablename, *fields, **args)
|
table = table_class(self, tablename, *fields, **args)
|
||||||
table._actual = True
|
table._actual = True
|
||||||
self[tablename] = table
|
self[tablename] = table
|
||||||
|
table._create_references() # must follow above line to handle self references
|
||||||
|
|
||||||
# db magic
|
migrate = self._migrate_enabled and args.get('migrate',self._migrate)
|
||||||
if self._uri in (None,'None'):
|
if migrate and not self._uri in (None,'None') \
|
||||||
return table
|
or self._adapter.dbengine=='google:datastore':
|
||||||
|
fake_migrate = self._fake_migrate_all or \
|
||||||
table._create_references()
|
args.get('fake_migrate',self._fake_migrate)
|
||||||
|
|
||||||
migrate = self._migrate_enabled and args.get(
|
|
||||||
'migrate',self._migrate)
|
|
||||||
if migrate or self._adapter.dbengine=='google:datastore':
|
|
||||||
fake_migrate = self._fake_migrate_all or args.get(
|
|
||||||
'fake_migrate',self._fake_migrate)
|
|
||||||
polymodel = args.get('polymodel',None)
|
polymodel = args.get('polymodel',None)
|
||||||
try:
|
try:
|
||||||
sql_locker.acquire()
|
sql_locker.acquire()
|
||||||
|
|||||||
Reference in New Issue
Block a user