summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Paquier <michael@paquier.xyz>2021-08-25 15:16:55 +0900
committerMichael Paquier <michael@paquier.xyz>2021-08-25 15:16:55 +0900
commit8ab3452df8d5ff26cf52c089b986256b0c02d555 (patch)
treea5b39219f330296e600dae363d3007f25f746fc1 /src
parent9d7a80ce0185bd0c38bd973638bb7e9a854cf9f8 (diff)
Fix incorrect merge in ECPG code with DECLARE
The same condition was repeated twice when comparing the connection used by existing declared statement with the one coming from a fresh DECLARE statement. This had no consequences, but let's keep the code clean. Oversight in f576de1. Author: Shenhao Wang Discussion: https://postgr.es/m/OSBPR01MB42149653BC0AB0A49D23C1B8F2C69@OSBPR01MB4214.jpnprd01.prod.outlook.com Backpatch-through: 14
Diffstat (limited to 'src')
-rw-r--r--src/interfaces/ecpg/preproc/ecpg.header1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/interfaces/ecpg/preproc/ecpg.header b/src/interfaces/ecpg/preproc/ecpg.header
index df58f1535c0..b8508a91238 100644
--- a/src/interfaces/ecpg/preproc/ecpg.header
+++ b/src/interfaces/ecpg/preproc/ecpg.header
@@ -594,7 +594,6 @@ check_declared_list(const char *name)
continue;
if (strcmp(name, ptr -> name) == 0)
{
- if (connection)
if (connection && strcmp(ptr->connection, connection) != 0)
mmerror(PARSE_ERROR, ET_WARNING, "connection %s is overwritten with %s by DECLARE statement %s", connection, ptr->connection, name);
connection = mm_strdup(ptr -> connection);