Skip to content

Commit d90d653

Browse files
authored
Add Databricks profile (#2339)
* Create new webapi-databricks profile * Check for spark and databricks connection string info
1 parent f258186 commit d90d653

3 files changed

Lines changed: 14 additions & 2 deletions

File tree

pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1482,6 +1482,17 @@
14821482
</plugins>
14831483
</build>
14841484
</profile>
1485+
<profile>
1486+
<id>webapi-databricks</id>
1487+
<dependencies>
1488+
<dependency>
1489+
<groupId>com.databricks</groupId>
1490+
<artifactId>databricks-jdbc</artifactId>
1491+
<version>2.6.34</version>
1492+
<scope>runtime</scope>
1493+
</dependency>
1494+
</dependencies>
1495+
</profile>
14851496
<profile>
14861497
<id>webapi-bigquery</id>
14871498
<properties>

src/main/java/org/ohdsi/webapi/DataAccessConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public DataSource primaryDataSource() {
8282
//note autocommit defaults vary across vendors. use provided @Autowired TransactionTemplate
8383

8484
String[] supportedDrivers;
85-
supportedDrivers = new String[]{"org.postgresql.Driver", "com.microsoft.sqlserver.jdbc.SQLServerDriver", "oracle.jdbc.driver.OracleDriver", "com.amazon.redshift.jdbc.Driver", "com.cloudera.impala.jdbc.Driver", "net.starschema.clouddb.jdbc.BQDriver", "org.netezza.Driver", "com.simba.googlebigquery.jdbc42.Driver", "org.apache.hive.jdbc.HiveDriver", "com.simba.spark.jdbc.Driver", "net.snowflake.client.jdbc.SnowflakeDriver"};
85+
supportedDrivers = new String[]{"org.postgresql.Driver", "com.microsoft.sqlserver.jdbc.SQLServerDriver", "oracle.jdbc.driver.OracleDriver", "com.amazon.redshift.jdbc.Driver", "com.cloudera.impala.jdbc.Driver", "net.starschema.clouddb.jdbc.BQDriver", "org.netezza.Driver", "com.simba.googlebigquery.jdbc42.Driver", "org.apache.hive.jdbc.HiveDriver", "com.simba.spark.jdbc.Driver", "net.snowflake.client.jdbc.SnowflakeDriver", "com.databricks.client.jdbc.Driver"};
8686
for (String driverName : supportedDrivers) {
8787
try {
8888
Class.forName(driverName);

src/main/java/org/ohdsi/webapi/util/CancelableJdbcTemplate.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ public int[] doInStatement(Statement stmt) throws SQLException, DataAccessExcept
7878
}
7979
else {
8080
for (int i = 0; i < sql.length; i++) {
81-
if (stmt.getConnection().getMetaData().getURL().startsWith("jdbc:spark")) {
81+
String connectionString = stmt.getConnection().getMetaData().getURL();
82+
if (connectionString.startsWith("jdbc:spark") || connectionString.startsWith("jdbc:databricks")) {
8283
this.currSql = BigQuerySparkTranslate.sparkHandleInsert(sql[i], stmt.getConnection());
8384
if (this.currSql == "" || this.currSql.isEmpty() || this.currSql == null) {
8485
rowsAffected[i] = -1;

0 commit comments

Comments
 (0)