--- /dev/null
+.. change::
+ :tags: bug, regression, caching
+ :tickets: 7903
+
+ Fixed regression caused by :ticket:`7823` which impacted the caching
+ system, such that bound parameters that had been "cloned" within ORM
+ operations, such as polymorphic loading, would in some cases not acquire
+ their correct execution-time value leading to incorrect bind values being
+ rendered.
# old table.
cc = self._is_clone_of
c._is_clone_of = cc if cc is not None else self
-
return c
def _negate_in_binary(self, negated_op, original_op):
def _clone(self, maintain_key=False, **kw):
c = ClauseElement._clone(self, **kw)
+ # ensure all the BindParameter objects stay in cloned set.
+ # in #7823, we changed "clone" so that a clone only keeps a reference
+ # to the "original" element, since for column correspondence, that's
+ # all we need. However, for BindParam, _cloned_set is used by
+ # the "cache key bind match" lookup, which means if any of those
+ # interim BindParameter objects became part of a cache key in the
+ # cache, we need it. So here, make sure all clones keep carrying
+ # forward.
+ c._cloned_set.update(self._cloned_set)
if not maintain_key and self.unique:
c.key = _anonymous_label.safe_construct(
id(c), c._orig_key or "param", sanitize_key=True
def assert_(self, val, msg=None):
assert val, msg
+ @config.fixture()
+ def nocache(self):
+ _cache = config.db._compiled_cache
+ config.db._compiled_cache = None
+ yield
+ config.db._compiled_cache = _cache
+
@config.fixture()
def connection_no_trans(self):
eng = getattr(self, "bind", None) or config.db
go()
def test_clone_expression(self):
-
- root_expr = column("x", Integer) == 12
+ # this test is for the memory issue "fixed" in #7823, where clones
+ # no longer carry along all past elements.
+ # However, due to #7903, we can't at the moment use a
+ # BindParameter here - these have to continue to carry along all
+ # the previous clones for now. So the test here only works with
+ # expressions that dont have BindParameter objects in them.
+
+ root_expr = column("x", Integer) == column("y", Integer)
expr = [root_expr]
@profile_memory()
from sqlalchemy.orm import joinedload
from sqlalchemy.orm import selectinload
from sqlalchemy.orm import subqueryload
+from sqlalchemy.orm import with_parent
from sqlalchemy.orm import with_polymorphic
from sqlalchemy.testing import assert_raises
from sqlalchemy.testing import eq_
-from sqlalchemy.testing import fixtures
from sqlalchemy.testing.assertsql import CompiledSQL
from sqlalchemy.testing.fixtures import fixture_session
from ._poly_fixtures import _Polymorphic
from ._poly_fixtures import Person
-class _PolymorphicTestBase(fixtures.NoCache):
+class _PolymorphicTestBase(object):
__backend__ = True
__dialect__ = "default_enhanced"
Boss(name="pointy haired boss", golf_swing="fore"),
)
+ def test_lazyload_related_w_cache_check(self):
+ sess = fixture_session()
+
+ c1 = sess.get(Company, 1)
+ c2 = sess.get(Company, 2)
+
+ q1 = (
+ sess.query(Person)
+ .filter(with_parent(c1, Company.employees))
+ .order_by(Person.person_id)
+ )
+ eq_(
+ q1.all(),
+ [
+ Engineer(name="dilbert"),
+ Engineer(name="wally"),
+ Boss(name="pointy haired boss"),
+ Manager(name="dogbert"),
+ ],
+ )
+
+ q2 = (
+ sess.query(Person)
+ .filter(with_parent(c2, Company.employees))
+ .order_by(Person.person_id)
+ )
+ eq_(q2.all(), [Engineer(name="vlad")])
+
def test_multi_join(self):
sess = fixture_session()
e = aliased(Person)
self.assert_sql_count(testing.db, go, 1)
- def test_with_polymorphic_three_future(self):
+ def test_with_polymorphic_three_future(self, nocache):
sess = fixture_session()
def go():
class PolymorphicUnionsTest(_PolymorphicTestBase, _PolymorphicUnions):
+ @testing.skip_if(
+ lambda: True, "join condition doesn't work w/ this mapping"
+ )
+ def test_lazyload_related_w_cache_check(self):
+ pass
+
def test_with_polymorphic_two_future_default_wp(self):
"""test #7262
class PolymorphicAliasedJoinsTest(
_PolymorphicTestBase, _PolymorphicAliasedJoins
):
+ @testing.skip_if(
+ lambda: True, "join condition doesn't work w/ this mapping"
+ )
+ def test_lazyload_related_w_cache_check(self):
+ pass
+
def test_with_polymorphic_two_future_default_wp(self):
"""test #7262
extracted_parameters=s1_cache_key[1],
)
- def test_construct_params_w_bind_clones_post(self):
+ @testing.combinations(True, False, argnames="adapt_before_key")
+ def test_construct_params_w_bind_clones_post(self, adapt_before_key):
"""test that a BindParameter that has been cloned after the cache
key was generated still matches up when construct_params()
is called with an extracted parameter collection.
# it's anonymous so unique=True
is_true(original_bind.unique)
+ # test #7903 - adapt the statement *before* we make the cache
+ # key also
+ if adapt_before_key:
+ stmt = sql_util.ClauseAdapter(table1).traverse(stmt)
+
# cache key against the original param
cache_key = stmt._generate_cache_key()
{"myid_1": 10},
)
- def test_construct_duped_params_w_bind_clones_post(self):
+ @testing.combinations(True, False, argnames="adapt_before_key")
+ def test_construct_duped_params_w_bind_clones_post(self, adapt_before_key):
"""same as previous test_construct_params_w_bind_clones_post but
where the binds have been used
repeatedly, and the adaption occurs on a per-subquery basis.
# it's anonymous so unique=True
is_true(original_bind.unique)
+ # variant that exercises #7903
+ if adapt_before_key:
+ stmt = sql_util.ClauseAdapter(table1).traverse(stmt)
+
# cache key against the original param
cache_key = stmt._generate_cache_key()
be unique, still matches up when construct_params()
is called with an extracted parameter collection.
- other ORM feaures like optimized_compare() end up doing something
+ other ORM features like optimized_compare() end up doing something
like this, such as if there are multiple "has()" or "any()" which would
have cloned the join condition and changed the values of bound
parameters.
projects / thirdparty / sqlalchemy / sqlalchemy.git / commitdiff
