iris-pex-embedded-python 2.3.17__py3-none-any.whl → 2.3.18__py3-none-any.whl

intersystems_iris/dbapi/_IRISStream.py

@@ -3,6 +3,7 @@ from .._MessageHeader import _MessageHeader
 from .._InStream import _InStream
 from .._OutStream import _OutStream
 
+
 class IRISStream:
     _handle = None
     _binary = False
@@ -59,5 +60,6 @@ class IRISStream:
 
         return result
 
+
 class IRISBinaryStream(IRISStream):
     _binary = True

intersystems_iris/dbapi/_Parameter.py

@@ -3,6 +3,7 @@ import decimal
 import enum
 import intersystems_iris.dbapi._Descriptor
 
+
 class ParameterMode(enum.IntEnum):
     UNKNOWN = 0
     INPUT = 1
@@ -13,8 +14,22 @@ class ParameterMode(enum.IntEnum):
     DEFAULT_PARAMETER = 6
     RETURN_VALUE = 7
 
+
 class _Parameter(intersystems_iris.dbapi._Descriptor._Descriptor):
-    def __init__(self, value = None, mode = ParameterMode.UNKNOWN, paramType = "?", name = "", execParam = False, bound = False, type = 0, precision = 0, scale = None, nullable = 0, slotPosition = None):
+    def __init__(
+        self,
+        value=None,
+        mode=ParameterMode.UNKNOWN,
+        paramType="?",
+        name="",
+        execParam=False,
+        bound=False,
+        type=0,
+        precision=0,
+        scale=None,
+        nullable=0,
+        slotPosition=None,
+    ):
         if not isinstance(mode, ParameterMode):
             raise TypeError("mode must be a ParameterMode")
         paramType = str(paramType)
@@ -48,23 +63,35 @@ class _Parameter(intersystems_iris.dbapi._Descriptor._Descriptor):
 
     def __repr__(self) -> str:
         if self.mode not in [ParameterMode.UNKNOWN, ParameterMode.INPUT]:
-            return f'<{self.mode.name}>{repr(self.value)}'
+            return f"<{self.mode.name}>{repr(self.value)}"
         else:
-            return f'<{self.mode.name}>'
+            return f"<{self.mode.name}>"
 
-    def Clone(self):
-        clone = _Parameter(self.value, self.mode, self.paramType, self.name, self.execParam, self.bound)
+    def Clone(self, value=None):
+        clone = _Parameter(
+            value or self.value,
+            self.mode,
+            self.paramType,
+            self.name,
+            self.execParam,
+            self.bound,
+            self.type,
+            self.precision,
+            self.scale,
+            self.nullable,
+            self.slotPosition,
+        )
         clone.cloneMe(self)
-        
+
         clone.parsermatched = self.parsermatched
         clone.matchedParameterList = self.matchedParameterList
-        
+
         return clone
 
     @property
     def bound(self):
         return self.__bound
-    
+
     @property
     def paramType(self):
         return self.__paramType
@@ -72,28 +99,29 @@ class _Parameter(intersystems_iris.dbapi._Descriptor._Descriptor):
     @property
     def value(self):
         _set_switcher = {
-            type(None): lambda v : None,
+            type(None): lambda v: None,
             # str: lambda v : v or b'\x00',
-            datetime.time: lambda v : v.strftime('%H:%M:%S.%f'),
-            datetime.date: lambda v : v.strftime('%Y-%m-%d'),
-            datetime.datetime: lambda v : v.strftime('%Y-%m-%d %H:%M:%S.%f'),
-            bytes: lambda v : v,
-            bytearray: lambda v : v,
-            bool: lambda v : 1 if v else 0,
-            int: lambda v : v,
-            float: lambda v : v,
-            decimal.Decimal: lambda v : v,
+            datetime.time: lambda v: v.strftime("%H:%M:%S.%f"),
+            datetime.date: lambda v: v.strftime("%Y-%m-%d"),
+            datetime.datetime: lambda v: v.strftime("%Y-%m-%d %H:%M:%S.%f"),
+            bytes: lambda v: v,
+            bytearray: lambda v: v,
+            bool: lambda v: 1 if v else 0,
+            int: lambda v: v,
+            float: lambda v: v,
+            decimal.Decimal: lambda v: v,
         }
