Merge branch 'master' of github.com:web2py/web2py

2014-10-16 16:07:11 -05:00
parent ad5b9da4f4 0955bc0967
commit 4211c38ac5
1 changed files with 3 additions and 1 deletions
@@ -78,9 +78,11 @@ class DB2Adapter(BaseAdapter):
        self.connector = connector
        if do_connect: self.reconnect()

-    def execute(self,command):
+    def execute(self,command,placeholders=None):
        if command[-1:]==';':
            command = command[:-1]
+        if placeholders:
+            return self.log_execute(command, placeholders)
        return self.log_execute(command)

    def lastrowid(self,table):