Release memsql-python 3.1.0

Author: Carl Sverre

CHANGES.txt

@@ -1,3 +1,7 @@
+2020-04-25 Version 3.1.0
+
+    * Upgrade mysqlclient to 1.4 or greator
+
 2019-07-24 Version 3.0.0
 
     * Remove Python 2 support

Makefile

@@ -2,29 +2,25 @@ all:
 	rm -rf build/ dist; ./setup.py sdist
 
 upload: all
-	python setup.py sdist
+	python3 setup.py sdist
 	twine upload dist/*
 
 clean:
 	rm -rf *.egg memsql.egg-info dist build
-	python setup.py clean --all
+	python3 setup.py clean --all
 	for _kill_path in $$(find . -type f -name "*.pyc"); do rm -f $$_kill_path; done
 	for _kill_path in $$(find . -name "__pycache__"); do rm -rf $$_kill_path; done
 
 test:
-	python setup.py test
+	python3 setup.py test
 
 test-watch:
-	python setup.py test -w
+	python3 setup.py test -w
 
 .PHONY: flake8
 flake8:
 	flake8 --config=.flake8 .
 
-.PHONY: shell-py2
-shell-py2:
-	nix-shell -A memsqlPython2Env
-
-.PHONY: shell-py3
-shell-py3:
-	nix-shell -A memsqlPython3Env
+.PHONY: shell
+shell:
+	nix-shell -A memsqlPython

memsql/__init__.py

@@ -1,4 +1,4 @@
 """ MemSQL-python
 """
 
-__version__ = "3.0.0"
+__version__ = "3.1.0"

memsql/common/connection_pool.py

@@ -1,4 +1,5 @@
-import _mysql, errno
+from MySQLdb import _mysql
+import errno
 import multiprocessing
 import logging
 from memsql.common import database

memsql/common/conversions.py

@@ -1,26 +1,26 @@
-import _mysql
 from MySQLdb.constants import FIELD_TYPE
-from MySQLdb.converters import conversions
-from MySQLdb import times
+from MySQLdb.converters import conversions, Bool2Str
+from MySQLdb import times, _mysql
 import datetime
+import inspect
 
 CONVERSIONS = conversions
 
 def _bytes_to_utf8(b):
     return b.decode('utf-8')
 
-CONVERSIONS[FIELD_TYPE.STRING].append((None, _bytes_to_utf8))
-CONVERSIONS[FIELD_TYPE.VAR_STRING].append((None, _bytes_to_utf8))
-CONVERSIONS[FIELD_TYPE.VARCHAR].append((None, _bytes_to_utf8))
-CONVERSIONS[FIELD_TYPE.BLOB].append((None, _bytes_to_utf8))
+CONVERSIONS[FIELD_TYPE.STRING] = _bytes_to_utf8
+CONVERSIONS[FIELD_TYPE.VAR_STRING] = _bytes_to_utf8
+CONVERSIONS[FIELD_TYPE.VARCHAR] = _bytes_to_utf8
+CONVERSIONS[FIELD_TYPE.BLOB] = _bytes_to_utf8
 
 def _escape_bytes(b, c):
     return _mysql.string_literal(b, c).decode('utf-8')
 
 CONVERSIONS[bytes] = _escape_bytes
 
 def _escape_string(s, d):
-    return _mysql.string_literal(s.encode('utf-8'), d).decode('utf-8')
+    return _mysql.string_literal(s.encode('utf-8')).decode('utf-8')
 
 CONVERSIONS[str] = _escape_string
 
@@ -31,3 +31,7 @@ def _escape_timedelta(dt, c):
 
 CONVERSIONS[datetime.datetime] = _escape_datetime
 CONVERSIONS[datetime.timedelta] = _escape_timedelta
+
+def _escape_bool(b, d):
+    return Bool2Str(b, d).decode('utf-8')
+CONVERSIONS[bool] = _escape_bool

memsql/common/database.py

@@ -1,6 +1,6 @@
 """A lightweight wrapper around _mysql."""
 
-import _mysql
+from MySQLdb import _mysql
 import time
 import operator
 
@@ -301,7 +301,9 @@ def escape_query(query, parameters):
     return query
 
 def _escape(param):
+    _bytes_to_utf8 = lambda b: b.decode("utf-8") if isinstance(b, bytes) else b
+
     if isinstance(param, (list, tuple)):
-        return ','.join(_mysql.escape(p, CONVERSIONS) for p in param)
+        return ','.join(_bytes_to_utf8(_mysql.escape(p, CONVERSIONS)) for p in param)
     else:
-        return _mysql.escape(param, CONVERSIONS)
+        return _bytes_to_utf8(_mysql.escape(param, CONVERSIONS))

memsql/common/test/test_connection_pool.py

@@ -196,14 +196,14 @@ def raise_ioerror(*args, **kwargs):
     assert (e.host, e.port, e.user, e.password, e.db_name, e.options, e.pid) == test_key
 
 def test_sql_errors(fairy):
-    from _mysql import ProgrammingError
+    from MySQLdb._mysql import ProgrammingError
     with pytest.raises(ProgrammingError):
         fairy.query('asdf bad query!!')
 
 def test_exception_remapping(pool, db_args, test_db_database):
     from memsql.common.connection_pool import PoolConnectionException
     from memsql.common import errorcodes
-    import _mysql
+    from MySQLdb import _mysql
 
     # check that some operationalerrors get mapped to PoolConnectionException
     bad_db_args = db_args[:-1] + ("aasjdkfjdoes_not_exist",)

memsql/common/test/test_database_adapters.py

@@ -2,8 +2,9 @@
 
 import pytest
 import time
-from memsql.common import database
+from memsql.common import query_builder, database
 import uuid
+import datetime
 import copy
 
 def test_connection_open(test_db_conn):
@@ -95,6 +96,23 @@ def test_insert(self, x_conn):
         last_row = x_conn.get('SELECT * FROM x ORDER BY id DESC LIMIT 1')
         assert res == last_row.id
 
+    def test_insert_qb(self, x_conn):
+        rows = [
+            { 'id': 1, 'value': '2', 'col1': 1223.4, 'col2': datetime.datetime.now(), 'colb': True },
+            { 'id': 2, 'value': None, 'col1': None, 'col2': None, 'colb': None },
+        ]
+        sql, params = query_builder.multi_insert('x', *rows)
+
+        res = x_conn.query(sql, **params)
+        assert isinstance(res, int)
+        assert res == 2  # 2 affected row
+
+        all_rows = x_conn.query('SELECT * FROM x ORDER BY id ASC')
+        assert len(all_rows) == 2
+        assert all_rows[0].value == 2
+        assert all_rows[0].col1 == "1223.4"
+        assert all_rows[1].value == None
+
     def test_select(self, x_conn):
         x_conn.execute('INSERT INTO x (value) VALUES (1), (2), (3)')
 

memsql/common/test/test_query_builder.py

@@ -5,25 +5,25 @@ def test_simple_expression():
     sql, params = query_builder.simple_expression(', ', **x)
     assert sql == '`a`=%(_QB_a)s, `b`=%(_QB_b)s, `c`=%(_QB_c)s'
     assert params == { '_QB_a': 1, '_QB_b': '2', '_QB_c': 1223.4 }
-    assert database.escape_query(sql, params) == r"`a`=1, `b`='2', `c`=1223.4"
+    assert database.escape_query(sql, params) == r"`a`=1, `b`='2', `c`=1223.4e0"
 
 def test_update():
     x = { 'a': 1, 'b': '2', 'c': 1223.4 }
     sql, params = query_builder.update('foo', **x)
     assert sql == 'UPDATE `foo` SET `a`=%(_QB_a)s, `b`=%(_QB_b)s, `c`=%(_QB_c)s'
     assert params == { '_QB_a': 1, '_QB_b': '2', '_QB_c': 1223.4 }
-    assert database.escape_query(sql, params) == r"UPDATE `foo` SET `a`=1, `b`='2', `c`=1223.4"
+    assert database.escape_query(sql, params) == r"UPDATE `foo` SET `a`=1, `b`='2', `c`=1223.4e0"
 
 def test_multi_insert():
     rows = [{ 'a': 1, 'b': '2', 'c': 1223.4 }, { 'a': 2, 'b': '5', 'c': 1 }]
     sql, params = query_builder.multi_insert('foo', *rows)
     assert sql == 'INSERT INTO `foo` (`a`, `b`, `c`) VALUES (%(_QB_ROW_0)s), (%(_QB_ROW_1)s)'
     assert params == { '_QB_ROW_0': [1, '2', 1223.4], '_QB_ROW_1': [2, '5', 1] }
-    assert database.escape_query(sql, params) == r"INSERT INTO `foo` (`a`, `b`, `c`) VALUES (1,'2',1223.4), (2,'5',1)"
+    assert database.escape_query(sql, params) == r"INSERT INTO `foo` (`a`, `b`, `c`) VALUES (1,'2',1223.4e0), (2,'5',1)"
 
 def test_replace():
     rows = [{ 'a': 1, 'b': '2', 'c': 1223.4 }, { 'a': 2, 'b': '5', 'c': 1 }]
     sql, params = query_builder.multi_replace('foo', *rows)
     assert sql == 'REPLACE INTO `foo` (`a`, `b`, `c`) VALUES (%(_QB_ROW_0)s), (%(_QB_ROW_1)s)'
     assert params == { '_QB_ROW_0': [1, '2', 1223.4], '_QB_ROW_1': [2, '5', 1] }
-    assert database.escape_query(sql, params) == r"REPLACE INTO `foo` (`a`, `b`, `c`) VALUES (1,'2',1223.4), (2,'5',1)"
+    assert database.escape_query(sql, params) == r"REPLACE INTO `foo` (`a`, `b`, `c`) VALUES (1,'2',1223.4e0), (2,'5',1)"

setup.py

@@ -12,7 +12,7 @@
     'wraptor',
     'simplejson',
     'python-dateutil<3.0',
-    'mysqlclient==1.3.13',
+    'mysqlclient>=1.4',
 ]
 
 class PyTest(TestCommand):