Fix incorrect merge in ECPG code with DECLARE

michaelpq · michaelpq · commit 1387925a488e · 2021-08-25T15:16:31.000+09:00
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
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -594,7 +594,6 @@ check_declared_list(const char *name)`
`594`	`594`	`continue;`
`595`	`595`	`if (strcmp(name, ptr -> name) == 0)`
`596`	`596`	`{`
`597`		`- if (connection)`
`598`	`597`	`if (connection && strcmp(ptr->connection, connection) != 0)`
`599`	`598`	`mmerror(PARSE_ERROR, ET_WARNING, "connection %s is overwritten with %s by DECLARE statement %s", connection, ptr->connection, name);`
`600`	`599`	`connection = mm_strdup(ptr -> connection);`