-        func = _set_switcher[type(self.__value)] if type(self.__value) in _set_switcher else (lambda v : str(v))
-        value = func(self.__value)
+        func = None
+        if issubclass(type(self.__value), enum.Enum):
+            value = self.__value.value
+        elif type(self.__value) in _set_switcher:
+            func = _set_switcher[type(self.__value)]
+            value = func(self.__value)
+        else:
+            value = str(self.__value)
         if self.mode == ParameterMode.REPLACED_LITERAL:
-            try:
+            if isinstance(value, str) and value.isdigit() and str(int(value)) == value:
                 value = int(value)
-            except:
-                try:
-                    value = float(value)
-                except:
-                    pass
         return value
 
     def _copy_cached_info(self, desc, copy_replaced):
@@ -102,9 +130,11 @@ class _Parameter(intersystems_iris.dbapi._Descriptor._Descriptor):
         self.scale = desc.scale
         self.nullable = desc.nullable
         self.name = desc.name
-        if ((self.mode != ParameterMode.REPLACED_LITERAL) 
-            and (desc.mode != ParameterMode.REPLACED_LITERAL) 
-            and (desc.mode != ParameterMode.UNKNOWN)):
+        if (
+            (self.mode != ParameterMode.REPLACED_LITERAL)
+            and (desc.mode != ParameterMode.REPLACED_LITERAL)
+            and (desc.mode != ParameterMode.UNKNOWN)
+        ):
             self.mode = desc.mode
 
         if not copy_replaced:
@@ -114,7 +144,8 @@ class _Parameter(intersystems_iris.dbapi._Descriptor._Descriptor):
             self.mode = ParameterMode.REPLACED_LITERAL
             self.__value = desc.value
             self._values = list()
-            if len(desc._values) > 0: self._values.append(desc._values[0])
+            if len(desc._values) > 0:
+                self._values.append(desc._values[0])
         return
 
     def _bind(self, value, parameter_sets):
@@ -135,4 +166,4 @@ class _Parameter(intersystems_iris.dbapi._Descriptor._Descriptor):
         if self.mode == ParameterMode.OUTPUT or self.mode == ParameterMode.INPUT_OUTPUT:
             self.mode = ParameterMode.INPUT_OUTPUT
         else:
-            self.mode = ParameterMode.INPUT
+            self.mode = ParameterMode.INPUT

intersystems_iris/dbapi/_ParameterCollection.py

@@ -34,7 +34,7 @@ class _ParameterCollection:
             self._array_bound = False
 
     def set_input_params(self, params):
-        self._input_params = params
+        self._input_params = list(params)
 
     def collect(self, i: int = 0) -> list:
         params = list()
@@ -61,6 +61,14 @@ class _ParameterCollection:
 
         return params
 
+    def update(self, set_index, param_index, value):
+        if isinstance(self._input_params[set_index], tuple):
+            self._input_params[set_index] = list(self._input_params[set_index])
+        if isinstance(self._input_params[set_index], list):
+            self._input_params[set_index][param_index] = value
+        else:
+            self._input_params[param_index] = value
+
     def __repr__(self) -> str:
         return repr(self.collect())
 

intersystems_iris/dbapi/_ResultSetRow.py

@@ -88,7 +88,7 @@ class _ResultSetRow:
             SQLType.TYPE_DATE: None,
             SQLType.TYPE_TIME: None,
             SQLType.TYPE_TIMESTAMP: None,
-            SQLType.VARBINARY: None,
+            SQLType.VARBINARY: bytes,
             SQLType.VARCHAR: str,
             SQLType.WCHAR: None,
             SQLType.WLONGVARCHAR: None,
@@ -165,6 +165,8 @@ class _ResultSetRow:
                         pass
                     elif item is None:
                         pass
+                    elif value_type is bytes:
+                        item = bytes(map(ord, item))
                     elif issubclass(value_type, IRISStream):
                         stream = value_type(self._connection, item)
                         item = stream.fetch()

