mimerpy 1.3.2__tar.gz → 1.3.4__tar.gz

{mimerpy-1.3.2 → mimerpy-1.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mimerpy
-Version: 1.3.2
+Version: 1.3.4
 Summary: Python database interface for Mimer SQL
 Author-email: Erik Gunne <mimerpy@mimer.com>, Magdalena Boström <mimerpy@mimer.com>, Mimer Information Technology AB <mimerpy@mimer.com>
 Maintainer-email: Mimer Information Technology AB <mimerpy@mimer.com>

{mimerpy-1.3.2 → mimerpy-1.3.4}/doc/releasenotes.rst

@@ -56,9 +56,29 @@ Major changes:
 
 MimerPy Version 1.3.2
 ---------------------
-MimerPy version 1.3.2 is a minor buggfix release that fix a problem with datetime in Python version 3.9 and older
+MimerPy version 1.3.2 is a minor buggfix release that fix a problem with datetime in Python version 3.9 and older.
 
-Major changes:
+Minor changes:
 
 * Use a safe datetime and time parser
 * On Python 3.6, use dateutil module to parse ISO 8601 date strings
+
+MimerPy Version 1.3.3
+---------------------
+MimerPy version 1.3.3 is a buggfix release that correct the behavior for fetchone()
+
+Major changes:
+
+* fetchone() now returns None when no more rows are available, in accordance with the DB-API 2.0 specification.
+
+MimerPy Version 1.3.4
+---------------------
+MimerPy version 1.3.4 is a minor feature release that addes the optional cursor.lastrowid
+
+Minoe changes:
+
+* cursor.lastrowid now return the auto generated primary key when doing and insert. The following conditions have to be met, otherwise `None` is returned:
+
+  * The primary key must have a default value with `NEXT VALUE FOR <sequence>`
+  * The primary key must be a single integer type column
+  * No value must be given for the primary key when inserting the row

{mimerpy-1.3.2 → mimerpy-1.3.4}/src/mimerpy/_version.py

@@ -1,4 +1,4 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
-__version__ = version = '1.3.2'
-__version_tuple__ = version_tuple = (1, 3, 2)
+__version__ = version = '1.3.4'
+__version_tuple__ = version_tuple = (1, 3, 4)

{mimerpy-1.3.2 → mimerpy-1.3.4}/src/mimerpy/cursorPy.py

@@ -308,6 +308,7 @@ class Cursor:
         self.__session = session
         self.__statement = None
         self.__mimcursor = False
+        self.lastrowid = None
 
     def __enter__(self):
         self.__check_if_open()
@@ -323,7 +324,7 @@ class Cursor:
     def __next__(self):
         self.__check_if_open()
         return_value = self.fetchone()
-        if return_value == []:
+        if return_value is None:
             raise StopIteration
         return return_value
 
@@ -356,6 +357,7 @@ class Cursor:
         self.__check_if_open()
         self.__check_for_transaction()
         parameter_markers = ()
+        self.lastrowid = None
 
         # I would like to look over this at some point, the type control is not ideal - Erik 2018-10
         if (len(arg) > 1):
@@ -457,6 +459,9 @@ class Cursor:
                 rc_value = mimerapi.mimerExecute(self.__statement)
                 self.__check_mimerapi_error(rc_value, self.__statement)
                 self.rowcount = rc_value
+                rc, val = mimerapi.mimerGetSequenceInt64(self.__statement)
+                if rc == 0 and val != 0:
+                    self.lastrowid = val
             else:
                 # Return value of mimerColumnCount > 0 implies a query with a
                 # result set.
@@ -508,6 +513,7 @@ class Cursor:
         self.rowcount = 0
         rc_value = 0
         values = []
+        self.lastrowid = None
 
         if isinstance(params, GeneratorType):
             tmp_params = []
@@ -609,7 +615,7 @@ class Cursor:
 
         # Return value of mimerFetch == 100 implies end of result set
         if (rc_value == 100):
-            return []
+            return None
 
         for cur_column in range(1, self._number_of_columns + 1):
             func_tuple = get_funcs[self._column_type[cur_column - 1]
@@ -794,6 +800,7 @@ class ScrollCursor(Cursor):
         super(ScrollCursor, self).__init__(connection, session)
         self.__result_set = None
         self.rownumber = None
+        self.lastrowid = None
 
     def execute(self, *arg):
         """
@@ -835,7 +842,7 @@ class ScrollCursor(Cursor):
             values = values + self.__result_set[self.rownumber]
             self.rownumber = self.rownumber + 1
         except IndexError:
-            return []
+            return None
         return values
 
     def fetchmany(self, *arg):

{mimerpy-1.3.2 → mimerpy-1.3.4}/src/mimerpy/mimerapi.py

@@ -256,6 +256,8 @@ _MimerSetBoolean            = _bind('MimerSetBoolean', c_int32, MimerStatement,
 _MimerGetBoolean            = _bind('MimerGetBoolean', c_int32, MimerStatement, c_int16)
 _MimerGetUUID               = _bind('MimerGetUUID', c_int32, MimerStatement, c_int16, c_void_p)
 _MimerSetUUID               = _bind('MimerSetUUID', c_int32, MimerStatement, c_int16, c_void_p)
+_MimerGetSequenceInt64      = _bind('MimerGetSequenceInt64', c_int32, MimerStatement, POINTER(c_int64))
+
 # GIS bindings
 class MimerGisLocation(ctypes.Structure):
     _fields_ = [("latitude", c_double), ("longitude", c_double)]
@@ -482,6 +484,11 @@ def mimerGetFloat(statement_ptr: int, column_number: int):
     rc = _MimerGetFloat(MimerStatement(statement_ptr), _arg_i16(column_number), byref(out))
     return (int(rc), float(out.value))
 
+def mimerGetSequenceInt64(statement_ptr: int):
+    out = c_int64()
+    rc = _MimerGetSequenceInt64(MimerStatement(statement_ptr), byref(out))
+    return (int(rc), int(out.value))
+
 def mimerSetInt32(statement_ptr: int, parameter_number: int, value):
     sp = int(statement_ptr)
     if value is None:

{mimerpy-1.3.2 → mimerpy-1.3.4}/src/mimerpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mimerpy
-Version: 1.3.2
+Version: 1.3.4
 Summary: Python database interface for Mimer SQL
 Author-email: Erik Gunne <mimerpy@mimer.com>, Magdalena Boström <mimerpy@mimer.com>, Mimer Information Technology AB <mimerpy@mimer.com>
 Maintainer-email: Mimer Information Technology AB <mimerpy@mimer.com>

{mimerpy-1.3.2 → mimerpy-1.3.4}/tests/testConnection.py

@@ -320,7 +320,7 @@ class TestConnectionMethods(unittest.TestCase):
         a.close()
 
         b = self.tstcon.execute("select * from bob6")
-        self.assertEqual(b.fetchone(), [])
+        self.assertIsNone(b.fetchone())
         b.close()
 
     def test_autocommit(self):
@@ -363,7 +363,7 @@ class TestConnectionMethods(unittest.TestCase):
         a.close()
 
         b = self.tstcon.execute("select * from bob63")
-        self.assertEqual(b.fetchone(), [])
+        self.assertIsNone(b.fetchone())
         b.close()
 
     def test_autocommit_4(self):
@@ -376,7 +376,7 @@ class TestConnectionMethods(unittest.TestCase):
         a.close()
 
         b = self.tstcon.execute("select * from bob64")
-        self.assertEqual(b.fetchone(), [])
+        self.assertIsNone(b.fetchone())
         b.close()
 
 

{mimerpy-1.3.2 → mimerpy-1.3.4}/tests/testCursor.py

@@ -670,7 +670,7 @@ class TestCursorMethods(unittest.TestCase):
             c.execute("insert into bob556 values (3)")
             self.tstcon.rollback()
             c.execute("select * from bob556")
-            self.assertEqual(c.fetchone(), [])
+            self.assertIsNone(c.fetchone())
 
     def test_invalid_sequence_insert(self):
         with self.tstcon.cursor() as c:
@@ -869,7 +869,7 @@ class TestCursorMethods(unittest.TestCase):
             c.execute("SELECT * from jonNone")
             for i in range(1, 10):
                 c.fetchone()
-            self.assertEqual(c.fetchone(), [])
+            self.assertIsNone(c.fetchone())
 
     def test_empty_sequence_is_returned_many(self):
         with self.tstcon.cursor() as c:
@@ -2060,7 +2060,7 @@ create table longboi (c1 char(10),
         a.close()
 
 
-    if (mimerapi._level == 2):
+    if (mimerapi._level >= 2):
         def test_datatype_float_p(self):
             with self.tstcon.cursor() as c:
                 c.execute("create table floatptable (c1 FLOAT(5)) in pybank")
@@ -2089,6 +2089,25 @@ create table longboi (c1 char(10),
                 #with self.assertRaises(ProgrammingError):
                 c.execute("insert INTO jondecimal4 VALUES (?)", (floatnum))
 
+    def test_lastrowid(self):
+        a = mimerpy.connect(**db_config.TSTUSR)
+        b = a.cursor()
+        self.assertIsNone(b.lastrowid)
+        b.execute("create unique sequence lastrowid_seq in pybank")
+        self.assertIsNone(b.lastrowid)
+        b.execute("create table lastrowidtable (id INTEGER DEFAULT NEXT VALUE FOR lastrowid_seq, name NVARCHAR(20)) in pybank")
+        self.assertIsNone(b.lastrowid)
+        b.execute("insert into lastrowidtable(name) values (:a)", ('bob'))
+        self.assertEqual(b.lastrowid, 1)
+        b.execute("insert into lastrowidtable(name) values (:a)", ('frank'))
+        self.assertEqual(b.lastrowid, 2)
+        b.executemany("insert into lastrowidtable(name) values (:a)", [('karl'), ('alice')])
+        self.assertIsNone(b.lastrowid)
+        b.execute("select * from lastrowidtable")
+        self.assertIsNone(b.lastrowid)
+        r = b.fetchall()
+        a.close()
+
 
 if __name__ == '__main__':
     unittest.TestLoader.sortTestMethodsUsing = None

{mimerpy-1.3.2 → mimerpy-1.3.4}/tests/testScrollCursor.py

@@ -670,7 +670,7 @@ class TestScrollCursorMethods(unittest.TestCase):
             c.execute("SELECT * from jonNone")
             for i in range(1,10):
                 c.fetchone()
-            self.assertEqual(c.fetchone(), [])
+            self.assertIsNone(c.fetchone())
 
     def test_empty_sequence_is_returned_many(self):
         with self.tstcon.cursor(scrollable = True) as c:
@@ -1033,7 +1033,7 @@ class TestScrollCursorMethods(unittest.TestCase):
             self.assertEqual(c.fetchone(), (9, 'bob9'))
             self.assertEqual(c.fetchone(), (10, 'bob10'))
             self.assertEqual(c.fetchone(), (11, 'bob11'))
-            self.assertEqual(c.fetchone(), [])
+            self.assertIsNone(c.fetchone())
 
     def test_fetchone_rownumber(self):
         with self.tstcon.cursor(scrollable = True) as c:
@@ -1049,7 +1049,7 @@ class TestScrollCursorMethods(unittest.TestCase):
             self.assertEqual(c.rownumber, 2)
             self.assertEqual(c.fetchone(), (11, 'bob11'))
             self.assertEqual(c.rownumber, 3)
-            self.assertEqual(c.fetchone(), [])
+            self.assertIsNone(c.fetchone())
             self.assertEqual(c.rownumber, 3)
 
     def test_fetchmany_rownumber(self):
@@ -1107,7 +1107,7 @@ class TestScrollCursorMethods(unittest.TestCase):
                              [(6, 'bob6'),(7, 'bob7'),(8, 'bob8'),
                               (9, 'bob9'),(10, 'bob10')])
             self.assertEqual(c.rownumber, 10)
-            self.assertEqual(c.fetchone(), [])
+            self.assertIsNone(c.fetchone())
             self.assertEqual(c.fetchmany(21), [])
             self.assertEqual(c.fetchall(), [])
 
@@ -1224,7 +1224,7 @@ class TestScrollCursorMethods(unittest.TestCase):
             self.tstcon.rollback()
             c.execute("select * from bobnoselect")
             r = c.fetchone()
-            self.assertEqual(len(r), 0)
+            self.assertIsNone(r)
 
     def test_no_select2(self):
         with self.tstcon.cursor(scrollable = True) as c:
@@ -1253,6 +1253,25 @@ class TestScrollCursorMethods(unittest.TestCase):
             with self.assertRaises(ProgrammingError):
                 c.next()
 
+    def test_lastrowid(self):
+        a = mimerpy.connect(**db_config.TSTUSR)
+        b = a.cursor()
+        self.assertIsNone(b.lastrowid)
+        b.execute("create unique sequence lastrowidscroll_seq in pybank")
+        self.assertIsNone(b.lastrowid)
+        b.execute("create table lastrowidscroll (id INTEGER DEFAULT NEXT VALUE FOR lastrowidscroll_seq, name NVARCHAR(20)) in pybank")
+        self.assertIsNone(b.lastrowid)
+        b.execute("insert into lastrowidscroll(name) values (:a)", ('bob'))
+        self.assertEqual(b.lastrowid, 1)
+        b.execute("insert into lastrowidscroll(name) values (:a)", ('frank'))
+        self.assertEqual(b.lastrowid, 2)
+        b.executemany("insert into lastrowidscroll(name) values (:a)", [('karl'), ('alice')])
+        self.assertIsNone(b.lastrowid)
+        b.execute("select * from lastrowidscroll")
+        self.assertIsNone(b.lastrowid)
+        r = b.fetchall()
+        a.close()
+
 if __name__ == '__main__':
     unittest.TestLoader.sortTestMethodsUsing = None
     unittest.main()