summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/schema.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2011-10-23 13:42:02 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2011-10-23 13:42:02 -0400
commit8ef278ec7557a5b3446807e9bc16624630ffd034 (patch)
tree82ab44149128943ffdd93c9f4263495265da412b /lib/sqlalchemy/schema.py
parenta708d0fbce3b7d8a9fb575bab5229a9b6b5f8f3a (diff)
downloadsqlalchemy-8ef278ec7557a5b3446807e9bc16624630ffd034.tar.gz
fix the 2to3 here
Diffstat (limited to 'lib/sqlalchemy/schema.py')
-rw-r--r--lib/sqlalchemy/schema.py38
1 files changed, 22 insertions, 16 deletions
diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py
index 3d00b3197..7ab008a10 100644
--- a/lib/sqlalchemy/schema.py
+++ b/lib/sqlalchemy/schema.py
@@ -322,27 +322,30 @@ class Table(SchemaItem, expression.TableClause):
# we do it after the table is in the singleton dictionary to support
# circular foreign keys
if autoload:
- if autoload_with:
- autoload_with.run_callable(
- autoload_with.dialect.reflecttable,
- self, include_columns
- )
- else:
- bind = _bind_or_error(metadata,
- msg="No engine is bound to this Table's MetaData. "
- "Pass an engine to the Table via "
- "autoload_with=<someengine>, "
- "or associate the MetaData with an engine via "
- "metadata.bind=<someengine>")
- bind.run_callable(
- bind.dialect.reflecttable,
- self, include_columns
- )
+ self._autoload(metadata, autoload_with, include_columns)
# initialize all the column, etc. objects. done after reflection to
# allow user-overrides
self._init_items(*args)
+ def _autoload(self, metadata, autoload_with, include_columns):
+ if autoload_with:
+ autoload_with.run_callable(
+ autoload_with.dialect.reflecttable,
+ self, include_columns
+ )
+ else:
+ bind = _bind_or_error(metadata,
+ msg="No engine is bound to this Table's MetaData. "
+ "Pass an engine to the Table via "
+ "autoload_with=<someengine>, "
+ "or associate the MetaData with an engine via "
+ "metadata.bind=<someengine>")
+ bind.run_callable(
+ bind.dialect.reflecttable,
+ self, include_columns
+ )
+
@property
def _sorted_constraints(self):
"""Return the set of constraints as a list, sorted by creation order."""
@@ -371,6 +374,9 @@ class Table(SchemaItem, expression.TableClause):
if 'info' in kwargs:
self.info = kwargs.pop('info')
+ if autoload:
+ self._autoload(self.metadata, autoload_with, include_columns)
+
self._extra_kwargs(**kwargs)
self._init_items(*args)