From: Daniele Varrazzo Date: Sun, 10 Oct 2021 19:59:05 +0000 (+0200) Subject: Use constant name as return value for pipeline_status X-Git-Tag: 3.0~11^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7055a8194bb56e662eab5867a1b36515ee386bc7;p=thirdparty%2Fpsycopg.git Use constant name as return value for pipeline_status Also use the enum in test, without assuming OFF == 0 --- diff --git a/psycopg_c/psycopg_c/pq/pgconn.pyx b/psycopg_c/psycopg_c/pq/pgconn.pyx index fe23ebb3f..6c9039d84 100644 --- a/psycopg_c/psycopg_c/pq/pgconn.pyx +++ b/psycopg_c/psycopg_c/pq/pgconn.pyx @@ -543,7 +543,7 @@ cdef class PGconn: For libpq < 14.0, always return 0 (PQ_PIPELINE_OFF). """ if libpq.PG_VERSION_NUM < 140000: - return 0 + return libpq.PQ_PIPELINE_OFF cdef int status = libpq.PQpipelineStatus(self._pgconn_ptr) return status diff --git a/tests/pq/test_pipeline.py b/tests/pq/test_pipeline.py index 438aae3e7..a19333a95 100644 --- a/tests/pq/test_pipeline.py +++ b/tests/pq/test_pipeline.py @@ -18,7 +18,7 @@ def test_old_libpq(pgconn): @pytest.mark.libpq(">= 14") def test_work_in_progress(pgconn): assert not pgconn.nonblocking - assert not pgconn.pipeline_status + assert pgconn.pipeline_status == pq.PipelineStatus.OFF pgconn.enter_pipeline_mode() pgconn.send_query_params(b"select $1", [b"1"]) with pytest.raises( @@ -29,7 +29,7 @@ def test_work_in_progress(pgconn): @pytest.mark.libpq(">= 14") def test_multi_pipelines(pgconn): - assert not pgconn.pipeline_status + assert pgconn.pipeline_status == pq.PipelineStatus.OFF pgconn.enter_pipeline_mode() pgconn.send_query_params(b"select $1", [b"1"]) pgconn.pipeline_sync() @@ -83,7 +83,7 @@ def table(pgconn): @pytest.mark.libpq(">= 14") def test_pipeline_abort(pgconn, table): - assert not pgconn.pipeline_status + assert pgconn.pipeline_status == pq.PipelineStatus.OFF pgconn.enter_pipeline_mode() pgconn.send_query_params(b"insert into pipeline values ($1)", [b"1"]) pgconn.send_query_params(b"select no_such_function($1)", [b"1"])