Commit9e76b4c

Michael Meskes

committed

And one more:

Connection identifier has to be unique

1 parent72ba3cb commit9e76b4cCopy full SHA for 9e76b4c

File tree

+14

-4

lines changed

+14

-4

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2050,5 +2050,6 @@ Fr Jul 28 11:00:51 CEST 2006`
`2050`	`2050`	`- Added more SoC changes by Joachim Wieland <joe@mcknight.de>:`
`2051`	`2051`	`- SHOW statement puts result into a variable`
`2052`	`2052`	`- COPY TO STDOUT works`
	`2053`	`+- Connection identifier has to be unique`
`2053`	`2054`	`- Set ecpg library version to 5.2.`
`2054`	`2055`	`- Set ecpg version to 4.2.1.`

Lines changed: 13 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.30 2006/06/21 11:38:07 meskes Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.31 2006/07/28 10:10:42 meskes Exp $ */`
`2`	`2`
`3`	`3`	`#definePOSTGRES_ECPG_INTERNAL`
`4`	`4`	`#include"postgres_fe.h"`
`@@ -295,12 +295,21 @@ ECPGconnect(int lineno, int c, const char name, const char user, const char *p`
`295`	`295`
`296`	`296`	`}`
`297`	`297`
`298`		`-if ((this= (structconnection*)ECPGalloc(sizeof(structconnection),lineno))==NULL)`
`299`		`-return false;`
`300`		`-`
`301`	`298`	`if (dbname==NULL&&connection_name==NULL)`
`302`	`299`	`connection_name="DEFAULT";`
`303`	`300`
	`301`	`+/* check if the identifier is unique */`
	`302`	`+if (ECPGget_connection(connection_name))`
	`303`	`+{`
	`304`	`+ECPGfree(dbname);`
	`305`	`+ECPGlog("connect: connection identifier %s is already in use\n",`
	`306`	`+connection_name);`
	`307`	`+return false;`
	`308`	`+}`
	`309`	`+`
	`310`	`+if ((this= (structconnection*)ECPGalloc(sizeof(structconnection),lineno))==NULL)`
	`311`	`+return false;`
	`312`	`+`
`304`	`313`	`if (dbname!=NULL)`
`305`	`314`	`{`
`306`	`315`	`/* get the detail information out of dbname */`

Comments

(0)