intersystems_iris/dbapi/preparser/_PreParser.py

@@ -11,6 +11,15 @@ from intersystems_iris.dbapi._Parameter import ParameterMode
 from intersystems_iris.dbapi.preparser._Token import TOKEN
 from intersystems_iris.dbapi.preparser._Scanner import ParseToken
 
+class MultiValuesInsert(Exception):
+
+    def __init__(self, *args: object, query: str, rows: int, params=None) -> None:
+        super().__init__(*args)
+        self.query = query
+        self.rows = rows
+        self.params = params
+    
+
 # May want to move to its own file eventually
 # SQL Statement Types
 class StatementType(enum.IntEnum):
@@ -544,48 +553,48 @@ class _PreParser(object):
             return False, query
         
     def InsertMultiValues(self, query):
-        try:
-            new_query = ''
-            values_list = []
-
-            tokens = self.m_Tokens.GetEnumerator()
-            while tokens.MoveNext() and not tokens.Current().UpperEquals("INSERT"):
-                new_query += tokens.Current().Lexeme + ' '
-            if not tokens.MoveNext() or not tokens.Current().UpperEquals("INTO"):
-                return False, query
-            new_query += 'INSERT INTO '
-            while tokens.MoveNext() and not tokens.Current().UpperEquals("VALUES"):
-                new_query += tokens.Current().Lexeme + ' '
+        new_query = ''
+        values_list = []
 
-            values = ''
-            while tokens.MoveNext():
-                assert tokens.Current().TokenType is TOKEN.OPEN_PAREN
-                open_parens = 1
-                while tokens.MoveNext() or open_parens > 0:
-                    token = tokens.Current()
-                    if token.TokenType is TOKEN.OPEN_PAREN:
-                        open_parens += 1
-                    elif token.TokenType is TOKEN.CLOSE_PAREN:
-                        open_parens -= 1
-                    if open_parens == 0:
-                        break
-                    values += token.Lexeme
-                    values += ' '
-                values_list.append(values)
-                values = ''
-                if not tokens.MoveNext() or tokens.Current().TokenType is not TOKEN.COMMA:
+        tokens = self.m_Tokens.GetEnumerator()
+        while tokens.MoveNext() and not tokens.Current().UpperEquals("INSERT"):
+            new_query += tokens.Current().Lexeme + ' '
+        if not tokens.MoveNext() or not tokens.Current().UpperEquals("INTO"):
+            return False, query
+        new_query += 'INSERT INTO '
+        while tokens.MoveNext() and not tokens.Current().UpperEquals("VALUES"):
+            new_query += tokens.Current().Lexeme + ' '
+
+        values = ''
+        params = []
+        while tokens.MoveNext():
+            assert tokens.Current().TokenType is TOKEN.OPEN_PAREN
+            open_parens = 1
+            while tokens.MoveNext() or open_parens > 0:
+                token = tokens.Current()
+                if token.TokenType is TOKEN.OPEN_PAREN:
+                    open_parens += 1
+                elif token.TokenType is TOKEN.CLOSE_PAREN:
+                    open_parens -= 1
+                if open_parens == 0:
                     break
-            
-            if len(values_list) <= 1:
-                return False, query
-
-            new_query += ' SELECT '
-            new_query += ' UNION ALL SELECT '.join(values_list)
-
-            return True, new_query
-        except:
+                if token.TokenType is TOKEN.CONSTANT:
+                    values += '?'
+                    params += [token.Lexeme] 
+                else:    
+                    values += token.Lexeme
+                values += ' '
+            values_list.append(values)
+            values = ''
+            if not tokens.MoveNext() or tokens.Current().TokenType is not TOKEN.COMMA:
+                break
+        
+        if len(values_list) <= 1:
             return False, query
 
+        new_query += f" VALUES ({values_list[0]})"
+        raise MultiValuesInsert(query=new_query, rows=len(values_list), params=params)
+
     #  Parse a statement
     def Tokenize(self, p_strInput):
         #  Get a scanner on the sql string

