Changeset 2673

Timestamp:

03/08/10 13:26:38 (2 years ago)

Author:

mswertz

Message:

Added constructor from MolgenisOptions?

File:

• molgenis/3.3/src/org/molgenis/framework/db/jdbc/JDBCDatabase.java (modified) (2 diffs)

molgenis/3.3/src/org/molgenis/framework/db/jdbc/JDBCDatabase.java

@@ -21 +21 @@
 import org.apache.commons.dbcp.BasicDataSource;
 import org.apache.log4j.Logger;
-import org.molgenis.framework.db.JoinQuery;
+import org.molgenis.MolgenisOptions;
 import org.molgenis.framework.db.Database;
 import org.molgenis.framework.db.DatabaseException;
+import org.molgenis.framework.db.JoinQuery;
 import org.molgenis.framework.db.Query;
 import org.molgenis.framework.db.QueryImp;
@@ -104 +105 @@
         }
 
+        public JDBCDatabase(MolgenisOptions options)
+        {
+                BasicDataSource dSource = new BasicDataSource();
+                dSource.setDriverClassName(options.db_driver);
+                dSource.setUsername(options.db_user);
+                dSource.setPassword(options.db_password);
+                dSource.setUrl(options.db_uri);
+
+                this.source = new SimpleDataSourceWrapper(dSource);
+
+                File file_source = new File(options.db_filepath);
+                this.fileSource = file_source;
+                
+                logger.debug("JDBCDatabase(uri="+options.db_uri+") created");
+        }
+
         public JDBCDatabase(Properties p)
         {