Fix for high unicode insertion, WIP

v-makouz · Sep 10, 2019 · 606b4a9 · 606b4a9
1 parent e2e899f
commit 606b4a9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/src/params.cpp b/src/params.cpp
@@ -1915,7 +1915,7 @@ bool ExecuteMulti(Cursor* cur, PyObject* pSql, PyObject* paramArrayObj)
                 if (PyUnicode_Check(objCell))
                 {
                     const TextEnc& enc = cur->cnxn->sqlwchar_enc;
-                    int cb = PyUnicode_GET_LENGTH(objCell);
+                    int cb = PyUnicode_GET_DATA_SIZE(objCell) / 2;
 
                     PyObject* bytes = NULL;
                     const Py_UNICODE* source = PyUnicode_AS_UNICODE(objCell);

diff --git a/tests2/sqlservertests.py b/tests2/sqlservertests.py
@@ -470,6 +470,13 @@ def test_fast_executemany_to_datetime2(self):
         self.cursor.executemany(sql, params)
         self.assertEqual(self.cursor.execute("SELECT CAST(dt2 AS VARCHAR) FROM ##issue540").fetchval(), '2019-03-12 10:00:00.12')
 
+    def test_high_unicode(self):
+        v = "🎥"
+        self.cursor.fast_executemany = True
+        self.cursor.execute("CREATE TABLE test_high_unicode (col1 nvarchar(max) null)")
+        self.cursor.executemany("INSERT INTO test_high_unicode (col1) VALUES (?)", [[v,]])
+        self.assertEqual(self.cursor.execute("SELECT * FROM test_high_unicode").fetchone()[0].encode('utf-8'), v)
+
     #
     # binary
     #

diff --git a/tests3/sqlservertests.py b/tests3/sqlservertests.py
@@ -462,6 +462,13 @@ def test_fast_executemany_to_datetime2(self):
         self.cursor.executemany(sql, params)
         self.assertEqual(self.cursor.execute("SELECT CAST(dt2 AS VARCHAR) FROM ##issue540").fetchval(), '2019-03-12 10:00:00.12')
 
+    def test_high_unicode(self):
+        v = "🎥"
+        self.cursor.fast_executemany = True
+        self.cursor.execute("CREATE TABLE test_high_unicode (col1 nvarchar(max) null)")
+        self.cursor.executemany("INSERT INTO test_high_unicode (col1) VALUES (?)", [[v,]])
+        self.assertEqual(self.cursor.execute("SELECT * FROM test_high_unicode").fetchone()[0], v)
+
     #
     # binary
     #