summaryrefslogtreecommitdiff
path: root/test/orm
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2015-04-03 17:48:19 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2015-04-03 17:48:19 -0400
commitc19ea20875e3487c3e25c35eaf832be2b661fc0c (patch)
tree596df083fc9edf2e375a9503f0e999f6bce2c2dc /test/orm
parent541a9751fc179720d2f0a6de062c238b16e5a65e (diff)
parent3365a4f78ed54fc0c242c01a3f58e87b1518d68d (diff)
downloadsqlalchemy-c19ea20875e3487c3e25c35eaf832be2b661fc0c.tar.gz
Merge remote-tracking branch 'origin/pr/164' into pr164
Diffstat (limited to 'test/orm')
-rw-r--r--test/orm/test_update_delete.py14
1 files changed, 13 insertions, 1 deletions
diff --git a/test/orm/test_update_delete.py b/test/orm/test_update_delete.py
index dedc2133b..973053947 100644
--- a/test/orm/test_update_delete.py
+++ b/test/orm/test_update_delete.py
@@ -3,7 +3,7 @@ from sqlalchemy.testing import fixtures
from sqlalchemy import Integer, String, ForeignKey, or_, exc, \
select, func, Boolean, case, text, column
from sqlalchemy.orm import mapper, relationship, backref, Session, \
- joinedload, synonym
+ joinedload, synonym, query
from sqlalchemy import testing
from sqlalchemy.testing.schema import Table, Column
@@ -907,6 +907,18 @@ class ExpressionUpdateTest(fixtures.MappedTest):
eq_(d1.cnt, 2)
sess.close()
+ def test_update_args(self):
+ Data = self.classes.Data
+ session = testing.mock.Mock(wraps=Session())
+ update_args = {"mysql_limit": 1}
+ query.Query(Data, session).update({Data.cnt: Data.cnt + 1},
+ update_args=update_args)
+ eq_(session.execute.call_count, 1)
+ args, kwargs = session.execute.call_args
+ eq_(len(args), 1)
+ update_stmt = args[0]
+ eq_(update_stmt.dialect_kwargs, update_args)
+
class InheritTest(fixtures.DeclarativeMappedTest):