diff options
author | jonathan vanasco <jonathan@2xlp.com> | 2021-11-05 12:38:30 -0400 |
---|---|---|
committer | jonathan vanasco <jonathan@2xlp.com> | 2021-11-06 12:34:49 -0400 |
commit | f5836f29f5612d5f653683644566a57c47291b5d (patch) | |
tree | 755dd6fcd4c88af6a6d029751a22d7cfa70121bc /lib/sqlalchemy/sql/schema.py | |
parent | 5501649d1a78ae0a2f570cd54d2be6289a28ce2d (diff) | |
download | sqlalchemy-f5836f29f5612d5f653683644566a57c47291b5d.tar.gz |
Fixes: #7295
Fixed issue in ``Table``` object where: param:`implicit_returning` was not
compatible with: param:`extend_existing`.
Change-Id: I16f4ab585d82f5691a3fed9eba04b84730a8a59e
Diffstat (limited to 'lib/sqlalchemy/sql/schema.py')
-rw-r--r-- | lib/sqlalchemy/sql/schema.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py index e45e22564..c3c8ffb2c 100644 --- a/lib/sqlalchemy/sql/schema.py +++ b/lib/sqlalchemy/sql/schema.py @@ -763,25 +763,25 @@ class Table(DialectKWArgs, SchemaItem, TableClause): ) include_columns = kwargs.pop("include_columns", None) - - resolve_fks = kwargs.pop("resolve_fks", True) - if include_columns is not None: for c in self.c: if c.name not in include_columns: self._columns.remove(c) + resolve_fks = kwargs.pop("resolve_fks", True) + for key in ("quote", "quote_schema"): if key in kwargs: raise exc.ArgumentError( "Can't redefine 'quote' or 'quote_schema' arguments" ) - if "comment" in kwargs: - self.comment = kwargs.pop("comment", None) - - if "info" in kwargs: - self.info = kwargs.pop("info") + # update `self` with these kwargs, if provided + self.comment = kwargs.pop("comment", self.comment) + self.implicit_returning = kwargs.pop( + "implicit_returning", self.implicit_returning + ) + self.info = kwargs.pop("info", self.info) if autoload: if not autoload_replace: |