midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed some javadoc. 

* Minor refactoring, put all database discovery code in one place (Database.java)
This commit is contained in:
Heng Sin Low 2006-11-28 01:35:35 +00:00
parent 6119ab9a84
commit 6e3dc21754
2 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
dbPort/src/org/compiere/db/Database.java
View File

@ -16,6 +16,8 @@
*****************************************************************************/
package org.compiere.db;
import org.compiere.util.CLogger;
/**
* General Database Constants and Utilities
*
@ -24,6 +26,9 @@ package org.compiere.db;
*/
public class Database
{
/** Logger */
private static CLogger log = CLogger.getCLogger (Database.class);
/** Oracle ID */
public static String DB_ORACLE = "Oracle";
/** IBM DB/2 ID */
@ -34,11 +39,8 @@ public class Database
public static String DB_MSSQLServer = "SQLServer";
/** PostgreSQL ID */
public static String DB_POSTGRESQL = "PostgreSQL";
// begin vpj-c e-evolution 11/30/2005 EDB
/** Enterprise DB */
//public static String DB_EDB = "EnterpriseDB";
// end vpj-c e-evolution 11/30/2005 EDB
/** Supported Databases */
public static String[] DB_NAMES = new String[] {
@ -46,10 +48,8 @@ public class Database
,DB_DB2
// ,DB_DERBY
// ,DB_MSSQLServer
// begin vpj-c e-evolution 02/08/205 PostgreSQL
,DB_POSTGRESQL
// ,DB_EDB
// end e-evolution 02/08/2005 PostgreSQL
};
/** Database Classes */
@ -58,17 +58,15 @@ public class Database
,DB_DB2.class
// ,DB_Derby.class
// ,DB_MSSQLServer.class
//begin vpj-c e-evolution 02/08/2005 PostgreSQL
,DB_PostgreSQL.class
// ,DB_EDB.class
//end e-evolution 02/08/205 PostgreSQL
};
/** Connection Timeout in seconds */
public static int CONNECTION_TIMEOUT = 10;
/**
* Get Database
* Get Database by database Id.
* @return database
*/
public static AdempiereDatabase getDatabase (String type)
@ -87,4 +85,30 @@ public class Database
return db;
}
/**
* Get Database Driver by url string.
* Access to database specific functionality.
* @param URL JDBC connection url
* @return Adempiere Database Driver
*/
public static AdempiereDatabase getDatabaseFromURL(String url)
{
if (url == null)
{
log.severe("No Database URL");
return null;
}
if (url.indexOf("oracle") != -1)
return new DB_Oracle();
// if (URL.indexOf("derby") != -1)
// return new DB_Derby();
if (url.indexOf("db2") != -1)
return new DB_DB2();
if (url.indexOf("postgresql") != -1)
return new DB_DB2();
log.severe("No Database for " + url);
return null;
}
} // Database

22
dbPort/src/org/compiere/util/DB.java
View File

@ -238,6 +238,10 @@ public final class DB
// Trace.printStack();
} // setDBTarget
/**
* Connect to database and initialise all connections.
* @return True if success, false otherwise
*/
public static boolean connect() {
boolean success =false;
try
@ -506,23 +510,7 @@ public final class DB
*/
public static AdempiereDatabase getDatabase(String URL)
{
if (URL == null)
{
log.severe("No Database URL");
return null;
}
if (URL.indexOf("oracle") != -1)
return new DB_Oracle();
// if (URL.indexOf("derby") != -1)
// return new DB_Derby();
if (URL.indexOf("db2") != -1)
return new DB_DB2();
//begin e-evolution postgresql
if (URL.indexOf("postgresql") != -1)
return new DB_DB2();
//end e-evolution postgresql
log.severe("No Database for " + URL);
return null;
return Database.getDatabaseFromURL(URL);
} // getDatabase
/**