singlestoredb 1.15.2__tar.gz → 1.15.4__tar.gz

{singlestoredb-1.15.2/singlestoredb.egg-info → singlestoredb-1.15.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: singlestoredb
-Version: 1.15.2
+Version: 1.15.4
 Summary: Interface to the SingleStoreDB database and workspace management APIs
 Home-page: https://github.com/singlestore-labs/singlestoredb-python
 Author: SingleStore

{singlestoredb-1.15.2 → singlestoredb-1.15.4}/accel.c

@@ -1950,7 +1950,6 @@ static PyObject *read_row_from_packet(
         case ACCEL_OUT_DICTS:
         case ACCEL_OUT_ARROW:
             PyDict_SetItem(py_result, py_state->py_names[i], py_item);
-            Py_INCREF(py_state->py_names[i]);
             Py_DECREF(py_item);
             break;
         default:
@@ -2678,8 +2677,19 @@ static PyObject *load_rowdat_1_numpy(PyObject *self, PyObject *args, PyObject *k
 
 exit:
     if (ctypes) free(ctypes);
-    if (out_cols) free(out_cols);
-    if (mask_cols) free(mask_cols);
+    if (out_cols) {
+        for (i = 0; i < n_cols; i++) {
+            if (out_cols[i]) free(out_cols[i]);
+        }
+        free(out_cols);
+    }
+    if (mask_cols) {
+        for (i = 0; i < n_cols; i++) {
+            if (mask_cols[i]) free(mask_cols[i]);
+        }
+        free(mask_cols);
+    }
+    if (out_row_ids) free(out_row_ids);
     if (data_formats) free(data_formats);
     if (item_sizes) free(item_sizes);
 
@@ -2943,11 +2953,17 @@ static PyObject *dump_rowdat_1_numpy(PyObject *self, PyObject *args, PyObject *k
     out_l = 256 * n_cols;
     out_idx = 0;
     out = malloc(out_l);
-    if (!out) goto error;
+    if (!out) {
+        PyErr_SetString(PyExc_MemoryError, "failed to allocate output buffer");
+        goto error;
+    }
 
     // Get return types
     returns = malloc(sizeof(int) * n_cols);
-    if (!returns) goto error;
+    if (!returns) {
+        PyErr_SetString(PyExc_MemoryError, "failed to allocate returns array");
+        goto error;
+    }
 
     for (i = 0; i < n_cols; i++) {
         PyObject *py_item = PySequence_GetItem(py_returns, i);
@@ -2959,11 +2975,20 @@ static PyObject *dump_rowdat_1_numpy(PyObject *self, PyObject *args, PyObject *k
 
     // Get column array memory
     cols = calloc(sizeof(char*), n_cols);
-    if (!cols) goto error;
+    if (!cols) {
+        PyErr_SetString(PyExc_MemoryError, "failed to allocate cols array");
+        goto error;
+    }
     col_types = calloc(sizeof(NumpyColType), n_cols);
-    if (!col_types) goto error;
+    if (!col_types) {
+        PyErr_SetString(PyExc_MemoryError, "failed to allocate col_types array");
+        goto error;
+    }
     masks = calloc(sizeof(char*), n_cols);
-    if (!masks) goto error;
+    if (!masks) {
+        PyErr_SetString(PyExc_MemoryError, "failed to allocate masks array");
+        goto error;
+    }
     for (i = 0; i < n_cols; i++) {
         PyObject *py_item = PyList_GetItem(py_cols, i);
         if (!py_item) goto error;
@@ -2996,8 +3021,12 @@ static PyObject *dump_rowdat_1_numpy(PyObject *self, PyObject *args, PyObject *k
 #define CHECKMEM(x) \
     if ((out_idx + x) > out_l) { \
         out_l = out_l * 2 + x; \
-        out = realloc(out, out_l); \
-        if (!out) goto error; \
+        char *new_out = realloc(out, out_l); \
+        if (!new_out) { \
+            PyErr_SetString(PyExc_MemoryError, "failed to reallocate output buffer"); \
+            goto error; \
+        } \
+        out = new_out; \
     }
 
     for (j = 0; j < n_rows; j++) {
@@ -4079,10 +4108,10 @@ static PyObject *dump_rowdat_1_numpy(PyObject *self, PyObject *args, PyObject *k
         }
     }
 
-    py_out = PyMemoryView_FromMemory(out, out_idx, PyBUF_WRITE);
-    if (!py_out) goto error;
+    py_out = PyBytes_FromStringAndSize(out, out_idx);
 
 exit:
+    if (out) free(out);
     if (returns) free(returns);
     if (masks) free(masks);
     if (cols) free(cols);
@@ -4091,7 +4120,6 @@ exit:
     return py_out;
 
 error:
-    if (!py_out && out) free(out);
     Py_XDECREF(py_out);
     py_out = NULL;
 
@@ -4471,8 +4499,12 @@ static PyObject *dump_rowdat_1(PyObject *self, PyObject *args, PyObject *kwargs)
 #define CHECKMEM(x) \
     if ((out_idx + x) > out_l) { \
         out_l = out_l * 2 + x; \
-        out = realloc(out, out_l); \
-        if (!out) goto error; \
+        char *new_out = realloc(out, out_l); \
+        if (!new_out) { \
+            PyErr_SetString(PyExc_MemoryError, "failed to reallocate output buffer"); \
+            goto error; \
+        } \
+        out = new_out; \
     }
 
     py_rows_iter = PyObject_GetIter(py_rows);
@@ -4483,12 +4515,20 @@ static PyObject *dump_rowdat_1(PyObject *self, PyObject *args, PyObject *kwargs)
 
     while ((py_row = PyIter_Next(py_rows_iter))) {
         py_row_iter = PyObject_GetIter(py_row);
-        if (!py_row_iter) goto error;
+        if (!py_row_iter) {
+            Py_DECREF(py_row);
+            goto error;
+        }
 
         // First item is always a row ID
         py_item = PyIter_Next(py_row_ids_iter);
-        if (!py_item) goto error;
+        if (!py_item) {
+            Py_DECREF(py_row_iter);
+            Py_DECREF(py_row);
+            goto error;
+        }
         row_id = (int64_t)PyLong_AsLongLong(py_item);
+        Py_DECREF(py_item);
 
         CHECKMEM(8);
         memcpy(out+out_idx, &row_id, 8);
@@ -4631,12 +4671,16 @@ static PyObject *dump_rowdat_1(PyObject *self, PyObject *args, PyObject *kwargs)
                     out_idx += 8;
                 } else {
                     PyObject *py_bytes = PyUnicode_AsEncodedString(py_item, "utf-8", "strict");
-                    if (!py_bytes) goto error;
+                    if (!py_bytes) {
+                        Py_DECREF(py_item);
+                        goto error;
+                    }
 
                     char *str = NULL;
                     Py_ssize_t str_l = 0;
                     if (PyBytes_AsStringAndSize(py_bytes, &str, &str_l) < 0) {
                         Py_DECREF(py_bytes);
+                        Py_DECREF(py_item);
                         goto error;
                     }
 
@@ -4671,6 +4715,7 @@ static PyObject *dump_rowdat_1(PyObject *self, PyObject *args, PyObject *kwargs)
                     char *str = NULL;
                     Py_ssize_t str_l = 0;
                     if (PyBytes_AsStringAndSize(py_item, &str, &str_l) < 0) {
+                        Py_DECREF(py_item);
                         goto error;
                     }
 
@@ -4684,6 +4729,7 @@ static PyObject *dump_rowdat_1(PyObject *self, PyObject *args, PyObject *kwargs)
                 break;
 
             default:
+                Py_DECREF(py_item);
                 goto error;
             }
 
@@ -4693,14 +4739,17 @@ static PyObject *dump_rowdat_1(PyObject *self, PyObject *args, PyObject *kwargs)
             i++;
         }
 
+        Py_DECREF(py_row_iter);
         Py_DECREF(py_row);
+        py_row_iter = NULL;
         py_row = NULL;
     }
 
-    py_out = PyMemoryView_FromMemory(out, out_idx, PyBUF_WRITE);
-    if (!py_out) goto error;
+    // Convert the output buffer to a Python bytes object and free the buffer
+    py_out = PyBytes_FromStringAndSize(out, out_idx);
 
 exit:
+    if (out) free(out);
     if (returns) free(returns);
 
     Py_XDECREF(py_item);
@@ -4712,7 +4761,6 @@ exit:
     return py_out;
 
 error:
-    if (!py_out && out) free(out);
     Py_XDECREF(py_out);
     py_out = NULL;
 
@@ -4839,7 +4887,7 @@ PyMODINIT_FUNC PyInit__singlestoredb_accel(void) {
 
     PyObj.create_numpy_array_kwargs = PyDict_New();
     if (!PyObj.create_numpy_array_kwargs) goto error;
-    if (PyDict_SetItemString(PyObj.create_numpy_array_kwargs, "copy", Py_False)) {
+    if (PyDict_SetItemString(PyObj.create_numpy_array_kwargs, "copy", Py_True)) {
         goto error;
     }
 

{singlestoredb-1.15.2 → singlestoredb-1.15.4}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = singlestoredb
-version = 1.15.2
+version = 1.15.4
 description = Interface to the SingleStoreDB database and workspace management APIs
 long_description = file: README.md
 long_description_content_type = text/markdown

{singlestoredb-1.15.2 → singlestoredb-1.15.4}/singlestoredb/__init__.py

@@ -13,7 +13,7 @@ Examples
 
 """
 
-__version__ = '1.15.2'
+__version__ = '1.15.4'
 
 from typing import Any
 

{singlestoredb-1.15.2 → singlestoredb-1.15.4}/singlestoredb/http/connection.py

@@ -647,23 +647,24 @@ class Cursor(connection.Cursor):
                         type_code = types.ColumnType.get_code(data_type)
                         prec, scale = get_precision_scale(col['dataType'])
                         converter = http_converters.get(type_code, None)
+
                         if 'UNSIGNED' in data_type:
                             flags = 32
+
                         if data_type.endswith('BLOB') or data_type.endswith('BINARY'):
                             converter = functools.partial(
                                 b64decode_converter, converter,  # type: ignore
                             )
                             charset = 63  # BINARY
+
                         if type_code == 0:  # DECIMAL
                             type_code = types.ColumnType.get_code('NEWDECIMAL')
                         elif type_code == 15:  # VARCHAR / VARBINARY
                             type_code = types.ColumnType.get_code('VARSTRING')
-                        if type_code == 246 and prec is not None:  # NEWDECIMAL
-                            prec += 1  # for sign
-                            if scale is not None and scale > 0:
-                                prec += 1  # for decimal
+
                         if converter is not None:
                             convs.append((i, None, converter))
+
                         description.append(
                             Description(
                                 str(col['name']), type_code,
@@ -673,6 +674,7 @@ class Cursor(connection.Cursor):
                             ),
                         )
                         pymy_res.append(PyMyField(col['name'], flags, charset))
+
                     self._descriptions.append(description)
                     self._schemas.append(get_schema(self._results_type, description))
 
@@ -936,7 +938,7 @@ class Cursor(connection.Cursor):
 
     def __iter__(self) -> Iterable[Tuple[Any, ...]]:
         """Return result iterator."""
-        return iter(self._rows)
+        return iter(self._rows[self._row_idx:])
 
     def __enter__(self) -> 'Cursor':
         """Enter a context."""

{singlestoredb-1.15.2 → singlestoredb-1.15.4}/singlestoredb/mysql/protocol.py

@@ -324,13 +324,26 @@ class FieldDescriptorPacket(MysqlPacket):
                 raise TypeError(f'unrecognized extended data type: {ext_type_code}')
 
     def description(self):
-        """Provides a 7-item tuple compatible with the Python PEP249 DB Spec."""
+        """
+        Provides a 9-item tuple.
+
+        Standard descriptions only have 7 fields according to the Python
+        PEP249 DB Spec, but we need to surface information about unsigned
+        types and charsetnr for proper type handling.
+
+        """
+        precision = self.get_column_length()
+        if self.type_code in (FIELD_TYPE.DECIMAL, FIELD_TYPE.NEWDECIMAL):
+            if precision:
+                precision -= 1  # for the sign
+                if self.scale > 0:
+                    precision -= 1  # for the decimal point
         return Description(
             self.name,
             self.type_code,
             None,  # TODO: display_length; should this be self.length?
             self.get_column_length(),  # 'internal_size'
-            self.get_column_length(),  # 'precision'  # TODO: why!?!?
+            precision,  # 'precision'
             self.scale,
             self.flags % 2 == 0,
             self.flags,

singlestoredb-1.15.4/singlestoredb/tests/alltypes.sql

@@ -0,0 +1,307 @@
+CREATE TABLE IF NOT EXISTS alltypes (
+    `id` INT(11),
+    `tinyint` TINYINT,
+    `unsigned_tinyint` TINYINT UNSIGNED,
+    `bool` BOOL,
+    `boolean` BOOLEAN,
+    `smallint` SMALLINT,
+    `unsigned_smallint` SMALLINT UNSIGNED,
+    `mediumint` MEDIUMINT,
+    `unsigned_mediumint` MEDIUMINT UNSIGNED,
+    `int24` MEDIUMINT,
+    `unsigned_int24` MEDIUMINT UNSIGNED,
+    `int` INT,
+    `unsigned_int` INT UNSIGNED,
+    `integer` INTEGER,
+    `unsigned_integer` INTEGER UNSIGNED,
+    `bigint` BIGINT,
+    `unsigned_bigint` BIGINT UNSIGNED,
+    `float` FLOAT,
+    `double` DOUBLE,
+    `real` REAL,
+    `decimal` DECIMAL(20,6),
+    `dec` DEC(20,6),
+    `fixed` FIXED(20,6),
+    `numeric` NUMERIC(20,6),
+    `date` DATE,
+    `time` TIME,
+    `time_6` TIME(6),
+    `datetime` DATETIME,
+    `datetime_6` DATETIME(6),
+    `timestamp` TIMESTAMP,
+    `timestamp_6` TIMESTAMP(6),
+    `year` YEAR,
+    `char_100` CHAR(100),
+    `binary_100` BINARY(100),
+    `varchar_200` VARCHAR(200),
+    `varbinary_200` VARBINARY(200),
+    `longtext` LONGTEXT,
+    `mediumtext` MEDIUMTEXT,
+    `text` TEXT,
+    `tinytext` TINYTEXT,
+    `longblob` LONGBLOB,
+    `mediumblob` MEDIUMBLOB,
+    `blob` BLOB,
+    `tinyblob` TINYBLOB,
+    `json` JSON,
+--  `geographypoint` GEOGRAPHYPOINT,
+--  `geography` GEOGRAPHY,
+    `enum` ENUM('one', 'two', 'three'),
+    `set` SET('one', 'two', 'three'),
+    `bit` BIT
+)
+COLLATE='utf8_unicode_ci';
+
+INSERT INTO alltypes SET
+    `id`=0,
+    `tinyint`=80,
+    `unsigned_tinyint`=85,
+    `bool`=0,
+    `boolean`=1,
+    `smallint`=-27897,
+    `unsigned_smallint`=27897,
+    `mediumint`=104729,
+    `unsigned_mediumint`=120999,
+    `int24`=-200899,
+    `unsigned_int24`=407709,
+    `int`=-1295369311,
+    `unsigned_int`=3872362332,
+    `integer`=-1741727421,
+    `unsigned_integer`=3198387363,
+    `bigint`=-266883847,
+    `unsigned_bigint`=980007287362,
+    `float`=-146486683.754744,
+    `double`=-474646154.719356,
+    `real`=-901409776.279346,
+    `decimal`=28111097.610822,
+    `dec`=389451155.931428,
+    `fixed`=-143773416.044092,
+    `numeric`=866689461.300046,
+    `date`='8524-11-10',
+    `time`='00:07:00',
+    `time_6`='01:10:00.000002',
+    `datetime`='9948-03-11 15:29:22',
+    `datetime_6`='1756-10-29 02:02:42.000008',
+    `timestamp`='1980-12-31 01:10:23',
+    `timestamp_6`='1991-01-02 22:15:10.000006',
+    `year`=1923,
+    `char_100`='This is a test of a 100 character column.',
+    `binary_100`=x'000102030405060708090A0B0C0D0E0F',
+    `varchar_200`='This is a test of a variable character column.',
+    `varbinary_200`=x'000102030405060708090A0B0C0D0E0F000102030405060708090A0B0C0D0E0F',
+    `longtext`='This is a longtext column.',
+    `mediumtext`='This is a mediumtext column.',
+    `text`='This is a text column.',
+    `tinytext`='This is a tinytext column.',
+    `longblob`=x'000102030405060708090A0B0C0D0E0F000102030405060708090A0B0C0D0E0F000102030405060708090A0B0C0D0E0F',
+    `mediumblob`=x'000102030405060708090A0B0C0D0E0F000102030405060708090A0B0C0D0E0F',
+    `blob`=x'000102030405060708090A0B0C0D0E0F',
+    `tinyblob`=x'0A0B0C0D0E0F',
+    `json`='{"a": 10, "b": 2.75, "c": "hello world"}',
+    `enum`='one',
+    `set`='two',
+    `bit`=128
+;
+
+INSERT INTO alltypes SET
+    `id`=1,
+    `tinyint`=NULL,
+    `bool`=NULL,
+    `boolean`=NULL,
+    `smallint`=NULL,
+    `mediumint`=NULL,
+    `int24`=NULL,
+    `int`=NULL,
+    `integer`=NULL,
+    `bigint`=NULL,
+    `float`=NULL,
+    `double`=NULL,
+    `real`=NULL,
+    `decimal`=NULL,
+    `dec`=NULL,
+    `fixed`=NULL,
+    `numeric`=NULL,
+    `date`=NULL,
+    `time`=NULL,
+    `time_6`=NULL,
+    `datetime`=NULL,
+    `datetime_6`=NULL,
+    `timestamp`=NULL,
+    `timestamp_6`=NULL,
+    `year`=NULL,
+    `char_100`=NULL,
+    `binary_100`=NULL,
+    `varchar_200`=NULL,
+    `longtext`=NULL,
+    `mediumtext`=NULL,
+    `text`=NULL,
+    `tinytext`=NULL,
+    `longblob`=NULL,
+    `mediumblob`=NULL,
+    `blob`=NULL,
+    `tinyblob`=NULL,
+    `json`=NULL,
+    `enum`=NULL,
+    `set`=NULL,
+    `bit`=NULL
+;
+
+-- Minimum values
+INSERT INTO alltypes SET
+    `id`=2,
+    `tinyint`=-128,
+    `unsigned_tinyint`=0,
+    `bool`=-128,
+    `boolean`=-128,
+    `smallint`=-32768,
+    `unsigned_smallint`=0,
+    `mediumint`=-8388608,
+    `unsigned_mediumint`=0,
+    `int24`=-8388608,
+    `unsigned_int24`=0,
+    `int`=-2147483648,
+    `unsigned_int`=0,
+    `integer`=-2147483648,
+    `unsigned_integer`=0,
+    `bigint`=-9223372036854775808,
+    `unsigned_bigint`=0,
+    `float`=0,
+    `double`=-1.7976931348623158e308,
+    `real`=-1.7976931348623158e308,
+    `decimal`=-99999999999999.999999,
+    `dec`=-99999999999999.999999,
+    `fixed`=-99999999999999.999999,
+    `numeric`=-99999999999999.999999,
+    `date`='1000-01-01',
+    `time`='-838:59:59',
+    `time_6`='-838:59:59.000000',
+    `datetime`='1000-01-01 00:00:00',
+    `datetime_6`='1000-01-01 00:00:00.000000',
+    `timestamp`='1970-01-01 00:00:01',
+    `timestamp_6`='1970-01-01 00:00:01.000000',
+    `year`=1901,
+    `char_100`='',
+    `binary_100`=x'',
+    `varchar_200`='',
+    `varbinary_200`=x'',
+    `longtext`='',
+    `mediumtext`='',
+    `text`='',
+    `tinytext`='',
+    `longblob`=x'',
+    `mediumblob`=x'',
+    `blob`=x'',
+    `tinyblob`=x'',
+    `json`='{}',
+    `enum`='one',
+    `set`='two',
+    `bit`=0
+;
+
+-- Maximum values
+INSERT INTO alltypes SET
+    `id`=3,
+    `tinyint`=127,
+    `unsigned_tinyint`=255,
+    `bool`=127,
+    `boolean`=127,
+    `smallint`=32767,
+    `unsigned_smallint`=65535,
+    `mediumint`=8388607,
+    `unsigned_mediumint`=16777215,
+    `int24`=8388607,
+    `unsigned_int24`=16777215,
+    `int`=2147483647,
+    `unsigned_int`=4294967295,
+    `integer`=2147483647,
+    `unsigned_integer`=4294967295,
+    `bigint`=9223372036854775807,
+    `unsigned_bigint`=18446744073709551615,
+    `float`=0,
+    `double`=1.7976931348623158e308,
+    `real`=1.7976931348623158e308,
+    `decimal`=99999999999999.999999,
+    `dec`=99999999999999.999999,
+    `fixed`=99999999999999.999999,
+    `numeric`=99999999999999.999999,
+    `date`='9999-12-31',
+    `time`='838:59:59',
+    `time_6`='838:59:59.999999',
+    `datetime`='9999-12-31 23:59:59',
+    `datetime_6`='9999-12-31 23:59:59.999999',
+    `timestamp`='2038-01-18 21:14:07',
+    `timestamp_6`='2038-01-18 21:14:07.999999',
+    `year`=2155,
+    `char_100`='',
+    `binary_100`=x'',
+    `varchar_200`='',
+    `varbinary_200`=x'',
+    `longtext`='',
+    `mediumtext`='',
+    `text`='',
+    `tinytext`='',
+    `longblob`=x'',
+    `mediumblob`=x'',
+    `blob`=x'',
+    `tinyblob`=x'',
+    `json`='{}',
+    `enum`='one',
+    `set`='two',
+    `bit`=18446744073709551615
+;
+
+-- Zero values
+--
+-- Note that v8 of SingleStoreDB does not allow zero date/times by
+-- default, so they are set to NULL here.
+--
+INSERT INTO alltypes SET
+    `id`=4,
+    `tinyint`=0,
+    `unsigned_tinyint`=0,
+    `bool`=0,
+    `boolean`=0,
+    `smallint`=0,
+    `unsigned_smallint`=0,
+    `mediumint`=0,
+    `unsigned_mediumint`=0,
+    `int24`=0,
+    `unsigned_int24`=0,
+    `int`=0,
+    `unsigned_int`=0,
+    `integer`=0,
+    `unsigned_integer`=0,
+    `bigint`=0,
+    `unsigned_bigint`=0,
+    `float`=0,
+    `double`=0.0,
+    `real`=0.0,
+    `decimal`=0.0,
+    `dec`=0.0,
+    `fixed`=0.0,
+    `numeric`=0.0,
+    `date`=NULL,
+    `time`='00:00:00',
+    `time_6`='00:00:00.000000',
+    `datetime`=NULL,
+    `datetime_6`=NULL,
+    `timestamp`=NULL,
+    `timestamp_6`=NULL,
+    `year`=NULL,
+    `char_100`='',
+    `binary_100`=x'',
+    `varchar_200`='',
+    `varbinary_200`=x'',
+    `longtext`='',
+    `mediumtext`='',
+    `text`='',
+    `tinytext`='',
+    `longblob`=x'',
+    `mediumblob`=x'',
+    `blob`=x'',
+    `tinyblob`=x'',
+    `json`='{}',
+    `enum`='one',
+    `set`='two',
+    `bit`=0
+;