feat(postgresql config): remove requirement of schema

vesoft-inc · Jan 21, 2022 · 8bdff07 · 8bdff07
1 parent 761b7b9
commit 8bdff07
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 4 deletions.
diff --git a/exchange-common/src/main/scala/com/vesoft/exchange/common/config/Configs.scala b/exchange-common/src/main/scala/com/vesoft/exchange/common/config/Configs.scala
@@ -665,7 +665,6 @@ object Configs {
           config.getString("host"),
           config.getInt("port"),
           config.getString("database"),
-          config.getString("schema"),
           config.getString("table"),
           config.getString("user"),
           config.getString("password"),

diff --git a/exchange-common/src/main/scala/com/vesoft/exchange/common/config/SourceConfigs.scala b/exchange-common/src/main/scala/com/vesoft/exchange/common/config/SourceConfigs.scala
@@ -174,7 +174,6 @@ case class PostgresSQLSourceConfigEntry(override val category: SourceCategory.Va
                                         host: String,
                                         port: Int,
                                         database: String,
-                                        schema: String,
                                         table: String,
                                         user: String,
                                         password: String,

diff --git a/exchange-common/src/test/scala/com/vesoft/exchange/common/config/ConfigsSuite.scala b/exchange-common/src/test/scala/com/vesoft/exchange/common/config/ConfigsSuite.scala
@@ -165,7 +165,6 @@ class ConfigsSuite {
           assert(postgresql.port == 5432)
           assert(postgresql.user.equals("root"))
           assert(postgresql.password.equals("nebula"))
-          assert(postgresql.schema.equals("public"))
           assert(postgresql.database.equals("database"))
           assert(postgresql.table.equals("table"))
         }

diff --git a/...xchange_spark_3.0/src/main/scala/com/vesoft/nebula/exchange/reader/ServerBaseReader.scala b/...xchange_spark_3.0/src/main/scala/com/vesoft/nebula/exchange/reader/ServerBaseReader.scala
@@ -84,7 +84,7 @@ class PostgreSQLReader(override val session: SparkSession, postgreConfig: Postgr
     val df = session.read
       .format("jdbc")
       .option("url", url)
-      .option("dbtable", s"${postgreConfig.schema}.${postgreConfig.table}")
+      .option("dbtable", postgreConfig.table)
       .option("user", postgreConfig.user)
       .option("password", postgreConfig.password)
       .load()