fix some tests

Signed-off-by: Tanzeel Khan <[email protected]>
babelfish-for-postgresql · Jan 13, 2025 · 22d336b · 22d336b
1 parent 22137d0
commit 22d336b
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 45 deletions.
diff --git a/test/JDBC/expected/BABEL-1444-vu-verify.out b/test/JDBC/expected/BABEL-1444-vu-verify.out
@@ -45,7 +45,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -77,7 +77,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-babel_1444_db1_dbo, "$user", sys, pg_catalog
+babel_1444_db1_dbo, babel_1444_db1_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -114,7 +114,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-babel_1444_db1_dbo, "$user", sys, pg_catalog
+babel_1444_db1_dbo, babel_1444_db1_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -147,7 +147,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -179,7 +179,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -212,7 +212,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;

diff --git a/test/JDBC/expected/BABEL-1444.out b/test/JDBC/expected/BABEL-1444.out
@@ -73,7 +73,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -105,7 +105,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-db1_dbo, "$user", sys, pg_catalog
+db1_dbo, db1_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -142,7 +142,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-db1_dbo, "$user", sys, pg_catalog
+db1_dbo, db1_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -175,7 +175,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -207,7 +207,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -240,7 +240,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -278,7 +278,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -310,7 +310,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-db1_dbo, "$user", sys, pg_catalog
+db1_dbo, db1_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -347,7 +347,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-db1_dbo, "$user", sys, pg_catalog
+db1_dbo, db1_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -380,7 +380,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -412,7 +412,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -445,7 +445,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;

diff --git a/test/JDBC/expected/BABEL-LOGIN-USER-EXT.out b/test/JDBC/expected/BABEL-LOGIN-USER-EXT.out
@@ -77,7 +77,7 @@ SELECT current_setting('search_path');
 go
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 
@@ -182,7 +182,7 @@ SELECT current_setting('search_path');
 go
 ~~START~~
 text
-master_sch2, "$user", sys, pg_catalog
+master_sch2, master_dbo, sys, pg_catalog
 ~~END~~
 
 

diff --git a/test/JDBC/expected/BABEL-LOGIN-vu-verify.out b/test/JDBC/expected/BABEL-LOGIN-vu-verify.out
@@ -23,7 +23,7 @@ SELECT current_setting('search_path');
 go
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 
@@ -117,7 +117,7 @@ SELECT current_setting('search_path');
 go
 ~~START~~
 text
-master_babel_login_vu_prepare_sch, "$user", sys, pg_catalog
+master_babel_login_vu_prepare_sch, master_babel_login_vu_prepare_dbo, sys, pg_catalog
 ~~END~~
 
 

diff --git a/test/JDBC/expected/BABEL_4442.out b/test/JDBC/expected/BABEL_4442.out
@@ -80,15 +80,15 @@ SELECT babel_4442_f(), current_setting('search_path'), babel_4442_s1.babel_4442_
 GO
 ~~START~~
 int#!#text#!#int#!#text#!#int#!#int#!#text#!#int
-1#!#master_dbo, "$user", sys, pg_catalog#!#2#!#master_dbo, "$user", sys, pg_catalog#!#3#!#1#!#master_dbo, "$user", sys, pg_catalog#!#1
+1#!#master_dbo, master_dbo, sys, pg_catalog#!#2#!#master_dbo, master_dbo, sys, pg_catalog#!#3#!#1#!#master_dbo, master_dbo, sys, pg_catalog#!#1
 ~~END~~
 
 
 SELECT current_setting('search_path')
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 
@@ -98,7 +98,7 @@ SELECT current_setting('search_path')
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT babel_4442_s1.babel_4442_f(), babel_4442_s2.babel_4442_f(), * FROM babel_4442_t
@@ -112,7 +112,7 @@ SELECT current_setting('search_path')
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT babel_4442_s1.babel_4442_f(), babel_4442_s2.babel_4442_f(), * FROM babel_4442_t
@@ -129,7 +129,7 @@ SELECT current_setting('search_path')
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 
@@ -139,7 +139,7 @@ SELECT current_setting('search_path')
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT babel_4442_s1.babel_4442_f(), babel_4442_s2.babel_4442_f(), * FROM babel_4442_t
@@ -153,7 +153,7 @@ SELECT current_setting('search_path')
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT babel_4442_s1.babel_4442_f(), babel_4442_s2.babel_4442_f(), * FROM babel_4442_t
@@ -170,7 +170,7 @@ SELECT current_setting('search_path')
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 

diff --git a/test/JDBC/expected/babel_219.out b/test/JDBC/expected/babel_219.out
@@ -22,7 +22,7 @@ select set_config('search_path', current_setting('search_path') + ', pg_catalog'
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog, pg_catalog
 ~~END~~
 
 -- Set tsql dialet so the fix for BABEL-219 can kick in

diff --git a/test/JDBC/expected/single_db/BABEL-1444.out b/test/JDBC/expected/single_db/BABEL-1444.out
@@ -73,7 +73,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -105,7 +105,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-dbo, "$user", sys, pg_catalog
+dbo, dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -142,7 +142,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-dbo, "$user", sys, pg_catalog
+dbo, dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -175,7 +175,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -207,7 +207,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -240,7 +240,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -278,7 +278,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -310,7 +310,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-dbo, "$user", sys, pg_catalog
+dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -347,7 +347,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-dbo, "$user", sys, pg_catalog
+dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -380,7 +380,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -412,7 +412,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;
@@ -445,7 +445,7 @@ SELECT current_setting('search_path');
 GO
 ~~START~~
 text
-master_dbo, "$user", sys, pg_catalog
+master_dbo, master_dbo, sys, pg_catalog
 ~~END~~
 
 SELECT session_user, current_user, user;