summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2020-03-22 15:04:59 +0000
committerGerrit Code Review <gerrit@bbpush.zzzcomputing.com>2020-03-22 15:04:59 +0000
commit7ff3e3f2e73e7f17c0a352dacf5c0ccfa2ef7be9 (patch)
tree553fd8f751a75dc5d614c32065817f8da6206968 /lib/sqlalchemy/orm
parentf2a817dd7cde50988839750b9c2464675fb4f069 (diff)
parent9ec75882203b2c01aa1d362f939e21ebcd188e8d (diff)
downloadsqlalchemy-7ff3e3f2e73e7f17c0a352dacf5c0ccfa2ef7be9.tar.gz
Merge "Deprecate plain string in execute and introduce `exec_driver_sql`"
Diffstat (limited to 'lib/sqlalchemy/orm')
-rw-r--r--lib/sqlalchemy/orm/events.py6
-rw-r--r--lib/sqlalchemy/orm/util.py5
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/sqlalchemy/orm/events.py b/lib/sqlalchemy/orm/events.py
index 4a50f6464..64f09ea2f 100644
--- a/lib/sqlalchemy/orm/events.py
+++ b/lib/sqlalchemy/orm/events.py
@@ -603,9 +603,9 @@ class MapperEvents(event.Events):
def my_before_insert_listener(mapper, connection, target):
# execute a stored procedure upon INSERT,
# apply the value to the row to be inserted
- target.calculated_value = connection.scalar(
- "select my_special_function(%d)"
- % target.special_number)
+ target.calculated_value = connection.execute(
+ text("select my_special_function(%d)" % target.special_number)
+ ).scalar()
# associate the listener function with SomeClass,
# to execute during the "before_insert" hook
diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py
index ccadeeaac..10cd39e75 100644
--- a/lib/sqlalchemy/orm/util.py
+++ b/lib/sqlalchemy/orm/util.py
@@ -306,8 +306,9 @@ def identity_key(*args, **kwargs):
E.g.::
- >>> row = engine.execute("select * from table where a=1 and b=2").\
-first()
+ >>> row = engine.execute(\
+ text("select * from table where a=1 and b=2")\
+ ).first()
>>> identity_key(MyClass, row=row)
(<class '__main__.MyClass'>, (1, 2), None)