fix PSQL schema generation in FQN

cdapio · Jul 3, 2023 · f2c1092 · f2c1092
1 parent 94ec33f
commit f2c1092
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/database-plugins/src/main/java/io/cdap/plugin/db/common/FQNGenerator.java b/database-plugins/src/main/java/io/cdap/plugin/db/common/FQNGenerator.java
@@ -50,8 +50,8 @@ private static String getPostgresqlSchema(String url) {
      */
     String dbSchema;
     int offset =  0;
-    int startIndex = url.indexOf("connectionSchema=");
-    offset = 17;
+    int startIndex = url.indexOf("currentSchema=");
+    offset = 14;
     if (startIndex == -1) {
       startIndex = url.indexOf("searchpath=");
       offset = 11;

diff --git a/database-plugins/src/test/java/io/cdap/plugin/db/batch/source/DBSourceTestRun.java b/database-plugins/src/test/java/io/cdap/plugin/db/batch/source/DBSourceTestRun.java
@@ -506,7 +506,7 @@ public void testPostgresqlFQN() throws Exception {
     // Testcases consist of Connection URL, Table Name, Expected FQN String
     String[][] testCases  = {{"jdbc:postgresql://34.35.36.37/test?user=user&password=secret&ssl=true",
                               "table1", "postgresql://34.35.36.37:5432/test.public.table1"},
-                            {"jdbc:postgresql://localhost/test?connectionSchema=schema",
+                            {"jdbc:postgresql://localhost/test?currentSchema=schema",
                               "table2", "postgresql://localhost:5432/test.schema.table2"},
                             {"jdbc:postgresql://localhost/test?searchpath=schema",
                               "table3", "postgresql://localhost:5432/test.schema.table3"}};

diff --git a/pom.xml b/pom.xml
@@ -102,7 +102,7 @@
     <commons-lang-version>2.6</commons-lang-version>
     <commons-lang3-version>3.5</commons-lang3-version>
     <commons-collections.version>3.2.2</commons-collections.version>
-    <cdap.version>6.9.0-SNAPSHOT</cdap.version>
+    <cdap.version>6.9.1</cdap.version>
     <datastax.version>2.0.5</datastax.version>
     <dumbster.version>1.6</dumbster.version>
     <es.version>1.6.0</es.version>