Fix libpq example programs

When these programs call pg_catalog.set_config, they need to check for
PGRES_TUPLES_OK instead of PGRES_COMMAND_OK.  Fix for
5770172cb0c9df9e6ce27c507b449557e5b45124.

Reported-by: Ideriha, Takeshi <ideriha.takeshi@jp.fujitsu.com>

diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 515bcb67794d61a2ec05de1ac0c4b6ac78eea7fd..d67212b8311d249663cf87762dc0c2f0e0746703 100644 (file)
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -8440,7 +8440,7 @@ main(int argc, char **argv)
     /* Set always-secure search path, so malicous users can't take control. */
     res = PQexec(conn,
                  "SELECT pg_catalog.set_config('search_path', '', false)");
-    if (PQresultStatus(res) != PGRES_COMMAND_OK)
+    if (PQresultStatus(res) != PGRES_TUPLES_OK)
     {
         fprintf(stderr, "SET failed: %s", PQerrorMessage(conn));
         PQclear(res);
@@ -8610,7 +8610,7 @@ main(int argc, char **argv)
     /* Set always-secure search path, so malicous users can't take control. */
     res = PQexec(conn,
                  "SELECT pg_catalog.set_config('search_path', '', false)");
-    if (PQresultStatus(res) != PGRES_COMMAND_OK)
+    if (PQresultStatus(res) != PGRES_TUPLES_OK)
     {
         fprintf(stderr, "SET failed: %s", PQerrorMessage(conn));
         PQclear(res);

diff --git a/doc/src/sgml/lobj.sgml b/doc/src/sgml/lobj.sgml
index 771795ae668cf43d9b4df78d370a06769a7516a6..f56aeebddb25a6a0d1777137977983388b3d6d3d 100644 (file)
--- a/doc/src/sgml/lobj.sgml
+++ b/doc/src/sgml/lobj.sgml
@@ -936,7 +936,7 @@ main(int argc, char **argv)
     /* Set always-secure search path, so malicous users can't take control. */
     res = PQexec(conn,
                  "SELECT pg_catalog.set_config('search_path', '', false)");
-    if (PQresultStatus(res) != PGRES_COMMAND_OK)
+    if (PQresultStatus(res) != PGRES_TUPLES_OK)
     {
         fprintf(stderr, "SET failed: %s", PQerrorMessage(conn));
         PQclear(res);

diff --git a/src/test/examples/testlibpq.c b/src/test/examples/testlibpq.c
index 92a05e53093ee88c819610f727e50542aa91d8c7..d9c6c4587d4584125be690a0b3021902c9dad0e2 100644 (file)
--- a/src/test/examples/testlibpq.c
+++ b/src/test/examples/testlibpq.c
@@ -51,7 +51,7 @@ main(int argc, char **argv)
        /* Set always-secure search path, so malicous users can't take control. */
        res = PQexec(conn,
                                 "SELECT pg_catalog.set_config('search_path', '', false)");
-       if (PQresultStatus(res) != PGRES_COMMAND_OK)
+       if (PQresultStatus(res) != PGRES_TUPLES_OK)
        {
                fprintf(stderr, "SET failed: %s", PQerrorMessage(conn));
                PQclear(res);

diff --git a/src/test/examples/testlibpq2.c b/src/test/examples/testlibpq2.c
index 76787fe010b8ed942f5321c2583a04326aae43f9..62ecd68b55e39799d27789a4d980799fbcb604cb 100644 (file)
--- a/src/test/examples/testlibpq2.c
+++ b/src/test/examples/testlibpq2.c
@@ -80,7 +80,7 @@ main(int argc, char **argv)
        /* Set always-secure search path, so malicous users can't take control. */
        res = PQexec(conn,
                                 "SELECT pg_catalog.set_config('search_path', '', false)");
-       if (PQresultStatus(res) != PGRES_COMMAND_OK)
+       if (PQresultStatus(res) != PGRES_TUPLES_OK)
        {
                fprintf(stderr, "SET failed: %s", PQerrorMessage(conn));
                PQclear(res);

diff --git a/src/test/examples/testlibpq4.c b/src/test/examples/testlibpq4.c
index a20f6249b4eeb3dda9ebd17b35a98d88c6051e57..6fcbdda2fa7d62e115eac1dfd0d0c0fc130c1a95 100644 (file)
--- a/src/test/examples/testlibpq4.c
+++ b/src/test/examples/testlibpq4.c
@@ -37,7 +37,7 @@ check_prepare_conn(PGconn *conn, const char *dbName)
        /* Set always-secure search path, so malicous users can't take control. */
        res = PQexec(conn,
                                 "SELECT pg_catalog.set_config('search_path', '', false)");
-       if (PQresultStatus(res) != PGRES_COMMAND_OK)
+       if (PQresultStatus(res) != PGRES_TUPLES_OK)
        {
                fprintf(stderr, "SET failed: %s", PQerrorMessage(conn));
                PQclear(res);

diff --git a/src/test/examples/testlo.c b/src/test/examples/testlo.c
index be5c72b9a67ef82a2462f853f68b5369f7d87913..8d8fb494f97ab47bbafede41d4f64395a4989cab 100644 (file)
--- a/src/test/examples/testlo.c
+++ b/src/test/examples/testlo.c
@@ -235,7 +235,7 @@ main(int argc, char **argv)
        /* Set always-secure search path, so malicous users can't take control. */
        res = PQexec(conn,
                                 "SELECT pg_catalog.set_config('search_path', '', false)");
-       if (PQresultStatus(res) != PGRES_COMMAND_OK)
+       if (PQresultStatus(res) != PGRES_TUPLES_OK)
        {
                fprintf(stderr, "SET failed: %s", PQerrorMessage(conn));
                PQclear(res);

diff --git a/src/test/examples/testlo64.c b/src/test/examples/testlo64.c
index 39ba009c52355f3f212c43df36592af79f769e09..85da06a640eae2f745e7cb948dfb6155ef88d0b0 100644 (file)
--- a/src/test/examples/testlo64.c
+++ b/src/test/examples/testlo64.c
@@ -259,7 +259,7 @@ main(int argc, char **argv)
        /* Set always-secure search path, so malicous users can't take control. */
        res = PQexec(conn,
                                 "SELECT pg_catalog.set_config('search_path', '', false)");
-       if (PQresultStatus(res) != PGRES_COMMAND_OK)
+       if (PQresultStatus(res) != PGRES_TUPLES_OK)
        {
                fprintf(stderr, "SET failed: %s", PQerrorMessage(conn));
                PQclear(res);