pglib 5.9.1__tar.gz → 5.10.0__tar.gz

{pglib-5.9.1/pglib.egg-info → pglib-5.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pglib
-Version: 5.9.1
+Version: 5.10.0
 Summary: A PostgreSQL interface
 Home-page: https://gitlab.com/mkleehammer/pglib
 Maintainer: Michael Kleehammer

{pglib-5.9.1 → pglib-5.10.0/pglib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pglib
-Version: 5.9.1
+Version: 5.10.0
 Summary: A PostgreSQL interface
 Home-page: https://gitlab.com/mkleehammer/pglib
 Maintainer: Michael Kleehammer

{pglib-5.9.1 → pglib-5.10.0}/setup.py

@@ -130,7 +130,7 @@ def _get_settings():
 
 setup(
     name='pglib',
-    version='5.9.1',
+    version='5.10.0',
     description='A PostgreSQL interface',
     long_description=long_description,
     maintainer='Michael Kleehammer',

{pglib-5.9.1 → pglib-5.10.0}/src/getdata.cpp

@@ -398,6 +398,9 @@ PyObject* ConvertValue(PGresult* result, int iRow, int iCol, bool integer_dateti
     case INT8ARRAYOID:
         return GetInt8Array(p);
 
+    case FLOAT8ARRAYOID:
+        return GetFloat8Array(p);
+
     case TEXTARRAYOID:
         return GetTextArray(p);
 

{pglib-5.9.1 → pglib-5.10.0}/src/pgarrays.cpp

@@ -91,6 +91,11 @@ inline uint32_t ReadU32(const char ** pp) {
     return htonl(n);
 }
 
+inline double ReadDouble(const char ** pp) {
+    double n = **(double**)pp;
+    *pp += sizeof(double);
+    return swapdouble(n);
+}
 
 
 static PyObject* FindFirstParam(Object& seq)
@@ -375,6 +380,69 @@ bool BindLongArray(Params& params, Object& seq, Py_ssize_t cItems)
 }
 
 
+static bool BindFloatArray(Params& params, Object& seq, Py_ssize_t cItems)
+{
+    // Loop through the array and make sure each entry is a float (or None).
+
+    int cNonNull = 0;           // count of non-null items
+
+    for (Py_ssize_t iItem = 0; iItem < cItems; iItem++)
+    {
+        PyObject* item = PySequence_Fast_GET_ITEM(seq.Get(), iItem);
+        if (item != Py_None)
+        {
+            if (!PyFloat_Check(item))
+            {
+                SetStringError(Error, "array parameters must all be the same type");
+                return false;
+            }
+
+            cNonNull += 1;
+        }
+    }
+
+    int cbItem = sizeof(double);
+
+    Py_ssize_t cb = sizeof(ArrayHeader) +
+        (4 * cItems) +          // length indicators
+        (cbItem * cNonNull);    // values
+
+
+    WriteBuffer buf = params.Allocate(cb);
+    if (!buf)
+        return false;
+
+    ArrayHeader* phdr = (ArrayHeader*)buf.pbStart;
+    phdr->ndim   = htonl(1);
+    phdr->flags  = htonl(1);
+    phdr->oid    = htonl(FLOAT8OID);
+    phdr->dim    = htonl(cItems);
+    phdr->lbound = htonl(1);
+
+    char* pT = &phdr->buffer[0];
+
+    for (Py_ssize_t iItem = 0; iItem < cItems; iItem++)
+    {
+        PyObject* item = PySequence_Fast_GET_ITEM(seq.Get(), iItem);
+        if (item != Py_None)
+        {
+            (*(uint32_t*)pT) = htonl(cbItem); // could be swapped and cached
+            pT += 4;
+
+            (*(double*)pT) = swapdouble(PyFloat_AS_DOUBLE(item));
+            pT += cbItem;
+        }
+        else
+        {
+            (*(uint32_t*)pT) = htonl(-1);
+            pT += 4;
+        }
+    }
+
+    return params.Bind(FLOAT8ARRAYOID, buf, FORMAT_BINARY);
+}
+
+
 bool BindArray(Params& params, PyObject* param)
 {
     // Binds a list or tuple as an array.  All elements must be of the same type, though None
@@ -399,7 +467,10 @@ bool BindArray(Params& params, PyObject* param)
     if (PyDate_Check(first))
         return BindDateArray(params, seq, cItems);
 
-    SetStringError(Error, "Unhandled type in parameter array");
+    if (PyFloat_Check(first))
+        return BindFloatArray(params, seq, cItems);
+
+    SetStringError(Error, "Unhandled type in array parameter");
 
     return false;
 }
@@ -527,6 +598,45 @@ PyObject* GetInt8Array(const char* p)
 }
 
 
+PyObject* GetFloat8Array(const char* p)
+{
+    // Reads an FLOAT8ARRAYOID array result and returns a list of floats.
+
+    ArrayInfo info;
+    if (!ReadArrayInfo(p, info, FLOAT8OID)) {
+        return 0;
+    }
+
+    Object list(PyList_New(info.len));
+    if (!list)
+        return 0;
+
+    if (info.len) {
+        const char* data = info.data;
+
+        for (uint32_t i = 0; i < info.len; i++)
+        {
+            int32_t len = Read32(&data);
+
+            if (len == -1)
+            {
+                Py_INCREF(Py_None);
+                PyList_SET_ITEM(list.Get(), i, Py_None);
+            }
+            else
+            {
+                double val = ReadDouble(&data);
+                PyObject* o = PyFloat_FromDouble(val);
+                if (!o)
+                    return 0;
+
+                PyList_SET_ITEM(list.Get(), i, o);
+            }
+        }
+    }
+
+    return list.Detach();
+}
 
 PyObject* GetTextArray(const char* p)
 {

{pglib-5.9.1 → pglib-5.10.0}/src/pgarrays.h

@@ -15,5 +15,6 @@ PyObject* GetInt8Array(const char* p);
 PyObject* GetTextArray(const char* p);
 PyObject* GetDateArray(const char* p);
 PyObject* GetJSONBArray(const char* p);
+PyObject* GetFloat8Array(const char* p);
 
 #endif

{pglib-5.9.1 → pglib-5.10.0}/src/pglib.h

@@ -69,6 +69,7 @@ extern PyObject* Error;
 #define DATEARRAYOID   1182
 #define FLOAT4OID      700
 #define FLOAT8OID      701
+#define FLOAT8ARRAYOID 1022
 #define INT2ARRAYOID   1005
 #define INT2OID        21
 #define INT4ARRAYOID   1007

{pglib-5.9.1 → pglib-5.10.0}/test/test_sync.py

@@ -1,4 +1,3 @@
-
 # Run with pytest.
 
 # pylint: disable=missing-function-docstring,redefined-outer-name,unidiomatic-typecheck
@@ -711,6 +710,15 @@ def test_array_bigint(cnxn):
     assert result == value
 
 
+def test_array_float(cnxn):
+    cnxn.execute("create table t1(id int, v float[])")
+    value = [None, -100000.0, -32768.0, -123.45, -1.0, 0.0,
+             1.0, 123.45, 32767.0, 2147483647.0, 10101010.8989]
+    cnxn.execute("insert into t1 values (1, $1)", value)
+    result = cnxn.fetchval("select v from t1")
+    assert result == value
+
+
 def test_array_text(cnxn):
     cnxn.execute("create table t1(id int, v text[])")
     value = ['one', None, 'two']