From 81a530a65eb867a366828daa7a8757727214ecad Mon Sep 17 00:00:00 2001
From: Tom Lane
Date: Tue, 28 Dec 2010 11:02:10 -0500
Subject: Fix ill-advised placement of PGRES_COPY_BOTH enum value.
It must be added at the end of the ExecStatusType enum to avoid ABI
breakage compared to previous libpq versions. Noted by Magnus.
---
doc/src/sgml/libpq.sgml | 20 ++++++++++----------
src/interfaces/libpq/fe-exec.c | 4 ++--
src/interfaces/libpq/libpq-fe.h | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 7e86859e252..da7b820db6d 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -2196,16 +2196,6 @@ ExecStatusType PQresultStatus(const PGresult *res);
-
- PGRES_COPY_BOTH
-
-
- Copy In/Out (to and from server) data transfer started. This is
- currently used only for streaming replication.
-
-
-
-
PGRES_BAD_RESPONSE
@@ -2232,6 +2222,16 @@ ExecStatusType PQresultStatus(const PGresult *res);
+
+
+ PGRES_COPY_BOTH
+
+
+ Copy In/Out (to and from server) data transfer started. This is
+ currently used only for streaming replication.
+
+
+
If the result status is PGRES_TUPLES_OK, then
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index 9858faeaa64..7bb7fbe557e 100644
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -35,10 +35,10 @@ char *const pgresStatus[] = {
"PGRES_TUPLES_OK",
"PGRES_COPY_OUT",
"PGRES_COPY_IN",
- "PGRES_COPY_BOTH",
"PGRES_BAD_RESPONSE",
"PGRES_NONFATAL_ERROR",
- "PGRES_FATAL_ERROR"
+ "PGRES_FATAL_ERROR",
+ "PGRES_COPY_BOTH"
};
/*
diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
index 6075ea8151e..4eea115f378 100644
--- a/src/interfaces/libpq/libpq-fe.h
+++ b/src/interfaces/libpq/libpq-fe.h
@@ -85,11 +85,11 @@ typedef enum
* contains the result tuples */
PGRES_COPY_OUT, /* Copy Out data transfer in progress */
PGRES_COPY_IN, /* Copy In data transfer in progress */
- PGRES_COPY_BOTH, /* Copy In/Out data transfer in progress */
PGRES_BAD_RESPONSE, /* an unexpected response was recv'd from the
* backend */
PGRES_NONFATAL_ERROR, /* notice or warning message */
- PGRES_FATAL_ERROR /* query failed */
+ PGRES_FATAL_ERROR, /* query failed */
+ PGRES_COPY_BOTH /* Copy In/Out data transfer in progress */
} ExecStatusType;
typedef enum
--
cgit v1.2.3