Fixed parser and library to allow empty database names.

Streamlined connection name parsing.
Added Joachim's patch to shorten paths before diffing.

2 files changed, 20 insertions, 2 deletions

diff --git a/src/interfaces/ecpg/test/connect/test1.pgc.in b/src/interfaces/ecpg/test/connect/test1.pgc.in
index b2141d1c23..3962ff317a 100644
--- a/src/interfaces/ecpg/test/connect/test1.pgc.in
+++ b/src/interfaces/ecpg/test/connect/test1.pgc.in
@@ -26,14 +26,25 @@ exec sql end declare section;
 	exec sql connect to connectdb@localhost as main;
 	exec sql disconnect main;
 
+	exec sql connect to @localhost as main;
+	exec sql disconnect main;
+
 	exec sql connect to connectdb@localhost:@TEMP_PORT@ as main;
 	exec sql disconnect main;
 
+	exec sql connect to @localhost:@TEMP_PORT@ as main;
+	exec sql disconnect main;
+
 	exec sql connect to connectdb:@TEMP_PORT@ as main;
 	exec sql disconnect main;
 
+	exec sql connect to :@TEMP_PORT@ as main;
+	exec sql disconnect main;
+
 	exec sql connect to tcp:postgresql://localhost:@TEMP_PORT@/connectdb user connectuser identified by connectpw;
-	exec sql disconnect nonexistant;
+	exec sql disconnect;
+
+	exec sql connect to tcp:postgresql://localhost:@TEMP_PORT@/ user connectdb;
 	exec sql disconnect;
 
 	strcpy(pw, "connectpw");
diff --git a/src/interfaces/ecpg/test/connect/test5.pgc b/src/interfaces/ecpg/test/connect/test5.pgc
index 8601196bda..ae0199daf6 100644
--- a/src/interfaces/ecpg/test/connect/test5.pgc
+++ b/src/interfaces/ecpg/test/connect/test5.pgc
@@ -37,6 +37,9 @@ exec sql end declare section;
 	exec sql connect to 'connectdb' as main;
 	exec sql disconnect main;
 
+	exec sql connect to as main user connectdb;
+	exec sql disconnect main;
+
 	exec sql connect to connectdb as main user connectuser/connectdb;
 	exec sql disconnect main;
 
@@ -52,12 +55,16 @@ exec sql end declare section;
 	exec sql connect to "unix:postgresql://200.46.204.71/connectdb" as main user connectuser;
 	exec sql disconnect main;
 
-	exec sql disconnect nonexistant;
+	exec sql connect to unix:postgresql://localhost/ as main user connectdb;
+	exec sql disconnect main;
 
 	/* connect twice */
 	exec sql connect to connectdb as main;
 	exec sql connect to connectdb as main;
 	exec sql disconnect main;
 
+	/* not connected */
+	exec sql disconnect nonexistant;
+
 	return (0);
 }