added "late WHERE" compilation to SELECT, adds where criterion based on extra bind parameters specified

at compilation/execution time

2 files changed, 28 insertions, 2 deletions

diff --git a/lib/sqlalchemy/ansisql.py b/lib/sqlalchemy/ansisql.py
index 795a2545b..d8d2662ba 100644
--- a/lib/sqlalchemy/ansisql.py
+++ b/lib/sqlalchemy/ansisql.py
@@ -269,11 +269,24 @@ class ANSICompiler(sql.Compiled):
         
         whereclause = select.whereclause
         
-        # TODO: look at our own parameters, see if they
+        # look at our own parameters, see if they
         # are all present in the form of BindParamClauses.  if
         # not, then append to the above whereclause column conditions
         # matching those keys
-        
+        if self.parameters is not None:
+            revisit = False
+            for c in inner_columns:
+                if self.parameters.has_key(c.key) and not self.binds.has_key(c.key):
+                    value = self.parameters[c.key]
+                elif self.parameters.has_key(c.label) and not self.binds.has_key(c.label):
+                    value = self.parameters[c.label]
+                else:
+                    continue
+                clause = c==value
+                clause.accept_visitor(self)
+                whereclause = sql.and_(clause, whereclause)
+                self.visit_compound(whereclause)
+                
         froms = []
         for f in select.froms:
 
diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index ab762cb39..a634767ea 100644
--- a/lib/sqlalchemy/sql.py
+++ b/lib/sqlalchemy/sql.py
@@ -1155,6 +1155,19 @@ class UpdateBase(ClauseElement):
         return parameters
         
     def get_colparams(self, parameters):
+        """this is used by the ANSICompiler to determine the VALUES or SET clause based on the arguments 
+        specified to the execute() or compile() method of the INSERT or UPDATE clause:
+        
+        insert(mytable).execute(col1='foo', col2='bar')
+        mytable.update().execute(col2='foo', col3='bar')
+        
+        in the above examples, the insert() and update() methods have no "values" sent to them
+        at all, so compiling them with no arguments would yield an insert for all table columns,
+        or an update with no SET clauses.  but the parameters sent indicate a set of per-compilation
+        arguments that result in a differently compiled INSERT or UPDATE object compared to the
+        original.  The "values" parameter to the insert/update is figured as well if present,
+        but the incoming "parameters" sent here take precedence.
+        """
         # case one: no parameters in the statement, no parameters in the 
         # compiled params - just return binds for all the table columns
         if parameters is None and self.parameters is None: