git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Fix incorrect merge in ECPG code with DECLARE

author Michael Paquier <michael@paquier.xyz>

2021年8月25日 06:16:31 +0000 (15:16 +0900)

committer Michael Paquier <michael@paquier.xyz>

2021年8月25日 06:16:31 +0000 (15:16 +0900)

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

src/interfaces/ecpg/preproc/ecpg.header patch | blob | blame | history

diff --git a/src/interfaces/ecpg/preproc/ecpg.header b/src/interfaces/ecpg/preproc/ecpg.header

index df58f1535c097e5edf1c2dbfea48081af009185e..b8508a91238f9cd69e5b0ee414156d2383e62cb0 100644 (file)

--- 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);

This is the main PostgreSQL git repository.

RSS Atom