Initial bigquery support. (#210)

* Beginning of bigquery support, adding the driver lookup to the webAPI initialization process.
OHDSI · Sep 12, 2017 · 91df6c1 · 91df6c1
1 parent f91c031
commit 91df6c1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -495,6 +495,6 @@
         <flyway.locations>classpath:db/migration/sqlserver</flyway.locations>
         <hibernate.dialect>org.hibernate.dialect.SQLServer2012Dialect</hibernate.dialect>
       </properties>
-    </profile>                      
+    </profile>
   </profiles>
 </project>
diff --git a/src/main/java/org/ohdsi/webapi/DataAccessConfig.java b/src/main/java/org/ohdsi/webapi/DataAccessConfig.java
@@ -63,7 +63,7 @@ public DataSource primaryDataSource() {
         //note autocommit defaults vary across vendors. use provided @Autowired TransactionTemplate
 
         String[] supportedDrivers;
-        supportedDrivers = new String[]{"org.postgresql.Driver", "com.microsoft.sqlserver.jdbc.SQLServerDriver", "oracle.jdbc.driver.OracleDriver", "com.amazon.redshift.jdbc41.Driver", "com.cloudera.impala.jdbc4.Driver"};
+        supportedDrivers = new String[]{"org.postgresql.Driver", "com.microsoft.sqlserver.jdbc.SQLServerDriver", "oracle.jdbc.driver.OracleDriver", "com.amazon.redshift.jdbc41.Driver", "com.cloudera.impala.jdbc4.Driver", "net.starschema.clouddb.jdbc.BQDriver"};
 
         for (String driverName : supportedDrivers) {
             try {

diff --git a/src/test/java/org/ohdsi/webapi/test/VocabularyServiceIT.java b/src/test/java/org/ohdsi/webapi/test/VocabularyServiceIT.java
@@ -24,6 +24,7 @@ public class VocabularyServiceIT extends WebApiIT {
     public void concept() {
         log.info("Testing concept endpoint");
         final ResponseEntity<String> entity = getRestTemplate().getForEntity(this.endpointConcept, String.class);
+        assertOK(entity);
     }
 
     @Test