{iris_pex_embedded_python-2.3.17.dist-info → iris_pex_embedded_python-2.3.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iris-pex-embedded-python
-Version: 2.3.17
+Version: 2.3.18
 Summary: iris_pex_embedded_python
 Home-page: https://github.com/grongierisc/interoperability-embedded-python
 Author: grongier

{iris_pex_embedded_python-2.3.17.dist-info → iris_pex_embedded_python-2.3.18.dist-info}/RECORD

@@ -42,7 +42,7 @@ grongier/iris/Grongier/PEX/PrivateSession/Message/Start.cls,sha256=DAtq4DyRqFq2_
 grongier/iris/Grongier/PEX/PrivateSession/Message/Stop.cls,sha256=ofVKjrN6UPFasalrjPFWYNwlJ5IBlAE62IH8_U07c0g,1435
 grongier/pex/__init__.py,sha256=nvcmRCxLy-lpL5GzlCKrmsSK8LF8Q0aKddx6ib8U50E,1166
 grongier/pex/__main__.py,sha256=ebEYPDOBKiXOlmdI4onpQLzfBKU4wyfijYyquA5dWV4,107
-grongier/pex/_business_host.py,sha256=a3sAXvX9h_SMYTDJPTGHXxalHrsD10i5Z8PO107htkU,17804
+grongier/pex/_business_host.py,sha256=DB8dGQUEzcWaVzE4lbydt97uZqrkG1UbYIHgBD7UNq4,18190
 grongier/pex/_business_operation.py,sha256=W_B9Ci1fei8SGcElkAd13gV9S4BNKeQciTMVqxxJVZc,3509
 grongier/pex/_business_process.py,sha256=WtO1RCZUKykaxUFocI1XmZmnSQzEOz_VFsVFytsOzFE,11838
 grongier/pex/_business_service.py,sha256=8CgpjcdVmv5747CTa3Lw3B48RYXq2SQN9qfdxvqEI5g,3735
@@ -110,16 +110,16 @@ intersystems_iris/_SharedMemorySocket.py,sha256=2iUaS1FdJNSCUEaE-VT0O_dxF6NRwqZS
 intersystems_iris/__init__.py,sha256=Tk1tD28LwvF6X3yXQsJFLE1Bc-PR3gUJWcX5UnNYOdY,1773
 intersystems_iris/__main__.py,sha256=rCtINTfJcADMAsw1ja-MEO7Q-XekrWthYowzWV8xGIQ,218
 intersystems_iris/dbapi/_Column.py,sha256=VCLHLXs3wuGcUa9w_qy7HBFsuGvhmmI3kGYBagQg59U,2535
-intersystems_iris/dbapi/_DBAPI.py,sha256=K_hBqzKhowXey2Yyf981ZTlNf5S__A_le8BBoUIBlWY,94963
+intersystems_iris/dbapi/_DBAPI.py,sha256=GR09iiA59NYfR4bB8YhdEwzZBQgyZaeGjqmmhUtoMJ0,101649
 intersystems_iris/dbapi/_Descriptor.py,sha256=IjyITxvjygDrhpk-0lGhdqQPh91SG6nTb1vi-AqyJNI,1391
-intersystems_iris/dbapi/_IRISStream.py,sha256=Vz3ydS9djxqqp-1F385FHgjjJNosXNpGMu-rkAPJDrs,2113
+intersystems_iris/dbapi/_IRISStream.py,sha256=dGJntWo4HXgM1nUHZl2hA4xHkBFEU2xkoEplVDFWhnA,2115
 intersystems_iris/dbapi/_Message.py,sha256=jpLG3HZElqp981iNPFW8UNRO3NbHf6poEv6yywX0Ssw,4076
-intersystems_iris/dbapi/_Parameter.py,sha256=i8J37BnmIR-YHdsyfiht8NCh9fHhcY6B8ONPMch-sKE,4776
-intersystems_iris/dbapi/_ParameterCollection.py,sha256=ta8nuwHjTbY4V_ouOmNQv4C46u8eA6cdvij9xIWqQuo,5151
-intersystems_iris/dbapi/_ResultSetRow.py,sha256=o_lqYAmge8V9KjIWjiWKHUe8ZshgKypFJT6OLIQEjAo,12810
+intersystems_iris/dbapi/_Parameter.py,sha256=PrfQQnfBf1R1M3P9oUrus6T5PROg35A8LO-RRFo6J1I,5202
+intersystems_iris/dbapi/_ParameterCollection.py,sha256=kcgNiGv2nH5AwuA6LlPpM4dWqhSqRyD3VtwqHqDGRGU,5541
+intersystems_iris/dbapi/_ResultSetRow.py,sha256=tNKCv5P8XhP9zzdPpBGiXYHLKOScITTBGSqtui1TAM0,12910
 intersystems_iris/dbapi/_SQLType.py,sha256=IlDacXwQzUMWaJ02Zsu2bUfvUC3-5mBx-m6mE0Yp7ts,557
 intersystems_iris/dbapi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-intersystems_iris/dbapi/preparser/_PreParser.py,sha256=HQ0atgoFHteMq1TLPDDp139IpExSfYsGs90Lcf8eoaY,78588
+intersystems_iris/dbapi/preparser/_PreParser.py,sha256=024w-s3n_JNsk_ISC8avJMK3QEZE3hSuD0Nr8arJdZw,78828
 intersystems_iris/dbapi/preparser/_Scanner.py,sha256=xA8rkKsaVba_mAgoXEeliyuMxNKe4vVmmw_klukdf_U,16163
 intersystems_iris/dbapi/preparser/_Token.py,sha256=9ZYrjvYJtMApAR7RtYzp32Hcoo3jB_YpG7ECo7p6QHA,2304
 intersystems_iris/dbapi/preparser/_TokenList.py,sha256=P74kA3DXxi7imt0mea4LPjCCc_gk50zsYLOCWON_JvA,6770
@@ -145,9 +145,9 @@ iris/irisbuiltins.py,sha256=0xMYrnTJ8q3WsQ8CXlKHYnfAVTIkO-PXDpdQ_SvHVpI,2687
 iris/irisloader.py,sha256=2ZLM0FlYNStTiZrXuvDcO-V_XZVgmB3R8vesmaqMqYA,4808
 irisnative/_IRISNative.py,sha256=HQ4nBhc8t8_5OtxdMG-kx1aa-T1znf2I8obZOPLOPzg,665
 irisnative/__init__.py,sha256=6YmvBLQSURsCPKaNg7LK-xpo4ipDjrlhKuwdfdNb3Kg,341
-iris_pex_embedded_python-2.3.17.dist-info/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
-iris_pex_embedded_python-2.3.17.dist-info/METADATA,sha256=Ie7RxyVctM1-e9ImrVZulyFHdg_NsNozGtXMoqwYXOU,48121
-iris_pex_embedded_python-2.3.17.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-iris_pex_embedded_python-2.3.17.dist-info/entry_points.txt,sha256=atkAtHoIuwXcZ0jl5gwof0l__ru_lt8WhVYk6HxYf70,47
-iris_pex_embedded_python-2.3.17.dist-info/top_level.txt,sha256=Tl4ZHgeNefaZW2Oug30vSldhD-tWzixsIfzASBrZ9ps,43
-iris_pex_embedded_python-2.3.17.dist-info/RECORD,,
+iris_pex_embedded_python-2.3.18.dist-info/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
+iris_pex_embedded_python-2.3.18.dist-info/METADATA,sha256=qgmU6DQUBf-JkfKS8mnIgyFIzdUsEgLJU3w06Dnumwg,48121
+iris_pex_embedded_python-2.3.18.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+iris_pex_embedded_python-2.3.18.dist-info/entry_points.txt,sha256=atkAtHoIuwXcZ0jl5gwof0l__ru_lt8WhVYk6HxYf70,47
+iris_pex_embedded_python-2.3.18.dist-info/top_level.txt,sha256=Tl4ZHgeNefaZW2Oug30vSldhD-tWzixsIfzASBrZ9ps,43
+iris_pex_embedded_python-2.3.18.dist-info/RECORD,,