MonetDB: default - fixed an issue where query was ascii and argu...

[Gijs Molenaar]

Changeset: 57c824e7a7da for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=57c824e7a7da
Modified Files:
        clients/python/monetdb/sql/cursors.py
Branch: default
Log Message:

fixed an issue where query was ascii and arguments unicode


diffs (28 lines):

diff --git a/clients/python/monetdb/sql/cursors.py 
b/clients/python/monetdb/sql/cursors.py
--- a/clients/python/monetdb/sql/cursors.py
+++ b/clients/python/monetdb/sql/cursors.py
@@ -158,6 +158,9 @@ class Cursor(object):
         # clear message history
         self.messages = []
 
+        # convert to utf-8
+        operation = unicode(operation).encode('utf-8')
+
         # set the number of rows to fetch
         self.connection.command('Xreply_size %s' % self.arraysize)
 
@@ -172,12 +175,8 @@ class Cursor(object):
             if isinstance(parameters, dict):
                 query = operation % dict([(k, monetize.convert(v))
                     for (k,v) in parameters.items()])
-            elif type(parameters) == list:
-                query = operation % tuple([monetize.convert(item)
-                    for item in parameters])
-            elif type(parameters) == tuple:
-                query = operation % tuple([monetize.convert(item)
-                    for item in parameters])
+            elif type(parameters) == list or type(parameters) == tuple:
+                query = operation % tuple([monetize.convert(item) for item in 
parameters])
             elif isinstance(parameters, str):
                 query = operation % monetize.convert(parameters)
             else:
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list