summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/sqlalchemy/sql/base.py20
-rw-r--r--lib/sqlalchemy/sql/elements.py46
-rw-r--r--lib/sqlalchemy/sql/selectable.py30
-rw-r--r--lib/sqlalchemy/sql/util.py31
-rw-r--r--test/orm/test_core_compilation.py4
-rw-r--r--test/orm/test_eager_relations.py119
-rw-r--r--test/orm/test_query.py2
-rw-r--r--test/sql/test_compiler.py96
-rw-r--r--test/sql/test_cte.py4
-rw-r--r--test/sql/test_resultset.py4
-rw-r--r--test/sql/test_selectable.py67
11 files changed, 358 insertions, 65 deletions
diff --git a/lib/sqlalchemy/sql/base.py b/lib/sqlalchemy/sql/base.py
index a6870f8d4..b235f5132 100644
--- a/lib/sqlalchemy/sql/base.py
+++ b/lib/sqlalchemy/sql/base.py
@@ -39,6 +39,8 @@ NO_ARG = util.symbol("NO_ARG")
class Immutable(object):
"""mark a ClauseElement as 'immutable' when expressions are cloned."""
+ _is_immutable = True
+
def unique_params(self, *optionaldict, **kwargs):
raise NotImplementedError("Immutable objects do not support copying")
@@ -55,6 +57,8 @@ class Immutable(object):
class SingletonConstant(Immutable):
"""Represent SQL constants like NULL, TRUE, FALSE"""
+ _is_singleton_constant = True
+
def __new__(cls, *arg, **kw):
return cls._singleton
@@ -62,14 +66,16 @@ class SingletonConstant(Immutable):
def _create_singleton(cls):
obj = object.__new__(cls)
obj.__init__()
- cls._singleton = obj
- # don't proxy singletons. this means that a SingletonConstant
- # will never be a "corresponding column" in a statement; the constant
- # can be named directly and as it is often/usually compared against using
- # "IS", it can't be adapted to a subquery column in any case.
- # see :ticket:`6259`.
- proxy_set = frozenset()
+ # for a long time this was an empty frozenset, meaning
+ # a SingletonConstant would never be a "corresponding column" in
+ # a statement. This referred to #6259. However, in #7154 we see
+ # that we do in fact need "correspondence" to work when matching cols
+ # in result sets, so the non-correspondence was moved to a more
+ # specific level when we are actually adapting expressions for SQL
+ # render only.
+ obj.proxy_set = frozenset([obj])
+ cls._singleton = obj
def _from_objects(*elements):
diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py
index 8f02527b9..6f1756af3 100644
--- a/lib/sqlalchemy/sql/elements.py
+++ b/lib/sqlalchemy/sql/elements.py
@@ -214,6 +214,8 @@ class ClauseElement(
_is_bind_parameter = False
_is_clause_list = False
_is_lambda_element = False
+ _is_singleton_constant = False
+ _is_immutable = False
_order_by_label_element = None
@@ -1023,19 +1025,39 @@ class ColumnElement(
"""
return Label(name, self, self.type)
- def _anon_label(self, seed):
+ def _anon_label(self, seed, add_hash=None):
while self._is_clone_of is not None:
self = self._is_clone_of
# as of 1.4 anonymous label for ColumnElement uses hash(), not id(),
# as the identifier, because a column and its annotated version are
# the same thing in a SQL statement
+ hash_value = hash(self)
+
+ if add_hash:
+ # this path is used for disambiguating anon labels that would
+ # otherwise be the same name for the same element repeated.
+ # an additional numeric value is factored in for each label.
+
+ # shift hash(self) (which is id(self), typically 8 byte integer)
+ # 16 bits leftward. fill extra add_hash on right
+ assert add_hash < (2 << 15)
+ assert seed
+ hash_value = (hash_value << 16) | add_hash
+
+ # extra underscore is added for labels with extra hash
+ # values, to isolate the "deduped anon" namespace from the
+ # regular namespace. eliminates chance of these
+ # manufactured hash values overlapping with regular ones for some
+ # undefined python interpreter
+ seed = seed + "_"
+
if isinstance(seed, _anonymous_label):
return _anonymous_label.safe_construct(
- hash(self), "", enclosing_label=seed
+ hash_value, "", enclosing_label=seed
)
- return _anonymous_label.safe_construct(hash(self), seed or "anon")
+ return _anonymous_label.safe_construct(hash_value, seed or "anon")
@util.memoized_property
def _anon_name_label(self):
@@ -1093,8 +1115,7 @@ class ColumnElement(
def anon_key_label(self):
return self._anon_key_label
- @util.memoized_property
- def _dedupe_anon_label(self):
+ def _dedupe_anon_label_idx(self, idx):
"""label to apply to a column that is anon labeled, but repeated
in the SELECT, so that we have to make an "extra anon" label that
disambiguates it from the previous appearance.
@@ -1113,9 +1134,9 @@ class ColumnElement(
# "CAST(casttest.v1 AS DECIMAL) AS anon__1"
if label is None:
- return self._dedupe_anon_tq_label
+ return self._dedupe_anon_tq_label_idx(idx)
else:
- return self._anon_label(label + "_")
+ return self._anon_label(label, add_hash=idx)
@util.memoized_property
def _anon_tq_label(self):
@@ -1125,10 +1146,10 @@ class ColumnElement(
def _anon_tq_key_label(self):
return self._anon_label(getattr(self, "_tq_key_label", None))
- @util.memoized_property
- def _dedupe_anon_tq_label(self):
+ def _dedupe_anon_tq_label_idx(self, idx):
label = getattr(self, "_tq_label", None) or "anon"
- return self._anon_label(label + "_")
+
+ return self._anon_label(label, add_hash=idx)
class WrapsColumnExpression(object):
@@ -1178,14 +1199,13 @@ class WrapsColumnExpression(object):
return wce._anon_name_label
return super(WrapsColumnExpression, self)._anon_name_label
- @property
- def _dedupe_anon_label(self):
+ def _dedupe_anon_label_idx(self, idx):
wce = self.wrapped_column_expression
nal = wce._non_anon_label
if nal:
return self._anon_label(nal + "_")
else:
- return self._dedupe_anon_tq_label
+ return self._dedupe_anon_tq_label_idx(idx)
class BindParameter(roles.InElementRole, ColumnElement):
diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py
index 8f8e6b2a7..8e71dfb97 100644
--- a/lib/sqlalchemy/sql/selectable.py
+++ b/lib/sqlalchemy/sql/selectable.py
@@ -6066,6 +6066,14 @@ class Select(
table_qualified = self._label_style is LABEL_STYLE_TABLENAME_PLUS_COL
label_style_none = self._label_style is LABEL_STYLE_NONE
+ # a counter used for "dedupe" labels, which have double underscores
+ # in them and are never referred by name; they only act
+ # as positional placeholders. they need only be unique within
+ # the single columns clause they're rendered within (required by
+ # some dbs such as mysql). So their anon identity is tracked against
+ # a fixed counter rather than hash() identity.
+ dedupe_hash = 1
+
for c in cols:
repeated = False
@@ -6099,9 +6107,15 @@ class Select(
# here, "required_label_name" is sent as
# "None" and "fallback_label_name" is sent.
if table_qualified:
- fallback_label_name = c._dedupe_anon_tq_label
+ fallback_label_name = (
+ c._dedupe_anon_tq_label_idx(dedupe_hash)
+ )
+ dedupe_hash += 1
else:
- fallback_label_name = c._dedupe_anon_label
+ fallback_label_name = c._dedupe_anon_label_idx(
+ dedupe_hash
+ )
+ dedupe_hash += 1
else:
fallback_label_name = c._anon_name_label
else:
@@ -6142,11 +6156,13 @@ class Select(
if table_qualified:
required_label_name = (
fallback_label_name
- ) = c._dedupe_anon_tq_label
+ ) = c._dedupe_anon_tq_label_idx(dedupe_hash)
+ dedupe_hash += 1
else:
required_label_name = (
fallback_label_name
- ) = c._dedupe_anon_label
+ ) = c._dedupe_anon_label_idx(dedupe_hash)
+ dedupe_hash += 1
repeated = True
else:
names[required_label_name] = c
@@ -6156,11 +6172,13 @@ class Select(
if table_qualified:
required_label_name = (
fallback_label_name
- ) = c._dedupe_anon_tq_label
+ ) = c._dedupe_anon_tq_label_idx(dedupe_hash)
+ dedupe_hash += 1
else:
required_label_name = (
fallback_label_name
- ) = c._dedupe_anon_label
+ ) = c._dedupe_anon_label_idx(dedupe_hash)
+ dedupe_hash += 1
repeated = True
else:
names[effective_name] = c
diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py
index da5e31655..7fcb45709 100644
--- a/lib/sqlalchemy/sql/util.py
+++ b/lib/sqlalchemy/sql/util.py
@@ -847,7 +847,7 @@ class ClauseAdapter(visitors.ReplacingExternalTraversal):
return newcol
@util.preload_module("sqlalchemy.sql.functions")
- def replace(self, col):
+ def replace(self, col, _include_singleton_constants=False):
functions = util.preloaded.sql_functions
if isinstance(col, FromClause) and not isinstance(
@@ -881,6 +881,14 @@ class ClauseAdapter(visitors.ReplacingExternalTraversal):
elif not isinstance(col, ColumnElement):
return None
+ elif not _include_singleton_constants and col._is_singleton_constant:
+ # dont swap out NULL, TRUE, FALSE for a label name
+ # in a SQL statement that's being rewritten,
+ # leave them as the constant. This is first noted in #6259,
+ # however the logic to check this moved here as of #7154 so that
+ # it is made specific to SQL rewriting and not all column
+ # correspondence
+ return None
if "adapt_column" in col._annotations:
col = col._annotations["adapt_column"]
@@ -1001,8 +1009,25 @@ class ColumnAdapter(ClauseAdapter):
return newcol
def _locate_col(self, col):
-
- c = ClauseAdapter.traverse(self, col)
+ # both replace and traverse() are overly complicated for what
+ # we are doing here and we would do better to have an inlined
+ # version that doesn't build up as much overhead. the issue is that
+ # sometimes the lookup does in fact have to adapt the insides of
+ # say a labeled scalar subquery. However, if the object is an
+ # Immutable, i.e. Column objects, we can skip the "clone" /
+ # "copy internals" part since those will be no-ops in any case.
+ # additionally we want to catch singleton objects null/true/false
+ # and make sure they are adapted as well here.
+
+ if col._is_immutable:
+ for vis in self.visitor_iterator:
+ c = vis.replace(col, _include_singleton_constants=True)
+ if c is not None:
+ break
+ else:
+ c = col
+ else:
+ c = ClauseAdapter.traverse(self, col)
if self._wrap:
c2 = self._wrap._locate_col(c)
diff --git a/test/orm/test_core_compilation.py b/test/orm/test_core_compilation.py
index 284a45caa..5d66e339a 100644
--- a/test/orm/test_core_compilation.py
+++ b/test/orm/test_core_compilation.py
@@ -983,6 +983,10 @@ class ExtraColsTest(QueryTest, AssertsCompiledSQL):
# test that the outer IS NULL is rendered, not adapted
# test that the inner query includes the NULL we asked for
+
+ # ironically, this statement would not actually fetch due to the NULL
+ # not allowing adaption and therefore failing on the result set
+ # matching, this was addressed in #7154.
self.assert_compile(
stmt,
"SELECT anon_2.anon_1, anon_2.id, anon_2.name, "
diff --git a/test/orm/test_eager_relations.py b/test/orm/test_eager_relations.py
index cb3ce8bfd..8f9c9d4b0 100644
--- a/test/orm/test_eager_relations.py
+++ b/test/orm/test_eager_relations.py
@@ -9,10 +9,12 @@ from sqlalchemy import Date
from sqlalchemy import ForeignKey
from sqlalchemy import func
from sqlalchemy import Integer
+from sqlalchemy import null
from sqlalchemy import select
from sqlalchemy import String
from sqlalchemy import testing
from sqlalchemy import text
+from sqlalchemy import true
from sqlalchemy.orm import aliased
from sqlalchemy.orm import backref
from sqlalchemy.orm import close_all_sessions
@@ -5796,7 +5798,9 @@ class EntityViaMultiplePathTestOne(fixtures.DeclarativeMappedTest):
class A(Base):
__tablename__ = "a"
- id = Column(Integer, primary_key=True)
+ id = Column(
+ Integer, primary_key=True, test_needs_autoincrement=True
+ )
b_id = Column(ForeignKey("b.id"))
c_id = Column(ForeignKey("c.id"))
@@ -5805,20 +5809,26 @@ class EntityViaMultiplePathTestOne(fixtures.DeclarativeMappedTest):
class B(Base):
__tablename__ = "b"
- id = Column(Integer, primary_key=True)
+ id = Column(
+ Integer, primary_key=True, test_needs_autoincrement=True
+ )
c_id = Column(ForeignKey("c.id"))
c = relationship("C")
class C(Base):
__tablename__ = "c"
- id = Column(Integer, primary_key=True)
+ id = Column(
+ Integer, primary_key=True, test_needs_autoincrement=True
+ )
d_id = Column(ForeignKey("d.id"))
d = relationship("D")
class D(Base):
__tablename__ = "d"
- id = Column(Integer, primary_key=True)
+ id = Column(
+ Integer, primary_key=True, test_needs_autoincrement=True
+ )
@classmethod
def define_tables(cls, metadata):
@@ -5898,7 +5908,9 @@ class EntityViaMultiplePathTestTwo(fixtures.DeclarativeMappedTest):
class User(Base):
__tablename__ = "cs_user"
- id = Column(Integer, primary_key=True)
+ id = Column(
+ Integer, primary_key=True, test_needs_autoincrement=True
+ )
data = Column(Integer)
class LD(Base):
@@ -5906,7 +5918,9 @@ class EntityViaMultiplePathTestTwo(fixtures.DeclarativeMappedTest):
__tablename__ = "cs_ld"
- id = Column(Integer, primary_key=True)
+ id = Column(
+ Integer, primary_key=True, test_needs_autoincrement=True
+ )
user_id = Column(Integer, ForeignKey("cs_user.id"))
user = relationship(User, primaryjoin=user_id == User.id)
@@ -5915,7 +5929,9 @@ class EntityViaMultiplePathTestTwo(fixtures.DeclarativeMappedTest):
__tablename__ = "cs_a"
- id = Column(Integer, primary_key=True)
+ id = Column(
+ Integer, primary_key=True, test_needs_autoincrement=True
+ )
ld_id = Column(Integer, ForeignKey("cs_ld.id"))
ld = relationship(LD, primaryjoin=ld_id == LD.id)
@@ -5924,7 +5940,9 @@ class EntityViaMultiplePathTestTwo(fixtures.DeclarativeMappedTest):
__tablename__ = "cs_lda"
- id = Column(Integer, primary_key=True)
+ id = Column(
+ Integer, primary_key=True, test_needs_autoincrement=True
+ )
ld_id = Column(Integer, ForeignKey("cs_ld.id"))
a_id = Column(Integer, ForeignKey("cs_a.id"))
a = relationship(A, primaryjoin=a_id == A.id)
@@ -6004,18 +6022,24 @@ class LazyLoadOptSpecificityTest(fixtures.DeclarativeMappedTest):
class A(Base):
__tablename__ = "a"
- id = Column(Integer, primary_key=True)
+ id = Column(
+ Integer, primary_key=True, test_needs_autoincrement=True
+ )
bs = relationship("B")
class B(Base):
__tablename__ = "b"
- id = Column(Integer, primary_key=True)
+ id = Column(
+ Integer, primary_key=True, test_needs_autoincrement=True
+ )
a_id = Column(ForeignKey("a.id"))
cs = relationship("C")
class C(Base):
__tablename__ = "c"
- id = Column(Integer, primary_key=True)
+ id = Column(
+ Integer, primary_key=True, test_needs_autoincrement=True
+ )
b_id = Column(ForeignKey("b.id"))
@classmethod
@@ -6638,3 +6662,76 @@ class SecondaryOptionsTest(fixtures.MappedTest):
{"pk_1": 4},
),
)
+
+
+class SingletonConstantSubqTest(_fixtures.FixtureTest):
+ """POC test for both #7153 and #7154"""
+
+ run_inserts = "once"
+ run_deletes = None
+
+ __backend__ = True
+
+ @classmethod
+ def setup_mappers(cls):
+ cls._setup_stock_mapping()
+
+ def test_limited_eager_w_null(self):
+ User = self.classes.User
+ Address = self.classes.Address
+
+ stmt = (
+ select(User, null())
+ .options(joinedload(User.addresses))
+ .where(User.id == 8)
+ .limit(10)
+ )
+
+ session = fixture_session()
+
+ def go():
+ eq_(
+ session.execute(stmt).unique().all(),
+ [
+ (
+ User(
+ id=8, addresses=[Address(), Address(), Address()]
+ ),
+ None,
+ )
+ ],
+ )
+
+ self.assert_sql_count(testing.db, go, 1)
+
+ def test_limited_eager_w_multi_null_booleans(self):
+ User = self.classes.User
+ Address = self.classes.Address
+
+ stmt = (
+ select(User, null(), null(), null(), true(), true())
+ .options(joinedload(User.addresses))
+ .where(User.id == 8)
+ .limit(10)
+ )
+
+ session = fixture_session()
+
+ def go():
+ eq_(
+ session.execute(stmt).unique().all(),
+ [
+ (
+ User(
+ id=8, addresses=[Address(), Address(), Address()]
+ ),
+ None,
+ None,
+ None,
+ True,
+ True,
+ )
+ ],
+ )
+
+ self.assert_sql_count(testing.db, go, 1)
diff --git a/test/orm/test_query.py b/test/orm/test_query.py
index def2fd679..3e58f211c 100644
--- a/test/orm/test_query.py
+++ b/test/orm/test_query.py
@@ -265,7 +265,7 @@ class RowTupleTest(QueryTest, AssertsCompiledSQL):
(
lambda s, User: (User.id,) + tuple([null()] * 3),
"users.id AS users_id, NULL AS anon_1, NULL AS anon__1, "
- "NULL AS anon__1",
+ "NULL AS anon__2",
(7, None, None, None),
),
)
diff --git a/test/sql/test_compiler.py b/test/sql/test_compiler.py
index 15b13caaa..419d14ce7 100644
--- a/test/sql/test_compiler.py
+++ b/test/sql/test_compiler.py
@@ -78,6 +78,7 @@ from sqlalchemy.sql import operators
from sqlalchemy.sql import table
from sqlalchemy.sql import util as sql_util
from sqlalchemy.sql.elements import BooleanClauseList
+from sqlalchemy.sql.elements import ColumnElement
from sqlalchemy.sql.expression import ClauseElement
from sqlalchemy.sql.expression import ClauseList
from sqlalchemy.sql.expression import HasPrefixes
@@ -88,6 +89,7 @@ from sqlalchemy.testing import assert_raises_message
from sqlalchemy.testing import AssertsCompiledSQL
from sqlalchemy.testing import eq_
from sqlalchemy.testing import eq_ignore_whitespace
+from sqlalchemy.testing import expect_raises
from sqlalchemy.testing import expect_raises_message
from sqlalchemy.testing import fixtures
from sqlalchemy.testing import is_
@@ -839,9 +841,9 @@ class SelectTest(fixtures.TestBase, AssertsCompiledSQL):
"foo_bar.id AS foo_bar_id_1, " # 2. 1st foo_bar.id, disamb from 1
"foo.bar_id AS foo_bar_id__1, " # 3. 2nd foo.bar_id, dedupe from 1
"foo.id AS foo_id__1, "
- "foo.bar_id AS foo_bar_id__1, " # 4. 3rd foo.bar_id, same as 3
- "foo_bar.id AS foo_bar_id__2, " # 5. 2nd foo_bar.id
- "foo_bar.id AS foo_bar_id__2 " # 6. 3rd foo_bar.id, same as 5
+ "foo.bar_id AS foo_bar_id__2, " # 4. 3rd foo.bar_id, dedupe again
+ "foo_bar.id AS foo_bar_id__3, " # 5. 2nd foo_bar.id
+ "foo_bar.id AS foo_bar_id__4 " # 6. 3rd foo_bar.id, dedupe again
"FROM foo, foo_bar",
)
eq_(
@@ -878,9 +880,9 @@ class SelectTest(fixtures.TestBase, AssertsCompiledSQL):
"foo_bar.id AS foo_bar_id_1, " # 2. 1st foo_bar.id, disamb from 1
"foo.bar_id AS foo_bar_id__1, " # 3. 2nd foo.bar_id, dedupe from 1
"foo.id AS foo_id__1, "
- "foo.bar_id AS foo_bar_id__1, " # 4. 3rd foo.bar_id, same as 3
- "foo_bar.id AS foo_bar_id__2, " # 5. 2nd foo_bar.id
- "foo_bar.id AS foo_bar_id__2 " # 6. 3rd foo_bar.id, same as 5
+ "foo.bar_id AS foo_bar_id__2, " # 4. 3rd foo.bar_id, dedupe again
+ "foo_bar.id AS foo_bar_id__3, " # 5. 2nd foo_bar.id
+ "foo_bar.id AS foo_bar_id__4 " # 6. 3rd foo_bar.id, dedupe again
"FROM foo, foo_bar"
") AS anon_1",
)
@@ -952,9 +954,9 @@ class SelectTest(fixtures.TestBase, AssertsCompiledSQL):
"foo_bar.id AS foo_bar_id_1, " # 2. 1st foo_bar.id, disamb from 1
"foo.bar_id AS foo_bar_id__1, " # 3. 2nd foo.bar_id, dedupe from 1
"foo.id AS foo_id__1, "
- "foo.bar_id AS foo_bar_id__1, " # 4. 3rd foo.bar_id, same as 3
- "foo_bar.id AS foo_bar_id__2, " # 5. 2nd foo_bar.id
- "foo_bar.id AS foo_bar_id__2 " # 6. 3rd foo_bar.id, same as 5
+ "foo.bar_id AS foo_bar_id__2, " # 4. 3rd foo.bar_id, dedupe again
+ "foo_bar.id AS foo_bar_id__3, " # 5. 2nd foo_bar.id
+ "foo_bar.id AS foo_bar_id__4 " # 6. 3rd foo_bar.id, dedupe again
"FROM foo, foo_bar",
)
@@ -965,7 +967,7 @@ class SelectTest(fixtures.TestBase, AssertsCompiledSQL):
LABEL_STYLE_TABLENAME_PLUS_COL
),
"SELECT t.a AS t_a, t.a AS t_a__1, t.b AS t_b, "
- "t.a AS t_a__1 FROM t",
+ "t.a AS t_a__2 FROM t",
)
def test_dupe_columns_use_labels_derived_selectable(self):
@@ -979,7 +981,7 @@ class SelectTest(fixtures.TestBase, AssertsCompiledSQL):
self.assert_compile(
select(stmt).set_label_style(LABEL_STYLE_NONE),
"SELECT anon_1.t_a, anon_1.t_a, anon_1.t_b, anon_1.t_a FROM "
- "(SELECT t.a AS t_a, t.a AS t_a__1, t.b AS t_b, t.a AS t_a__1 "
+ "(SELECT t.a AS t_a, t.a AS t_a__1, t.b AS t_b, t.a AS t_a__2 "
"FROM t) AS anon_1",
)
@@ -992,7 +994,7 @@ class SelectTest(fixtures.TestBase, AssertsCompiledSQL):
LABEL_STYLE_TABLENAME_PLUS_COL
),
"SELECT t.a AS t_a, t.a AS t_a__1, t.b AS t_b, "
- "t.a AS t_a__1 FROM t",
+ "t.a AS t_a__2 FROM t",
)
self.assert_compile(
@@ -1000,7 +1002,7 @@ class SelectTest(fixtures.TestBase, AssertsCompiledSQL):
LABEL_STYLE_TABLENAME_PLUS_COL
),
"SELECT t.a AS t_a, t.a AS t_a__1, t.b AS t_b, "
- "t.a AS t_a__1 FROM t",
+ "t.a AS t_a__2 FROM t",
)
self.assert_compile(
@@ -1008,7 +1010,7 @@ class SelectTest(fixtures.TestBase, AssertsCompiledSQL):
LABEL_STYLE_TABLENAME_PLUS_COL
),
"SELECT t.a AS t_a, t.a AS t_a__1, t.b AS t_b, "
- "t.a AS t_a__1 FROM t",
+ "t.a AS t_a__2 FROM t",
)
def test_dupe_columns_use_labels_derived_selectable_mix_annotations(self):
@@ -1023,7 +1025,7 @@ class SelectTest(fixtures.TestBase, AssertsCompiledSQL):
self.assert_compile(
select(stmt).set_label_style(LABEL_STYLE_NONE),
"SELECT anon_1.t_a, anon_1.t_a, anon_1.t_b, anon_1.t_a FROM "
- "(SELECT t.a AS t_a, t.a AS t_a__1, t.b AS t_b, t.a AS t_a__1 "
+ "(SELECT t.a AS t_a, t.a AS t_a__1, t.b AS t_b, t.a AS t_a__2 "
"FROM t) AS anon_1",
)
@@ -1044,8 +1046,8 @@ class SelectTest(fixtures.TestBase, AssertsCompiledSQL):
self.assert_compile(
stmt,
"SELECT foo.bar_id AS foo_bar_id, foo_bar.id AS foo_bar_id_1, "
- "foo_bar.id AS foo_bar_id__1, foo_bar.id AS foo_bar_id__1, "
- "foo_bar.id AS foo_bar_id__1 FROM foo, foo_bar",
+ "foo_bar.id AS foo_bar_id__1, foo_bar.id AS foo_bar_id__2, "
+ "foo_bar.id AS foo_bar_id__3 FROM foo, foo_bar",
)
def test_dupe_columns_use_labels_from_anon(self):
@@ -1060,7 +1062,7 @@ class SelectTest(fixtures.TestBase, AssertsCompiledSQL):
LABEL_STYLE_TABLENAME_PLUS_COL
),
"SELECT t_1.a AS t_1_a, t_1.a AS t_1_a__1, t_1.b AS t_1_b, "
- "t_1.a AS t_1_a__1 "
+ "t_1.a AS t_1_a__2 "
"FROM t AS t_1",
)
@@ -2536,6 +2538,62 @@ class SelectTest(fixtures.TestBase, AssertsCompiledSQL):
"WHERE mytable.myid = myothertable.otherid ORDER BY myid",
)
+ def test_deduping_hash_algo(self):
+ """related to #7153.
+
+ testing new feature "add_hash" of _anon_label which adds an additional
+ integer value as part of what the anon label is deduplicated upon.
+
+ """
+
+ class Thing(ColumnElement):
+ def __init__(self, hash_):
+ self._hash = hash_
+
+ def __hash__(self):
+ return self._hash
+
+ t1 = Thing(10)
+ t2 = Thing(11)
+
+ # this is the collision case. therefore we assert that this
+ # add_hash has to be below 16 bits.
+ # eq_(
+ # t1._anon_label('hi', add_hash=65537),
+ # t2._anon_label('hi', add_hash=1)
+ # )
+ with expect_raises(AssertionError):
+ t1._anon_label("hi", add_hash=65536)
+
+ for i in range(50):
+ ne_(
+ t1._anon_label("hi", add_hash=i),
+ t2._anon_label("hi", add_hash=1),
+ )
+
+ def test_deduping_unique_across_selects(self):
+ """related to #7153
+
+ looking to see that dedupe anon labels use a unique hash not only
+ within each statement but across multiple statements.
+
+ """
+
+ s1 = select(null(), null())
+
+ s2 = select(true(), true())
+
+ s3 = union(s1, s2)
+
+ self.assert_compile(
+ s3,
+ "SELECT NULL AS anon_1, NULL AS anon__1 " "UNION "
+ # without the feature tested in test_deduping_hash_algo we'd get
+ # "SELECT true AS anon_2, true AS anon__1",
+ "SELECT true AS anon_2, true AS anon__2",
+ dialect="default_enhanced",
+ )
+
def test_compound_grouping(self):
s = select(column("foo"), column("bar")).select_from(text("bat"))
@@ -3602,7 +3660,7 @@ class BindParameterTest(AssertsCompiledSQL, fixtures.TestBase):
# the label name, but that's a different issue
self.assert_compile(
stmt1,
- "SELECT :foo_1 AS anon_1, :foo_1 AS anon__1, :foo_1 AS anon__1",
+ "SELECT :foo_1 AS anon_1, :foo_1 AS anon__1, :foo_1 AS anon__2",
)
def _test_binds_no_hash_collision(self):
diff --git a/test/sql/test_cte.py b/test/sql/test_cte.py
index 2d658338f..5d24adff9 100644
--- a/test/sql/test_cte.py
+++ b/test/sql/test_cte.py
@@ -633,8 +633,8 @@ class CTETest(fixtures.TestBase, AssertsCompiledSQL):
"WITH RECURSIVE anon_1(foo_id, foo_bar_id, foo_bar_id_1) AS "
"(SELECT foo.id AS foo_id, foo.bar_id AS foo_bar_id, "
"foo_bar.id AS foo_bar_id_1, foo.bar_id AS foo_bar_id__1, "
- "foo.id AS foo_id__1, foo.bar_id AS foo_bar_id__1, "
- "foo_bar.id AS foo_bar_id__2, foo_bar.id AS foo_bar_id__2 "
+ "foo.id AS foo_id__1, foo.bar_id AS foo_bar_id__2, "
+ "foo_bar.id AS foo_bar_id__3, foo_bar.id AS foo_bar_id__4 "
"FROM foo, foo_bar) "
"SELECT anon_1.foo_id, anon_1.foo_bar_id, anon_1.foo_bar_id_1, "
"anon_1.foo_bar_id AS foo_bar_id_2, anon_1.foo_id AS foo_id_1, "
diff --git a/test/sql/test_resultset.py b/test/sql/test_resultset.py
index 936d0d9db..bf912bd25 100644
--- a/test/sql/test_resultset.py
+++ b/test/sql/test_resultset.py
@@ -1957,9 +1957,9 @@ class KeyTargetingTest(fixtures.TablesTest):
"keyed2_a",
"keyed3_a",
"keyed2_a__1",
- "keyed2_a__1",
- "keyed3_a__1",
+ "keyed2_a__2",
"keyed3_a__1",
+ "keyed3_a__2",
"keyed3_d",
"keyed3_d__1",
],
diff --git a/test/sql/test_selectable.py b/test/sql/test_selectable.py
index 2157b5c71..e68e98a3c 100644
--- a/test/sql/test_selectable.py
+++ b/test/sql/test_selectable.py
@@ -6,6 +6,7 @@ from sqlalchemy import cast
from sqlalchemy import Column
from sqlalchemy import exc
from sqlalchemy import exists
+from sqlalchemy import false
from sqlalchemy import ForeignKey
from sqlalchemy import func
from sqlalchemy import Integer
@@ -22,6 +23,7 @@ from sqlalchemy import String
from sqlalchemy import Table
from sqlalchemy import testing
from sqlalchemy import text
+from sqlalchemy import true
from sqlalchemy import type_coerce
from sqlalchemy import TypeDecorator
from sqlalchemy import union
@@ -513,6 +515,21 @@ class SelectableTest(
eq_(list(stmt.c.keys()), ["q"])
eq_(list(stmt2.c.keys()), ["q", "p"])
+ @testing.combinations(
+ func.now(), null(), true(), false(), literal_column("10"), column("x")
+ )
+ def test_const_object_correspondence(self, c):
+ """test #7154"""
+
+ stmt = select(c).subquery()
+
+ stmt2 = select(stmt)
+
+ is_(
+ stmt2.selected_columns.corresponding_column(c),
+ stmt2.selected_columns[0],
+ )
+
def test_append_column_after_visitor_replace(self):
# test for a supported idiom that matches the deprecated / removed
# replace_selectable method
@@ -3180,7 +3197,7 @@ class ReprTest(fixtures.TestBase):
repr(obj)
-class WithLabelsTest(fixtures.TestBase):
+class WithLabelsTest(AssertsCompiledSQL, fixtures.TestBase):
def _assert_result_keys(self, s, keys):
compiled = s.compile()
@@ -3266,6 +3283,54 @@ class WithLabelsTest(fixtures.TestBase):
eq_(list(sel.subquery().c.keys()), ["t1_x", "t1_y", "t1_x_1"])
self._assert_result_keys(sel, ["t1_x__1", "t1_x", "t1_y"])
+ def _columns_repeated_identity(self):
+ m = MetaData()
+ t1 = Table("t1", m, Column("x", Integer), Column("y", Integer))
+ return select(t1.c.x, t1.c.y, t1.c.x, t1.c.x, t1.c.x).set_label_style(
+ LABEL_STYLE_NONE
+ )
+
+ def _anon_columns_repeated_identity_one(self):
+ m = MetaData()
+ t1 = Table("t1", m, Column("x", Integer), Column("y", Integer))
+ return select(t1.c.x, null(), null(), null()).set_label_style(
+ LABEL_STYLE_NONE
+ )
+
+ def _anon_columns_repeated_identity_two(self):
+ fn = func.now()
+ return select(fn, fn, fn, fn).set_label_style(LABEL_STYLE_NONE)
+
+ def test_columns_repeated_identity_disambiguate(self):
+ """test #7153"""
+ sel = self._columns_repeated_identity().set_label_style(
+ LABEL_STYLE_DISAMBIGUATE_ONLY
+ )
+
+ self.assert_compile(
+ sel,
+ "SELECT t1.x, t1.y, t1.x AS x__1, t1.x AS x__2, "
+ "t1.x AS x__3 FROM t1",
+ )
+
+ def test_columns_repeated_identity_subquery_disambiguate(self):
+ """test #7153"""
+ sel = self._columns_repeated_identity()
+
+ stmt = select(sel.subquery()).set_label_style(
+ LABEL_STYLE_DISAMBIGUATE_ONLY
+ )
+
+ # databases like MySQL won't allow the subquery to have repeated labels
+ # even if we don't try to access them
+ self.assert_compile(
+ stmt,
+ "SELECT anon_1.x, anon_1.y, anon_1.x AS x_1, anon_1.x AS x_2, "
+ "anon_1.x AS x_3 FROM "
+ "(SELECT t1.x AS x, t1.y AS y, t1.x AS x__1, t1.x AS x__2, "
+ "t1.x AS x__3 FROM t1) AS anon_1",
+ )
+
def _labels_overlap(self):
m = MetaData()
t1 = Table("t", m, Column("x_id", Integer))
View Lorry Controller Status