You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gobblin.apache.org by ab...@apache.org on 2017/07/29 02:41:44 UTC
[1/3] incubator-gobblin git commit: updating connection url for
sqlserver with database name
Repository: incubator-gobblin
Updated Branches:
refs/heads/master cec91e610 -> a889431e0
updating connection url for sqlserver with database name
Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/d0fb9ad3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/d0fb9ad3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/d0fb9ad3
Branch: refs/heads/master
Commit: d0fb9ad39387a58699b14a16e0f3799bca782d36
Parents: 817db30
Author: Arjun <ab...@linkedin.com>
Authored: Tue Jul 25 11:40:01 2017 -0700
Committer: Arjun <ab...@linkedin.com>
Committed: Tue Jul 25 11:40:01 2017 -0700
----------------------------------------------------------------------
.../src/main/java/gobblin/source/jdbc/SqlServerExtractor.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/d0fb9ad3/gobblin-modules/gobblin-sql/src/main/java/gobblin/source/jdbc/SqlServerExtractor.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-sql/src/main/java/gobblin/source/jdbc/SqlServerExtractor.java b/gobblin-modules/gobblin-sql/src/main/java/gobblin/source/jdbc/SqlServerExtractor.java
index ebe8289..fa502d4 100644
--- a/gobblin-modules/gobblin-sql/src/main/java/gobblin/source/jdbc/SqlServerExtractor.java
+++ b/gobblin-modules/gobblin-sql/src/main/java/gobblin/source/jdbc/SqlServerExtractor.java
@@ -187,7 +187,8 @@ public class SqlServerExtractor extends JdbcExtractor {
public String getConnectionUrl() {
String host = this.workUnitState.getProp(ConfigurationKeys.SOURCE_CONN_HOST_NAME);
String port = this.workUnitState.getProp(ConfigurationKeys.SOURCE_CONN_PORT);
- String url = "jdbc:sqlserver://" + host.trim() + ":" + port;
+ String database = this.workUnitState.getProp(ConfigurationKeys.SOURCE_QUERYBASED_SCHEMA);
+ String url = "jdbc:sqlserver://" + host.trim() + ":" + port + ";databaseName=" + database.trim();
return url;
}
[2/3] incubator-gobblin git commit: updating connection url for
sqlserver with database name
Posted by ab...@apache.org.
updating connection url for sqlserver with database name
Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/35602e7b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/35602e7b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/35602e7b
Branch: refs/heads/master
Commit: 35602e7b8e7bf488eb77b36fe960e5fbccf71cef
Parents: d0fb9ad
Author: Arjun <ab...@linkedin.com>
Authored: Tue Jul 25 13:59:00 2017 -0700
Committer: Arjun <ab...@linkedin.com>
Committed: Tue Jul 25 13:59:00 2017 -0700
----------------------------------------------------------------------
.../src/main/java/gobblin/source/jdbc/SqlServerExtractor.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/35602e7b/gobblin-modules/gobblin-sql/src/main/java/gobblin/source/jdbc/SqlServerExtractor.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-sql/src/main/java/gobblin/source/jdbc/SqlServerExtractor.java b/gobblin-modules/gobblin-sql/src/main/java/gobblin/source/jdbc/SqlServerExtractor.java
index fa502d4..4a731e3 100644
--- a/gobblin-modules/gobblin-sql/src/main/java/gobblin/source/jdbc/SqlServerExtractor.java
+++ b/gobblin-modules/gobblin-sql/src/main/java/gobblin/source/jdbc/SqlServerExtractor.java
@@ -188,7 +188,8 @@ public class SqlServerExtractor extends JdbcExtractor {
String host = this.workUnitState.getProp(ConfigurationKeys.SOURCE_CONN_HOST_NAME);
String port = this.workUnitState.getProp(ConfigurationKeys.SOURCE_CONN_PORT);
String database = this.workUnitState.getProp(ConfigurationKeys.SOURCE_QUERYBASED_SCHEMA);
- String url = "jdbc:sqlserver://" + host.trim() + ":" + port + ";databaseName=" + database.trim();
+ String url = "jdbc:sqlserver://" + host.trim() + ":" + port +
+ (StringUtils.isEmpty(database) ? "" : (";databaseName=" + database.trim()));
return url;
}
[3/3] incubator-gobblin git commit: Merge pull request #2017 from
arjun4084346/jdbcURLfix
Posted by ab...@apache.org.
Merge pull request #2017 from arjun4084346/jdbcURLfix
Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/a889431e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/a889431e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/a889431e
Branch: refs/heads/master
Commit: a889431e0e61fa34cbff83532a3c3e1dc51140ac
Parents: cec91e6 35602e7
Author: Abhishek Tiwari <ab...@gmail.com>
Authored: Fri Jul 28 19:41:39 2017 -0700
Committer: Abhishek Tiwari <ab...@gmail.com>
Committed: Fri Jul 28 19:41:39 2017 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------