pglib 5.11.0__tar.gz → 5.13.0__tar.gz

{pglib-5.11.0/pglib.egg-info → pglib-5.13.0}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: pglib
-Version: 5.11.0
+Version: 5.13.0
 Summary: A PostgreSQL interface
 Author-email: Michael Kleehammer <michael@kleehammer.com>
-License-Expression: MIT
+License: MIT
 Project-URL: Homepage, https://gitlab.com/mkleehammer/pglib
 Project-URL: Repository, https://gitlab.com/mkleehammer/pglib
 Keywords: postgresql,postgres
@@ -17,10 +17,8 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
-License-File: LICENSE
 Provides-Extra: test
-Requires-Dist: pytest; extra == "test"
-Dynamic: license-file
+License-File: LICENSE
 
 
 pglib is a Python 3.10+ module for working with PostgreSQL databases.  It is a C extension that

{pglib-5.11.0 → pglib-5.13.0/pglib.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: pglib
-Version: 5.11.0
+Version: 5.13.0
 Summary: A PostgreSQL interface
 Author-email: Michael Kleehammer <michael@kleehammer.com>
-License-Expression: MIT
+License: MIT
 Project-URL: Homepage, https://gitlab.com/mkleehammer/pglib
 Project-URL: Repository, https://gitlab.com/mkleehammer/pglib
 Keywords: postgresql,postgres
@@ -17,10 +17,8 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
-License-File: LICENSE
 Provides-Extra: test
-Requires-Dist: pytest; extra == "test"
-Dynamic: license-file
+License-File: LICENSE
 
 
 pglib is a Python 3.10+ module for working with PostgreSQL databases.  It is a C extension that

{pglib-5.11.0 → pglib-5.13.0}/pyproject.toml

@@ -4,11 +4,10 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pglib"
-version = "5.11.0"
+version = "5.13.0"
 description = "A PostgreSQL interface"
 readme = "README.rst"
-license = "MIT"
-license-files = ["LICENSE"]
+license = {text = "MIT"}
 requires-python = ">=3.10"
 authors = [
     {name = "Michael Kleehammer", email = "michael@kleehammer.com"}

{pglib-5.11.0 → pglib-5.13.0}/src/connection.cpp

@@ -170,8 +170,8 @@ static PGresult* internal_execute(PyObject* self, PyObject* args)
 
     if (result == 0)
     {
-        // Apparently this only happens for very serious errors, but the docs aren't terribly clear.
-        PyErr_SetString(Error, "Fatal error");
+        // This happens for out-of-memory or inability to send the command to the server.
+        SetConnectionError(cnxn);
         return 0;
     }
 
@@ -197,8 +197,8 @@ static PyObject* Connection_script(PyObject* self, PyObject* args)
         return 0;
 
     ResultHolder result = PQexec(cnxn->pgconn, szScript);
-    if (result == 0)
-        return 0;
+    if (result.p == 0)
+        return SetConnectionError(cnxn);
 
     switch (PQresultStatus(result)) {
     case PGRES_BAD_RESPONSE:
@@ -271,7 +271,7 @@ static PyObject* Connection_copy_from(PyObject* self, PyObject* args)
     Py_END_ALLOW_THREADS
 
     if (result == 0)
-        return 0;
+        return SetConnectionError(cnxn);
 
     switch (PQresultStatus(result)) {
     case PGRES_COPY_IN:
@@ -365,6 +365,112 @@ static PyObject* Connection_copy_from(PyObject* self, PyObject* args)
 }
 
 
+const char* doc_copy_to =
+    "Connection.copy_to(command, dest) --> int\n"
+    "\n"
+    "Executes the given COPY TO command and returns the number of records copied.\n"
+    "\n"
+    "command\n"
+    "  The copy command which must be 'to stdout'.\n"
+    "\n"
+    "dest\n"
+    "  The file-like object to write to.  Strings will be written, not bytes, so\n"
+    "  open in text mode.\n"
+    "\n"
+    "Examples:\n"
+    "  cnxn.copy_to('copy t1 to stdout csv header', open('test.csv', 'w'))\n"
+    "  cnxn.copy_to('copy t1(a, b, c) to stdout csv header', open('test.csv', 'w'))\n"
+    "  cnxn.copy_to('copy (select * from t1 where id > 10) to stdout csv', f)\n";
+
+static PyObject* Connection_copy_to(PyObject* self, PyObject* args)
+{
+    PyObject* command;
+    PyObject* dest;
+    if (!PyArg_ParseTuple(args, "UO", &command, &dest))
+        return 0;
+
+    Connection* cnxn = CastConnection(self, REQUIRE_OPEN);
+    if (!cnxn)
+        return 0;
+
+    if (!PyObject_HasAttrString(dest, "write"))
+        return PyErr_Format(Error, "Destination must be a file-like object.");
+    Object write_method(PyObject_GetAttrString(dest, "write"));
+
+    const char* szSQL = PyUnicode_AsUTF8(command);
+    if (!szSQL)
+        return 0;
+
+    ResultHolder result;
+    Py_BEGIN_ALLOW_THREADS
+    result = PQexec(cnxn->pgconn, szSQL);
+    Py_END_ALLOW_THREADS
+
+    if (result == 0)
+        return SetConnectionError(cnxn);
+
+    switch (PQresultStatus(result)) {
+    case PGRES_COPY_OUT:
+        // This is what we are expecting.
+        break;
+
+    case PGRES_BAD_RESPONSE:
+    case PGRES_NONFATAL_ERROR:
+    case PGRES_FATAL_ERROR:
+        return SetResultError(result.Detach());
+
+    default:
+        return PyErr_Format(Error, "Result was not PGRES_COPY_OUT: %d", (int)PQresultStatus(result));
+    }
+
+
+    for (;;) {
+        int cb = 0;
+        char* buffer;
+        Py_BEGIN_ALLOW_THREADS
+        cb = PQgetCopyData(cnxn->pgconn, &buffer, 0);
+        Py_END_ALLOW_THREADS
+
+        if (cb == -2) {
+            return SetConnectionError(cnxn);
+        }
+
+        if (cb == -1) {
+            // The copy is complete.
+            break;
+        }
+
+        // We have a buffer of byte data.  We have the length (`cb`), but the libpq docs say
+        // that the string is also zero terminated, so we're going to try not calling 'write'.
+
+        int err = PyFile_WriteString(buffer, dest);
+
+        PQfreemem(buffer);
+        if (err) {
+            return 0;
+        }
+    }
+
+    // After a copy, you have to get another result to know if it was successful.
+
+    ResultHolder final_result;
+    ExecStatusType status = PGRES_COMMAND_OK;
+    Py_BEGIN_ALLOW_THREADS
+    final_result = PQgetResult(cnxn->pgconn);
+    status = PQresultStatus(final_result);
+    Py_END_ALLOW_THREADS
+
+    if (status != PGRES_COMMAND_OK) {
+      return SetResultError(final_result.Detach());
+    }
+
+    const char* sz = PQcmdTuples(final_result);
+    if (sz == 0 || *sz == 0)
+      Py_RETURN_NONE;
+    return PyLong_FromLong(atoi(sz));
+}
+
+
 const char* doc_copy_to_csv =
     "Connection.copy_to_csv(table, dest, header=0, delimiter=',', quote='\"')\n"
     "\n"
@@ -435,7 +541,7 @@ static PyObject* Connection_copy_to_csv(PyObject* self, PyObject* args, PyObject
     Py_END_ALLOW_THREADS
 
     if (result == 0)
-        return 0;
+        return SetConnectionError(cnxn);
 
     switch (PQresultStatus(result)) {
     case PGRES_COPY_OUT:
@@ -460,7 +566,7 @@ static PyObject* Connection_copy_to_csv(PyObject* self, PyObject* args, PyObject
         Py_END_ALLOW_THREADS
 
         if (cb == -2) {
-            return SetResultError(result.Detach());
+            return SetConnectionError(cnxn);
         }
 
         if (cb == -1) {
@@ -473,10 +579,6 @@ static PyObject* Connection_copy_to_csv(PyObject* self, PyObject* args, PyObject
 
         int err = PyFile_WriteString(buffer, dest);
 
-        //  while (cb > 0) {
-        //      PyObject* res = PyObject_CallObject(write_method)
-        //  }
-
         PQfreemem(buffer);
         if (err) {
             return 0;
@@ -493,7 +595,6 @@ static PyObject* Connection_copy_to_csv(PyObject* self, PyObject* args, PyObject
     Py_END_ALLOW_THREADS
 
     if (status != PGRES_COMMAND_OK) {
-      // SetResultError will take ownership of `result`.
       return SetResultError(final_result.Detach());
     }
 
@@ -578,7 +679,7 @@ static PyObject* Connection_copy_from_csv(PyObject* self, PyObject* args, PyObje
     Py_END_ALLOW_THREADS
 
     if (result == 0)
-        return 0;
+        return SetConnectionError(cnxn);
 
     switch (PQresultStatus(result)) {
     case PGRES_COPY_IN:
@@ -941,13 +1042,17 @@ static PyObject* Connection_begin(PyObject* self, PyObject* args)
     if (txnstatus == PQTRANS_IDLE)
     {
         result = PQexec(cnxn->pgconn, "BEGIN");
-        status = PQresultStatus(result);
+        if (result)
+            status = PQresultStatus(result);
     }
     Py_END_ALLOW_THREADS
 
     if (txnstatus != PQTRANS_IDLE)
         return PyErr_Format(Error, "Connection transaction status is not idle: %s", NameFromTxnFlag(txnstatus));
 
+    if (result == 0)
+        return SetConnectionError(cnxn);
+
     if (status != PGRES_COMMAND_OK)
         return SetResultError(result);
 
@@ -974,13 +1079,17 @@ static PyObject* Connection_commit(PyObject* self, PyObject* args)
     if (txnstatus == PQTRANS_INTRANS)
     {
         result = PQexec(cnxn->pgconn, "COMMIT");
-        status = PQresultStatus(result);
+        if (result)
+            status = PQresultStatus(result);
     }
     Py_END_ALLOW_THREADS
 
     if (txnstatus != PQTRANS_IDLE && txnstatus != PQTRANS_INTRANS)
         return PyErr_Format(Error, "Connection transaction status is invalid: %s", NameFromTxnFlag(txnstatus));
 
+    if (txnstatus == PQTRANS_INTRANS && result == 0)
+        return SetConnectionError(cnxn);
+
     if (status != PGRES_COMMAND_OK)
         return SetResultError(result);
 
@@ -1003,9 +1112,13 @@ static PyObject* Connection_rollback(PyObject* self, PyObject* args)
 
     Py_BEGIN_ALLOW_THREADS
     result = PQexec(cnxn->pgconn, "ROLLBACK");
-    status = PQresultStatus(result);
+    if (result)
+        status = PQresultStatus(result);
     Py_END_ALLOW_THREADS
 
+    if (result == 0)
+        return SetConnectionError(cnxn);
+
     if (status != PGRES_COMMAND_OK)
         return SetResultError(result);
 
@@ -1631,6 +1744,7 @@ static struct PyMethodDef Connection_methods[] =
     { "script",  Connection_script,  METH_VARARGS, doc_script },
     { "copy_from", (PyCFunction) Connection_copy_from, METH_VARARGS | METH_KEYWORDS, doc_copy_from },
     { "copy_from_csv", (PyCFunction) Connection_copy_from_csv, METH_VARARGS | METH_KEYWORDS, doc_copy_from_csv },
+    { "copy_to", (PyCFunction) Connection_copy_to, METH_VARARGS, doc_copy_to },
     { "copy_to_csv", (PyCFunction) Connection_copy_to_csv, METH_VARARGS | METH_KEYWORDS, doc_copy_to_csv},
     { "begin",    Connection_begin,   METH_NOARGS, doc_begin },
     { "commit",   Connection_commit,   METH_NOARGS, doc_commit },

{pglib-5.11.0 → pglib-5.13.0}/src/errors.cpp

@@ -29,6 +29,8 @@ static const ResultErrorField errorFields[] =
 PyObject* SetConnectionError(PGconn* pgconn)
 {
     const char* szMessage = PQerrorMessage(pgconn);
+    if (szMessage == 0 || szMessage[0] == 0)
+        szMessage = "connection error (no details available)";
     PyErr_SetString(Error, szMessage);
     return 0;
 }
@@ -63,8 +65,12 @@ PyObject* SetResultError(PGresult* r)
 
     const char* szMessage  = PQresultErrorMessage(result);
     const char* szSQLSTATE = PQresultErrorField(result, PG_DIAG_SQLSTATE);
-    if (!szMessage || !szSQLSTATE)
-        return PyErr_NoMemory();
+
+    // Handle cases where error info isn't available (e.g., connection terminated)
+    if (!szMessage || szMessage[0] == 0)
+        szMessage = "unknown error";
+    if (!szSQLSTATE)
+        szSQLSTATE = "?????";  // Unknown SQLSTATE
 
     Object msg(PyUnicode_FromFormat("[%s] %s", szSQLSTATE, szMessage));
     if (!msg)
@@ -96,6 +102,7 @@ PyObject* SetResultError(PGresult* r)
     }
     
     PyErr_SetObject(Error, error);
+    Py_DECREF(error);
 
     return 0;
 }

{pglib-5.11.0 → pglib-5.13.0}/test/test_sync.py

@@ -176,6 +176,39 @@ def test_copytocsv(cnxn):
             assert rows == [['a', 'b'], ['1', 'one'], ['2', 'two'], ['3', 'three']]
 
 
+def test_copy_to(cnxn):
+    # Test copy_to with a full command, including a subquery.
+    cnxn.execute("create table t1(a int, b text)")
+    cnxn.execute("insert into t1 values (1, 'one'), (2, 'two'), (3, 'three')")
+
+    with tempfile.NamedTemporaryFile(mode='w', encoding='utf8') as tf:
+        # Use a subquery to only copy rows where a > 1
+        count = cnxn.copy_to('copy (select * from t1 where a > 1 order by a) to stdout csv header', tf)
+        assert count == 2
+
+        tf.flush()
+        with open(tf.name, mode='r', encoding='utf8') as fd:
+            reader = csv.reader(fd)
+            rows = list(reader)
+            assert rows == [['a', 'b'], ['2', 'two'], ['3', 'three']]
+
+
+def test_copy_to_table(cnxn):
+    # Test copy_to with a simple table copy (no subquery).
+    cnxn.execute("create table t1(a int, b text)")
+    cnxn.execute("insert into t1 values (1, 'one'), (2, 'two')")
+
+    with tempfile.NamedTemporaryFile(mode='w', encoding='utf8') as tf:
+        count = cnxn.copy_to('copy t1 to stdout csv', tf)
+        assert count == 2
+
+        tf.flush()
+        with open(tf.name, mode='r', encoding='utf8') as fd:
+            reader = csv.reader(fd)
+            rows = list(reader)
+            assert rows == [['1', 'one'], ['2', 'two']]
+
+
 #
 # copy from
 #
@@ -490,16 +523,20 @@ def test_money(cnxn):
 # parses the values we pass as strings before we even get to pglib.
 
 
-@pytest.mark.skip('LC_ALL locale does not exist')
 def test_decimal_german(cnxn):
-    locale.setlocale(locale.LC_ALL, 'de_DE')
+    try:
+        locale.setlocale(locale.LC_ALL, 'de_DE.utf8')
+    except locale.Error:
+        pytest.skip('de_DE.utf8 locale not available')
     values = [Decimal(s) for s in ['-3.0000000', '123456.7890']]
     _test_type(cnxn, 'decimal(100,7)', values)
 
 
-@pytest.mark.skip('LC_ALL locale does not exist')
 def test_money_german(cnxn):
-    locale.setlocale(locale.LC_ALL, 'de_DE')
+    try:
+        locale.setlocale(locale.LC_ALL, 'de_DE.utf8')
+    except locale.Error:
+        pytest.skip('de_DE.utf8 locale not available')
     values = [Decimal(s) for s in ['1.23', '0.0', '123.45', '-12.34']]
     _test_type(cnxn, 'money', values, check_comparison=False)
 
@@ -1275,3 +1312,40 @@ def test_large_insert(cnxn):
     query = (Path(__file__).parent / 'large-insert.sql').read_text(encoding='utf8')
     print('-' * 40)
     cnxn.execute(query)
+
+
+def test_terminated_connection_error_message():
+    """
+    Verify that when a connection is terminated, we get a meaningful error
+    message from libpq instead of a generic "Fatal error".
+
+    This tests the fix for the case where PQexecParams returns NULL.
+    """
+    # Create the connection we'll terminate
+    target = pglib.connect(CONNINFO)
+    target_pid = target.pid
+
+    # Use a separate connection to terminate the target
+    killer = pglib.connect(CONNINFO)
+    killer.execute("select pg_terminate_backend($1)", target_pid)
+    killer.close()
+
+    # Give PostgreSQL a moment to process the termination
+    sleep(0.1)
+
+    # Now try to execute on the terminated connection
+    with pytest.raises(pglib.Error) as exc_info:
+        target.execute("select 1")
+
+    # The error message should NOT be the generic "Fatal error"
+    # It should contain something meaningful from libpq
+    error_msg = str(exc_info.value)
+    assert "Fatal error" not in error_msg, \
+        f"Expected meaningful error message, got generic 'Fatal error': {error_msg}"
+
+    # Should contain some indication of connection issue
+    assert any(phrase in error_msg.lower() for phrase in
+               ["terminat", "connection", "server", "closed"]), \
+        f"Error message doesn't indicate connection problem: {error_msg}"
+
+    target.close()