Setting the search_path from currentSchema property is done in startu…

…p packet (v3 protocol only)
alexismeneses · Nov 20, 2014 · 3c676cd · 3c676cd
1 parent 8d11432
commit 3c676cd
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/org/postgresql/core/v2/ConnectionFactoryImpl.java b/org/postgresql/core/v2/ConnectionFactoryImpl.java
@@ -490,5 +490,14 @@ else if (dbEncoding != null)
             sb.append("'");
             SetupQueryRunner.run(protoConnection, sb.toString(), false);
         }
+
+        String currentSchema = info.getProperty("currentSchema");
+        if (currentSchema != null)
+        {
+            StringBuffer sb = new StringBuffer("SET search_path = '");
+            Utils.appendEscapedLiteral(sb, appName, protoConnection.getStandardConformingStrings());
+            sb.append("'");
+            SetupQueryRunner.run(protoConnection, sb.toString(), false);
+        }
     }
 }
diff --git a/org/postgresql/core/v3/ConnectionFactoryImpl.java b/org/postgresql/core/v3/ConnectionFactoryImpl.java
@@ -185,6 +185,13 @@ else if ("require".equals(sslmode) || "verify-ca".equals(sslmode) || "verify-ful
                 // User has not explicitly told us that this is a 9.0+ server so stick to old default:
                 paramList.add(new String[] {"extra_float_digits", "2"});
             }
+
+            String currentSchema = info.getProperty("currentSchema");
+            if (currentSchema != null)
+            {
+                paramList.add(new String[] {"search_path", currentSchema});
+            }
+
             String[][] params = paramList.toArray(new String[][]{});
 
             sendStartupPacket(newStream, params, logger);

diff --git a/org/postgresql/jdbc2/AbstractJdbc2Connection.java b/org/postgresql/jdbc2/AbstractJdbc2Connection.java
@@ -270,12 +270,6 @@ else if (stringType.equalsIgnoreCase("varchar"))
         }
         this.disableColumnSanitiser = Boolean.valueOf(info.getProperty(""
                 + "disableColumnSanitiser", Boolean.FALSE.toString()));
-
-        String currentSchema = info.getProperty("currentSchema");
-        if (currentSchema != null)
-        {
-            setSchema(currentSchema);
-        }
     }
 
     private Set<Integer> getOidSet(String oidList) throws PSQLException {