Merge pull request #13 from rchodava/issue-12

Allow creating DB clients with just a connection URL, and no username/password
rchodava · Mar 13, 2016 · ee078ce · ee078ce
2 parents 4922857 + c0dbbbf
commit ee078ce
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/core/src/main/java/org/chodavarapu/datamill/db/DatabaseClient.java b/core/src/main/java/org/chodavarapu/datamill/db/DatabaseClient.java
@@ -33,6 +33,10 @@ public DatabaseClient(DataSource dataSource) {
         this.password = null;
     }
 
+    public DatabaseClient(String url) {
+        this(url, null, null);
+    }
+
     public DatabaseClient(String url, String username, String password) {
         this.dataSource = null;
 
@@ -46,7 +50,7 @@ private Database getDatabase() {
             if (dataSource != null) {
                 connectionProvider = new DelegatingConnectionProvider(new ConnectionProviderFromDataSource(dataSource));
                 database = Database.from(connectionProvider);
-            } else if (url != null && username != null && password != null) {
+            } else if (url != null) {
                 connectionProvider = new DelegatingConnectionProvider(new ConnectionProviderFromUrl(url, username, password));
                 database = Database.from(connectionProvider);
             }