summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/compiler.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-02-21 10:49:38 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2012-02-21 10:49:38 -0500
commitabe6c0f08a49859d8a2c36f4011e6f81ebf7ecb2 (patch)
treeb31e1d926289b3a3a1f019be3a441ba81e212315 /lib/sqlalchemy/sql/compiler.py
parent509c81d736c5d80e82e55629aebc1dedd86370f7 (diff)
downloadsqlalchemy-abe6c0f08a49859d8a2c36f4011e6f81ebf7ecb2.tar.gz
- [bug] A warning is emitted when a not-present
column is stated in the values() clause of an insert() or update() construct. Will move to an exception in 0.8. [ticket:2413]
Diffstat (limited to 'lib/sqlalchemy/sql/compiler.py')
-rw-r--r--lib/sqlalchemy/sql/compiler.py14
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index de18c48f9..1db88c68c 100644
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -1145,7 +1145,6 @@ class SQLCompiler(engine.Compiled):
for k, v in stmt.parameters.iteritems():
parameters.setdefault(sql._column_as_key(k), v)
-
# create a list of column assignment clauses as tuples
values = []
@@ -1204,7 +1203,7 @@ class SQLCompiler(engine.Compiled):
# "defaults", "primary key cols", etc.
for c in stmt.table.columns:
if c.key in parameters and c.key not in check_columns:
- value = parameters[c.key]
+ value = parameters.pop(c.key)
if sql._is_literal(value):
value = self._create_crud_bind_param(
c, value, required=value is required)
@@ -1300,6 +1299,17 @@ class SQLCompiler(engine.Compiled):
self.prefetch.append(c)
elif c.server_onupdate is not None:
self.postfetch.append(c)
+
+ if parameters and stmt.parameters:
+ check = set(parameters).intersection(
+ sql._column_as_key(k) for k in stmt.parameters
+ )
+ if check:
+ util.warn(
+ "Unconsumed column names: %s" %
+ (", ".join(check))
+ )
+
return values
def visit_delete(self, delete_stmt):