From 7cf8a5c302735d193dcf901b87e03e324903c632 Mon Sep 17 00:00:00 2001 From: Simon Riggs Date: Mon, 2 Apr 2018 21:34:15 +0100 Subject: Revert "Modified files for MERGE" This reverts commit 354f13855e6381d288dfaa52bcd4f2cb0fd4a5eb. --- src/interfaces/libpq/fe-exec.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/interfaces/libpq/fe-exec.c') diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c index a432636322b..4c0114c514d 100644 --- a/src/interfaces/libpq/fe-exec.c +++ b/src/interfaces/libpq/fe-exec.c @@ -3055,9 +3055,9 @@ PQoidValue(const PGresult *res) /* * PQcmdTuples - - * If the last command was INSERT/UPDATE/DELETE/MERGE/MOVE/FETCH/COPY, - * return a string containing the number of inserted/affected tuples. - * If not, return "". + * If the last command was INSERT/UPDATE/DELETE/MOVE/FETCH/COPY, return + * a string containing the number of inserted/affected tuples. If not, + * return "". * * XXX: this should probably return an int */ @@ -3084,8 +3084,7 @@ PQcmdTuples(PGresult *res) strncmp(res->cmdStatus, "DELETE ", 7) == 0 || strncmp(res->cmdStatus, "UPDATE ", 7) == 0) p = res->cmdStatus + 7; - else if (strncmp(res->cmdStatus, "FETCH ", 6) == 0 || - strncmp(res->cmdStatus, "MERGE ", 6) == 0) + else if (strncmp(res->cmdStatus, "FETCH ", 6) == 0) p = res->cmdStatus + 6; else if (strncmp(res->cmdStatus, "MOVE ", 5) == 0 || strncmp(res->cmdStatus, "COPY ", 5) == 0) -- cgit v1.2.3