From: Mike Bayer Date: Sat, 1 Feb 2014 00:57:38 +0000 (-0500) Subject: - Added a new directive used within the scope of an attribute "set" operation X-Git-Tag: rel_0_9_2~12 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=33c7cfff6eb1b8d93dee3b4a76f4cac38c772d77;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git - Added a new directive used within the scope of an attribute "set" operation to disable autoflush, in the case that the attribute needs to lazy-load the "old" value, as in when replacing one-to-one values or some kinds of many-to-one. A flush at this point otherwise occurs at the point that the attribute is None and can cause NULL violations. [ticket:2921] --- diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst index 4a4ec10089..8995f7d399 100644 --- a/doc/build/changelog/changelog_09.rst +++ b/doc/build/changelog/changelog_09.rst @@ -14,6 +14,16 @@ .. changelog:: :version: 0.9.2 + .. change:: + :tags: bug, orm + :tickets: 2921 + + Added a new directive used within the scope of an attribute "set" operation + to disable autoflush, in the case that the attribute needs to lazy-load + the "old" value, as in when replacing one-to-one values or some + kinds of many-to-one. A flush at this point otherwise occurs + at the point that the attribute is None and can cause NULL violations. + .. change:: :tags: feature, orm diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py index e5f8550abd..7647bf9d07 100644 --- a/lib/sqlalchemy/orm/attributes.py +++ b/lib/sqlalchemy/orm/attributes.py @@ -23,7 +23,7 @@ from .base import PASSIVE_NO_RESULT, ATTR_WAS_SET, ATTR_EMPTY, NO_VALUE,\ NEVER_SET, NO_CHANGE, CALLABLES_OK, SQL_OK, RELATED_OBJECT_OK,\ INIT_OK, NON_PERSISTENT_OK, LOAD_AGAINST_COMMITTED, PASSIVE_OFF,\ PASSIVE_RETURN_NEVER_SET, PASSIVE_NO_INITIALIZE, PASSIVE_NO_FETCH,\ - PASSIVE_NO_FETCH_RELATED, PASSIVE_ONLY_PERSISTENT + PASSIVE_NO_FETCH_RELATED, PASSIVE_ONLY_PERSISTENT, NO_AUTOFLUSH from .base import state_str, instance_str @inspection._self_inspects @@ -761,7 +761,7 @@ class ScalarObjectAttributeImpl(ScalarAttributeImpl): """ if self.dispatch._active_history: - old = self.get(state, dict_, passive=PASSIVE_ONLY_PERSISTENT) + old = self.get(state, dict_, passive=PASSIVE_ONLY_PERSISTENT | NO_AUTOFLUSH) else: old = self.get(state, dict_, passive=PASSIVE_NO_FETCH) diff --git a/lib/sqlalchemy/orm/base.py b/lib/sqlalchemy/orm/base.py index 577f9ff764..e973de8972 100644 --- a/lib/sqlalchemy/orm/base.py +++ b/lib/sqlalchemy/orm/base.py @@ -80,6 +80,10 @@ LOAD_AGAINST_COMMITTED = util.symbol("LOAD_AGAINST_COMMITTED", """, canonical=32 ) +NO_AUTOFLUSH = util.symbol("NO_AUTOFLUSH", +"""loader callables should disable autoflush. +""", canonical=64) + # pre-packaged sets of flags used as inputs PASSIVE_OFF = util.symbol("PASSIVE_OFF", "Callables can be emitted in all cases.", diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py index bd9b02d24b..2c18e81293 100644 --- a/lib/sqlalchemy/orm/strategies.py +++ b/lib/sqlalchemy/orm/strategies.py @@ -536,9 +536,10 @@ class LazyLoader(AbstractRelationshipLoader): pending = not state.key # don't autoflush on pending - if pending: + if pending or passive & attributes.NO_AUTOFLUSH: q = q.autoflush(False) + if state.load_path: q = q._with_current_path(state.load_path[self.parent_property]) @@ -568,6 +569,7 @@ class LazyLoader(AbstractRelationshipLoader): q = q.filter(lazy_clause) + result = q.all() if self.uselist: return result diff --git a/test/orm/test_cascade.py b/test/orm/test_cascade.py index 615ae815d1..bd6a172866 100644 --- a/test/orm/test_cascade.py +++ b/test/orm/test_cascade.py @@ -552,6 +552,56 @@ class O2OSingleParentTest(_fixtures.FixtureTest): assert u1.address is not a1 assert a1.user is None +class O2OSingleParentNoFlushTest(fixtures.MappedTest): + run_inserts = None + + @classmethod + def define_tables(cls, metadata): + Table('users', metadata, + Column('id', Integer, primary_key=True, test_needs_autoincrement=True), + Column('name', String(30), nullable=False), + ) + + Table('addresses', metadata, + Column('id', Integer, primary_key=True, test_needs_autoincrement=True), + Column('user_id', None, ForeignKey('users.id'), nullable=False), + Column('email_address', String(50), nullable=False), + ) + + @classmethod + def setup_classes(cls): + class User(cls.Comparable): + pass + class Address(cls.Comparable): + pass + + @classmethod + def setup_mappers(cls): + Address, addresses, users, User = (cls.classes.Address, + cls.tables.addresses, + cls.tables.users, + cls.classes.User) + + mapper(Address, addresses) + mapper(User, users, properties={'address' + : relationship(Address, backref=backref('user', + single_parent=True, cascade="all, delete-orphan"), + uselist=False)}) + + def test_replace_attribute_no_flush(self): + # test [ticket:2921] + + User, Address = self.classes.User, self.classes.Address + a1 = Address(email_address='some address') + u1 = User(name='u1', address=a1) + sess = Session() + sess.add(u1) + sess.commit() + + a2 = Address(email_address='asdf') + sess.add(a2) + u1.address = a2 + class NoSaveCascadeFlushTest(_fixtures.FixtureTest): """Test related item not present in session, commit proceeds.""" @@ -1429,6 +1479,7 @@ class M2OCascadeDeleteOrphanTestTwo(fixtures.MappedTest): eq_(sess.query(T2).all(), []) eq_(sess.query(T3).all(), []) + def test_finds_orphans_twolevel(self): T2, T3, T1 = (self.classes.T2, self.classes.T3,