singlestoredb 1.0.4__cp38-abi3-win_amd64.whl → 1.1.0__cp38-abi3-win_amd64.whl

singlestoredb/mysql/connection.py

@@ -29,12 +29,28 @@ from .cursors import (
     DictCursorSV,
     NamedtupleCursor,
     NamedtupleCursorSV,
+    ArrowCursor,
+    ArrowCursorSV,
+    NumpyCursor,
+    NumpyCursorSV,
+    PandasCursor,
+    PandasCursorSV,
+    PolarsCursor,
+    PolarsCursorSV,
     SSCursor,
     SSCursorSV,
     SSDictCursor,
     SSDictCursorSV,
     SSNamedtupleCursor,
     SSNamedtupleCursorSV,
+    SSArrowCursor,
+    SSArrowCursorSV,
+    SSNumpyCursor,
+    SSNumpyCursorSV,
+    SSPandasCursor,
+    SSPandasCursorSV,
+    SSPolarsCursor,
+    SSPolarsCursorSV,
 )
 from .optionfile import Parser
 from .protocol import (
@@ -443,6 +459,14 @@ class Connection(BaseConnection):
                 self.cursorclass = DictCursor
             elif 'namedtuple' in self.results_type:
                 self.cursorclass = NamedtupleCursor
+            elif 'numpy' in self.results_type:
+                self.cursorclass = NumpyCursor
+            elif 'arrow' in self.results_type:
+                self.cursorclass = ArrowCursor
+            elif 'pandas' in self.results_type:
+                self.cursorclass = PandasCursor
+            elif 'polars' in self.results_type:
+                self.cursorclass = PolarsCursor
             else:
                 self.cursorclass = Cursor
         else:
@@ -450,6 +474,14 @@ class Connection(BaseConnection):
                 self.cursorclass = SSDictCursor
             elif 'namedtuple' in self.results_type:
                 self.cursorclass = SSNamedtupleCursor
+            elif 'numpy' in self.results_type:
+                self.cursorclass = SSNumpyCursor
+            elif 'arrow' in self.results_type:
+                self.cursorclass = SSArrowCursor
+            elif 'pandas' in self.results_type:
+                self.cursorclass = SSPandasCursor
+            elif 'polars' in self.results_type:
+                self.cursorclass = SSPolarsCursor
             else:
                 self.cursorclass = SSCursor
 
@@ -487,6 +519,30 @@ class Connection(BaseConnection):
             elif self.cursorclass is SSNamedtupleCursor:
                 self.cursorclass = SSNamedtupleCursorSV
                 self.results_type = 'namedtuples'
+            elif self.cursorclass is NumpyCursor:
+                self.cursorclass = NumpyCursorSV
+                self.results_type = 'numpy'
+            elif self.cursorclass is SSNumpyCursor:
+                self.cursorclass = SSNumpyCursorSV
+                self.results_type = 'numpy'
+            elif self.cursorclass is ArrowCursor:
+                self.cursorclass = ArrowCursorSV
+                self.results_type = 'arrow'
+            elif self.cursorclass is SSArrowCursor:
+                self.cursorclass = SSArrowCursorSV
+                self.results_type = 'arrow'
+            elif self.cursorclass is PandasCursor:
+                self.cursorclass = PandasCursorSV
+                self.results_type = 'pandas'
+            elif self.cursorclass is SSPandasCursor:
+                self.cursorclass = SSPandasCursorSV
+                self.results_type = 'pandas'
+            elif self.cursorclass is PolarsCursor:
+                self.cursorclass = PolarsCursorSV
+                self.results_type = 'polars'
+            elif self.cursorclass is SSPolarsCursor:
+                self.cursorclass = SSPolarsCursorSV
+                self.results_type = 'polars'
 
         self._result = None
         self._affected_rows = 0
@@ -498,9 +554,22 @@ class Connection(BaseConnection):
         if conv is None:
             conv = converters.conversions
 
+        conv = conv.copy()
+
         self.parse_json = parse_json
         self.invalid_values = (invalid_values or {}).copy()
 
+        # Disable JSON parsing for Arrow
+        if self.results_type in ['arrow']:
+            conv[245] = None
+            self.parse_json = False
+
+        # Disable date/time parsing for polars; let polars do the parsing
+        elif self.results_type in ['polars']:
+            conv[7] = None
+            conv[10] = None
+            conv[12] = None
+
         # Need for MySQLdb compatibility.
         self.encoders = {k: v for (k, v) in conv.items() if type(k) is not int}
         self.decoders = {k: v for (k, v) in conv.items() if type(k) is int}

singlestoredb/mysql/cursors.py

@@ -4,7 +4,9 @@ from collections import namedtuple
 
 from . import err
 from ..connection import Cursor as BaseCursor
+from ..utils import results
 from ..utils.debug import log_query
+from ..utils.results import get_schema
 
 
 #: Regular expression for :meth:`Cursor.executemany`.
@@ -45,6 +47,7 @@ class Cursor(BaseCursor):
         self._connection = connection
         self.warning_count = 0
         self._description = None
+        self._format_schema = None
         self._rownumber = 0
         self.rowcount = -1
         self.arraysize = 1
@@ -62,6 +65,10 @@ class Cursor(BaseCursor):
     def description(self):
         return self._description
 
+    @property
+    def _schema(self):
+        return self._format_schema
+
     @property
     def connection(self):
         return self._connection
@@ -394,6 +401,7 @@ class Cursor(BaseCursor):
         self.rowcount = 0
         self.warning_count = 0
         self._description = None
+        self._format_schema = None
         self.lastrowid = None
         self._rows = None
 
@@ -409,6 +417,10 @@ class Cursor(BaseCursor):
         if self.rowcount == 18446744073709551615:
             self.rowcount = -1
         self._description = result.description
+        self._format_schema = get_schema(
+            self.connection._results_type,
+            result.description,
+        )
         self.lastrowid = result.insert_id
         self._rows = result.rows
 
@@ -440,6 +452,134 @@ class CursorSV(Cursor):
     """Cursor class for C extension."""
 
 
+class ArrowCursorMixin:
+    """Fetch methods for Arrow Tables."""
+
+    def fetchone(self):
+        return results.results_to_arrow(
+            self.description, super().fetchone(), single=True, schema=self._schema,
+        )
+
+    def fetchall(self):
+        return results.results_to_arrow(
+            self.description, super().fetchall(), schema=self._schema,
+        )
+
+    def fetchall_unbuffered(self):
+        return results.results_to_arrow(
+            self.description, super().fetchall_unbuffered(), schema=self._schema,
+        )
+
+    def fetchmany(self, size=None):
+        return results.results_to_arrow(
+            self.description, super().fetchmany(size), schema=self._schema,
+        )
+
+
+class ArrowCursor(ArrowCursorMixin, Cursor):
+    """A cursor which returns results as an Arrow Table."""
+
+
+class ArrowCursorSV(ArrowCursorMixin, CursorSV):
+    """A cursor which returns results as an Arrow Table for C extension."""
+
+
+class NumpyCursorMixin:
+    """Fetch methods for numpy arrays."""
+
+    def fetchone(self):
+        return results.results_to_numpy(
+            self.description, super().fetchone(), single=True, schema=self._schema,
+        )
+
+    def fetchall(self):
+        return results.results_to_numpy(
+            self.description, super().fetchall(), schema=self._schema,
+        )
+
+    def fetchall_unbuffered(self):
+        return results.results_to_numpy(
+            self.description, super().fetchall_unbuffered(), schema=self._schema,
+        )
+
+    def fetchmany(self, size=None):
+        return results.results_to_numpy(
+            self.description, super().fetchmany(size), schema=self._schema,
+        )
+
+
+class NumpyCursor(NumpyCursorMixin, Cursor):
+    """A cursor which returns results as a numpy array."""
+
+
+class NumpyCursorSV(NumpyCursorMixin, CursorSV):
+    """A cursor which returns results as a numpy array for C extension."""
+
+
+class PandasCursorMixin:
+    """Fetch methods for pandas DataFrames."""
+
+    def fetchone(self):
+        return results.results_to_pandas(
+            self.description, super().fetchone(), single=True, schema=self._schema,
+        )
+
+    def fetchall(self):
+        return results.results_to_pandas(
+            self.description, super().fetchall(), schema=self._schema,
+        )
+
+    def fetchall_unbuffered(self):
+        return results.results_to_pandas(
+            self.description, super().fetchall_unbuffered(), schema=self._schema,
+        )
+
+    def fetchmany(self, size=None):
+        return results.results_to_pandas(
+            self.description, super().fetchmany(size), schema=self._schema,
+        )
+
+
+class PandasCursor(PandasCursorMixin, Cursor):
+    """A cursor which returns results as a pandas DataFrame."""
+
+
+class PandasCursorSV(PandasCursorMixin, CursorSV):
+    """A cursor which returns results as a pandas DataFrame for C extension."""
+
+
+class PolarsCursorMixin:
+    """Fetch methods for polars DataFrames."""
+
+    def fetchone(self):
+        return results.results_to_polars(
+            self.description, super().fetchone(), single=True, schema=self._schema,
+        )
+
+    def fetchall(self):
+        return results.results_to_polars(
+            self.description, super().fetchall(), schema=self._schema,
+        )
+
+    def fetchall_unbuffered(self):
+        return results.results_to_polars(
+            self.description, super().fetchall_unbuffered(), schema=self._schema,
+        )
+
+    def fetchmany(self, size=None):
+        return results.results_to_polars(
+            self.description, super().fetchmany(size), schema=self._schema,
+        )
+
+
+class PolarsCursor(PolarsCursorMixin, Cursor):
+    """A cursor which returns results as a polars DataFrame."""
+
+
+class PolarsCursorSV(PolarsCursorMixin, CursorSV):
+    """A cursor which returns results as a polars DataFrame for C extension."""
+
+
 class DictCursorMixin:
     # You can override this to use OrderedDict or other dict-like types.
     dict_type = dict
@@ -698,16 +838,48 @@ class SSCursorSV(SSCursor):
 
 
 class SSDictCursor(DictCursorMixin, SSCursor):
-    """An unbuffered cursor, which returns results as a dictionary"""
+    """An unbuffered cursor, which returns results as a dictionary."""
 
 
 class SSDictCursorSV(SSCursorSV):
-    """An unbuffered cursor for the C extension, which returns a dictionary"""
+    """An unbuffered cursor for the C extension, which returns a dictionary."""
 
 
 class SSNamedtupleCursor(NamedtupleCursorMixin, SSCursor):
-    """An unbuffered cursor, which returns results as a named tuple"""
+    """An unbuffered cursor, which returns results as a named tuple."""
 
 
 class SSNamedtupleCursorSV(SSCursorSV):
-    """An unbuffered cursor for the C extension, which returns results as a named tuple"""
+    """An unbuffered cursor for the C extension, which returns results as named tuple."""
+
+
+class SSArrowCursor(ArrowCursorMixin, SSCursor):
+    """An unbuffered cursor, which returns results as an Arrow Table."""
+
+
+class SSArrowCursorSV(ArrowCursorMixin, SSCursorSV):
+    """An unbuffered cursor, which returns results as an Arrow Table (accelerated)."""
+
+
+class SSNumpyCursor(NumpyCursorMixin, SSCursor):
+    """An unbuffered cursor, which returns results as a numpy array."""
+
+
+class SSNumpyCursorSV(NumpyCursorMixin, SSCursorSV):
+    """An unbuffered cursor, which returns results as a numpy array (accelerated)."""
+
+
+class SSPandasCursor(PandasCursorMixin, SSCursor):
+    """An unbuffered cursor, which returns results as a pandas DataFrame."""
+
+
+class SSPandasCursorSV(PandasCursorMixin, SSCursorSV):
+    """An unbuffered cursor, which returns results as a pandas DataFrame (accelerated)."""
+
+
+class SSPolarsCursor(PolarsCursorMixin, SSCursor):
+    """An unbuffered cursor, which returns results as a polars DataFrame."""
+
+
+class SSPolarsCursorSV(PolarsCursorMixin, SSCursorSV):
+    """An unbuffered cursor, which returns results as a polars DataFrame (accelerated)."""

singlestoredb/tests/test.sql

@@ -363,6 +363,216 @@ INSERT INTO alltypes SET
 ;
 
 
+CREATE TABLE IF NOT EXISTS alltypes_no_nulls (
+    `id` INT(11) NOT NULL,
+    `tinyint` TINYINT NOT NULL,
+    `unsigned_tinyint` TINYINT UNSIGNED NOT NULL,
+    `bool` BOOL NOT NULL,
+    `boolean` BOOLEAN NOT NULL,
+    `smallint` SMALLINT NOT NULL,
+    `unsigned_smallint` SMALLINT UNSIGNED NOT NULL,
+    `mediumint` MEDIUMINT NOT NULL,
+    `unsigned_mediumint` MEDIUMINT UNSIGNED NOT NULL,
+    `int24` MEDIUMINT NOT NULL,
+    `unsigned_int24` MEDIUMINT UNSIGNED NOT NULL,
+    `int` INT NOT NULL,
+    `unsigned_int` INT UNSIGNED NOT NULL,
+    `integer` INTEGER NOT NULL,
+    `unsigned_integer` INTEGER UNSIGNED NOT NULL,
+    `bigint` BIGINT NOT NULL,
+    `unsigned_bigint` BIGINT UNSIGNED NOT NULL,
+    `float` FLOAT NOT NULL,
+    `double` DOUBLE NOT NULL,
+    `real` REAL NOT NULL,
+    `decimal` DECIMAL(20,6) NOT NULL,
+    `dec` DEC(20,6) NOT NULL,
+    `fixed` FIXED(20,6) NOT NULL,
+    `numeric` NUMERIC(20,6) NOT NULL,
+    `date` DATE NOT NULL,
+    `time` TIME NOT NULL,
+    `time_6` TIME(6) NOT NULL,
+    `datetime` DATETIME NOT NULL,
+    `datetime_6` DATETIME(6) NOT NULL,
+    `timestamp` TIMESTAMP NOT NULL,
+    `timestamp_6` TIMESTAMP(6) NOT NULL,
+    `year` YEAR NOT NULL,
+    `char_100` CHAR(100) NOT NULL,
+    `binary_100` BINARY(100) NOT NULL,
+    `varchar_200` VARCHAR(200) NOT NULL,
+    `varbinary_200` VARBINARY(200) NOT NULL,
+    `longtext` LONGTEXT NOT NULL,
+    `mediumtext` MEDIUMTEXT NOT NULL,
+    `text` TEXT NOT NULL,
+    `tinytext` TINYTEXT NOT NULL,
+    `longblob` LONGBLOB NOT NULL,
+    `mediumblob` MEDIUMBLOB NOT NULL,
+    `blob` BLOB NOT NULL,
+    `tinyblob` TINYBLOB NOT NULL,
+    `json` JSON NOT NULL,
+--  `geographypoint` GEOGRAPHYPOINT NOT NULL,
+--  `geography` GEOGRAPHY NOT NULL,
+    `enum` ENUM('one', 'two', 'three') NOT NULL,
+    `set` SET('one', 'two', 'three') NOT NULL,
+    `bit` BIT NOT NULL
+)
+COLLATE='utf8_unicode_ci';
+
+INSERT INTO alltypes_no_nulls 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
+;
+
+-- Minimum values
+INSERT INTO alltypes_no_nulls 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_no_nulls 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
+;
+
+
 --
 -- Table of extended data types
 --