diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2020-05-01 20:30:18 -0400 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2020-05-01 20:58:42 -0400 |
commit | 45a334e38c1baab34d3195c899cb9ca617fb52a7 (patch) | |
tree | d5ba7127d5c06c777eb30836fcf4f343c65e71ba | |
parent | ea87d39d7a9926dc1c6bf3d70e8faf8575769cb0 (diff) | |
download | sqlalchemy-45a334e38c1baab34d3195c899cb9ca617fb52a7.tar.gz |
Handle non-string, non column expression in index for deferred attach
Fixed issue where an :class:`.Index` that is deferred in being associated
with a table, such as as when it contains a :class:`.Column` that is not
associated with any :class:`.Table` yet, would fail to attach correctly if
it also contained a non table-oriented expession.
Fixes: #5298
Change-Id: I0111c400f6bd4a9f31bf00a9957816c7a3fac783
-rw-r--r-- | doc/build/changelog/unreleased_13/5298.rst | 9 | ||||
-rw-r--r-- | lib/sqlalchemy/sql/schema.py | 5 | ||||
-rw-r--r-- | test/sql/test_metadata.py | 18 |
3 files changed, 30 insertions, 2 deletions
diff --git a/doc/build/changelog/unreleased_13/5298.rst b/doc/build/changelog/unreleased_13/5298.rst new file mode 100644 index 000000000..0b9af1258 --- /dev/null +++ b/doc/build/changelog/unreleased_13/5298.rst @@ -0,0 +1,9 @@ +.. change:: + :tags: bug, schema + :tickets: 5298 + + Fixed issue where an :class:`.Index` that is deferred in being associated + with a table, such as as when it contains a :class:`.Column` that is not + associated with any :class:`.Table` yet, would fail to attach correctly if + it also contained a non table-oriented expession. + diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py index eddd62d65..b7ac16b0a 100644 --- a/lib/sqlalchemy/sql/schema.py +++ b/lib/sqlalchemy/sql/schema.py @@ -2807,7 +2807,6 @@ class ColumnCollectionMixin(object): cols_w_table = [c for c in col_objs if isinstance(c.table, Table)] cols_wo_table = set(col_objs).difference(cols_w_table) - if cols_wo_table: # feature #3341 - place event listeners for Column objects # such that when all those cols are attached, we autoattach. @@ -2815,7 +2814,9 @@ class ColumnCollectionMixin(object): # issue #3411 - don't do the per-column auto-attach if some of the # columns are specified as strings. - has_string_cols = set(self._pending_colargs).difference(col_objs) + has_string_cols = set( + c for c in self._pending_colargs if c is not None + ).difference(col_objs) if not has_string_cols: def _col_attached(column, table): diff --git a/test/sql/test_metadata.py b/test/sql/test_metadata.py index c57932bed..36f308073 100644 --- a/test/sql/test_metadata.py +++ b/test/sql/test_metadata.py @@ -9,6 +9,7 @@ from sqlalchemy import Boolean from sqlalchemy import CheckConstraint from sqlalchemy import Column from sqlalchemy import ColumnDefault +from sqlalchemy import desc from sqlalchemy import Enum from sqlalchemy import event from sqlalchemy import exc @@ -2635,6 +2636,23 @@ class ConstraintTest(fixtures.TestBase): idx, ) + def test_non_attached_col_plus_string_expr(self): + # another one that declarative can lead towards + metadata = MetaData() + + t1 = Table("a", metadata, Column("id", Integer)) + + c2 = Column("x", Integer) + + # if we do it here, no problem + # t1.append_column(c2) + + idx = Index("foo", c2, desc("foo")) + + t1.append_column(c2) + + self._assert_index_col_x(t1, idx, columns=True) + def test_column_associated_w_lowercase_table(self): from sqlalchemy import table |