diff options
author | Malik Diarra <malik.diarra@gmail.com> | 2014-08-07 21:50:49 +0200 |
---|---|---|
committer | Malik Diarra <malik.diarra@gmail.com> | 2014-08-09 21:43:32 +0200 |
commit | ad8f921e969b6f735dc8e08d882c961dde78f2b1 (patch) | |
tree | 02ee67047adc575ec337502f06ba4469b40861b8 /lib/sqlalchemy/sql/schema.py | |
parent | cca4d8fc73df042e938447ec0bc990be28c4fb11 (diff) | |
download | sqlalchemy-ad8f921e969b6f735dc8e08d882c961dde78f2b1.tar.gz |
Providing an autoload_with info automatically sets autoload to True
Diffstat (limited to 'lib/sqlalchemy/sql/schema.py')
-rw-r--r-- | lib/sqlalchemy/sql/schema.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py index f3af46c40..5c68b5aec 100644 --- a/lib/sqlalchemy/sql/schema.py +++ b/lib/sqlalchemy/sql/schema.py @@ -401,8 +401,8 @@ class Table(DialectKWArgs, SchemaItem, TableClause): else: self.fullname = self.name - autoload = kwargs.pop('autoload', False) autoload_with = kwargs.pop('autoload_with', None) + autoload = kwargs.pop('autoload', autoload_with is not None) # this argument is only used with _init_existing() kwargs.pop('autoload_replace', True) include_columns = kwargs.pop('include_columns', None) @@ -460,8 +460,8 @@ class Table(DialectKWArgs, SchemaItem, TableClause): return sorted(self.constraints, key=lambda c: c._creation_order) def _init_existing(self, *args, **kwargs): - autoload = kwargs.pop('autoload', False) autoload_with = kwargs.pop('autoload_with', None) + autoload = kwargs.pop('autoload', autoload_with is not None) autoload_replace = kwargs.pop('autoload_replace', True) schema = kwargs.pop('schema', None) if schema and schema != self.schema: |