- moved out to on_before_execute, on_after_execute. not much option here,

need both forms, the wrapping thing is just silly
- fixed the listen() to not re-wrap continuously.

1 files changed, 1 insertions, 5 deletions

diff --git a/lib/sqlalchemy/test/assertsql.py b/lib/sqlalchemy/test/assertsql.py
index 11ad20e77..dee63a876 100644
--- a/lib/sqlalchemy/test/assertsql.py
+++ b/lib/sqlalchemy/test/assertsql.py
@@ -273,10 +273,7 @@ class SQLAssert(object):
     def clear_rules(self):
         del self.rules
         
-    def execute(self, conn, clauseelement, *multiparams, **params):
-        # TODO: this doesn't work.   we need to execute before so that we know 
-        # what's happened with the parameters.
-        
+    def execute(self, conn, clauseelement, multiparams, params, result):
         if self.rules is not None:
             if not self.rules:
                 assert False, "All rules have been exhausted, but further statements remain"
@@ -287,7 +284,6 @@ class SQLAssert(object):
             
         
     def cursor_execute(self, conn, cursor, statement, parameters, context, executemany):
-        print "RECEIVE !", statement, parameters
         if self.rules:
             rule = self.rules[0]
             rule.process_cursor_execute(statement, parameters, context, executemany)