prevent string interpolation with default empty tuple when contains %…

… for MySQL, fixes issue #94
opbeat · Feb 19, 2016 · 785088e · 785088e
1 parent 8dadef7
commit 785088e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/opbeat/instrumentation/packages/dbapi2.py b/opbeat/instrumentation/packages/dbapi2.py
@@ -161,11 +161,11 @@ def extract_signature(sql):
 class CursorProxy(wrapt.ObjectProxy):
     provider_name = None
 
-    def callproc(self, procname, params=None):
+    def callproc(self, procname, params=()):
         return self._trace_sql(self.__wrapped__.callproc, procname,
                                params)
 
-    def execute(self, sql, params=None):
+    def execute(self, sql, params=()):
         return self._trace_sql(self.__wrapped__.execute, sql, params)
 
     def executemany(self, sql, param_list):

diff --git a/opbeat/instrumentation/packages/mysql.py b/opbeat/instrumentation/packages/mysql.py
@@ -10,6 +10,13 @@ class MySQLCursorProxy(CursorProxy):
     def extract_signature(self, sql):
         return extract_signature(sql)
 
+    def callproc(self, procname, params=None):
+        return self._trace_sql(self.__wrapped__.callproc, procname,
+                               params)
+
+    def execute(self, sql, params=None):
+        return self._trace_sql(self.__wrapped__.execute, sql, params)
+
 
 class MySQLConnectionProxy(ConnectionProxy):
     cursor_proxy = MySQLCursorProxy