summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2019-02-13 01:35:15 +0000
committerGerrit Code Review <gerrit@bbpush.zzzcomputing.com>2019-02-13 01:35:15 +0000
commit5cc5234e0b065907deb2765249dde1c526fe5c89 (patch)
tree43a1dff1a674080707b4ab6c4b0f91bc2b8b56f8 /lib/sqlalchemy/sql
parent104625941d5589ddb93da9c66217da6308c53a15 (diff)
parentc1f310df44033d943413170de878ce95fafa387e (diff)
downloadsqlalchemy-5cc5234e0b065907deb2765249dde1c526fe5c89.tar.gz
Merge "Allow SQL expression for ORM primary keys"
Diffstat (limited to 'lib/sqlalchemy/sql')
-rw-r--r--lib/sqlalchemy/sql/crud.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/crud.py b/lib/sqlalchemy/sql/crud.py
index cc72073ca..6c9b8ee5b 100644
--- a/lib/sqlalchemy/sql/crud.py
+++ b/lib/sqlalchemy/sql/crud.py
@@ -409,7 +409,12 @@ def _append_param_parameter(
compiler.returning.append(c)
value = compiler.process(value.self_group(), **kw)
else:
- compiler.postfetch.append(c)
+ # postfetch specifically means, "we can SELECT the row we just
+ # inserted by primary key to get back the server generated
+ # defaults". so by definition this can't be used to get the primary
+ # key value back, because we need to have it ahead of time.
+ if not c.primary_key:
+ compiler.postfetch.append(c)
value = compiler.process(value.self_group(), **kw)
values.append((c, value))