sqlutilpy 0.23.0__tar.gz → 0.24.0__tar.gz

{sqlutilpy-0.23.0/src/sqlutilpy.egg-info → sqlutilpy-0.24.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: sqlutilpy
-Version: 0.23.0
+Version: 0.24.0
 Summary: Database query code returning numpy arrays
 Author-email: "Sergey E. Koposov" <skoposov@ed.ac.uk>
 License: BSD

{sqlutilpy-0.23.0 → sqlutilpy-0.24.0}/src/sqlutilpy/sqlutil.py

@@ -339,31 +339,38 @@ def get(query,
         proc = None
         colNames = []
         if driver == 'psycopg2':
-            warnings.warn(
-                'psycopg2 driver is not supported anymore using psycopg instead'
-            )
+            warnings.warn('psycopg2 driver is not supported anymore. '
+                          'We using psycopg instead')
             driver = 'psycopg'
         if driver == 'psycopg':
             try:
-                while (True):
+                while True:
                     # Iterating over the cursor, retrieving batches of results
                     # and then sending them for conversion
                     tups = cur.fetchmany()
                     desc = cur.description
 
+                    # If the is just the start we need to launch the
+                    # thread doing the conversion
+                    no_results = tups == []
+                    if nrec == 0:
+                        typeCodes = [_tmp.type_code for _tmp in desc]
+                        colNames = [_tmp.name for _tmp in cur.description]
+
                     # No more data
-                    if tups == []:
+                    if no_results:
+                        dtype = __getDType([None] * len(typeCodes), typeCodes,
+                                           strLength)
                         break
 
+                    dtype = __getDType(tups[0], typeCodes, strLength)
+
                     # Send the new batch for conversion
                     qIn.put(tups)
 
                     # If the is just the start we need to launch the
                     # thread doing the conversion
                     if nrec == 0:
-                        typeCodes = [_tmp.type_code for _tmp in desc]
-                        colNames = [_tmp.name for _tmp in cur.description]
-                        dtype = __getDType(tups[0], typeCodes, strLength)
                         proc = threading.Thread(target=__converter,
                                                 args=(qIn, qOut, endEvent,
                                                       dtype, intNullVal))
@@ -731,9 +738,8 @@ table/pandas/dictionary or provide a separate list of arrays and their names')
         names = ','.join(names)
         for i in range(0, N, nsplit):
             try:
-                with cur.copy(
-                        f'''copy {tableName}({names}) from stdin with delimiter '{delimiter}' '''
-                ) as copy:
+                with cur.copy(f'''copy {tableName}({names}) from stdin
+                        with delimiter '{delimiter}' ''') as copy:
                     __print_arrays([_[i:i + nsplit] for _ in arrays],
                                    copy,
                                    delimiter=delimiter)

sqlutilpy-0.24.0/src/sqlutilpy/version.py

@@ -0,0 +1 @@
+__version__ = '0.24.0'

{sqlutilpy-0.23.0 → sqlutilpy-0.24.0/src/sqlutilpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: sqlutilpy
-Version: 0.23.0
+Version: 0.24.0
 Summary: Database query code returning numpy arrays
 Author-email: "Sergey E. Koposov" <skoposov@ed.ac.uk>
 License: BSD

{sqlutilpy-0.23.0 → sqlutilpy-0.24.0}/tests/test_pg.py

@@ -255,6 +255,12 @@ def test_get_dict(setup):
                      **kw)
     for i, k in enumerate(cols.split(',')):
         assert ((Rd[k] == R0[i]).all())
+    Rempty = sqlutil.get('select %s from sqlutil_test where sicol<-10000' %
+                         (cols, ),
+                         asDict=True,
+                         **kw)
+    for i, k in enumerate(cols.split(',')):
+        assert k in Rempty
 
 
 def test_get_dict_rep(setup):

sqlutilpy-0.23.0/src/sqlutilpy/version.py

@@ -1 +0,0 @@
-__version__ = '0.23.0'