aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2018-07-01 14:06:40 +0200
committerPeter Eisentraut <peter_e@gmx.net>2018-07-01 14:09:16 +0200
commitd5ad0e19d16b66f18b5be87d30dacc8204c238ce (patch)
treeeb3de629f9e59fcc14ab28da01204a82d37b3e4f /src
parentc91ac358b190cf51ec0334215987f6633f289544 (diff)
downloadpostgresql-d5ad0e19d16b66f18b5be87d30dacc8204c238ce.tar.gz
postgresql-d5ad0e19d16b66f18b5be87d30dacc8204c238ce.zip
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>
Diffstat (limited to 'src')
-rw-r--r--src/test/examples/testlibpq.c2
-rw-r--r--src/test/examples/testlibpq2.c2
-rw-r--r--src/test/examples/testlibpq4.c2
-rw-r--r--src/test/examples/testlo.c2
-rw-r--r--src/test/examples/testlo64.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/test/examples/testlibpq.c b/src/test/examples/testlibpq.c
index 92a05e53093..d9c6c4587d4 100644
--- 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 76787fe010b..62ecd68b55e 100644
--- 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 a20f6249b4e..6fcbdda2fa7 100644
--- 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 8a65f897cd7..cba115a3abf 100644
--- 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 5512107dfad..94a1d79a15d 100644
--- 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);