Update of /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/fw/dialects
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv25348/test/src/net/sourceforge/squirrel_sql/fw/dialects
Modified Files:
dialectLiveTest.properties DialectLiveTestRunner.java
Log Message:
Setup more database types for testing the SQL produced by the
dialects for refactoring. Changed the way that database settings
are stored to give more granular control over which db is being
tested.
Index: DialectLiveTestRunner.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/fw/dialects/DialectLiveTestRunner.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DialectLiveTestRunner.java 22 Oct 2006 09:50:40 -0000 1.1
--- DialectLiveTestRunner.java 29 Oct 2006 11:22:57 -0000 1.2
***************
*** 5,9 ****
--- 5,12 ----
import java.sql.SQLException;
import java.sql.Statement;
+ import java.util.ArrayList;
+ import java.util.Iterator;
import java.util.ResourceBundle;
+ import java.util.StringTokenizer;
import net.sourceforge.squirrel_sql.client.ApplicationArguments;
***************
*** 23,27 ****
public class DialectLiveTestRunner {
! ISession[] sessions = null;
ResourceBundle bundle = null;
--- 26,30 ----
public class DialectLiveTestRunner {
! ArrayList sessions = new ArrayList();
ResourceBundle bundle = null;
***************
*** 35,63 ****
private void initSessions() throws Exception {
! String jdbcPropCount = bundle.getString("jdbcPropCount");
! int count = Integer.parseInt(jdbcPropCount);
! sessions = new ISession[count];
! for (int i=0; i < count; i++) {
! String url = bundle.getString("jdbcUrl_"+i);
! String user = bundle.getString("jdbcUser_"+i);
! String pass = bundle.getString("jdbcPass_"+i);
! String driver = bundle.getString("jdbcDriver_"+i);
! sessions[i] = new MockSession(driver, url, user, pass);
! }
}
private void runTests() throws Exception {
! for (int i = 0; i < sessions.length; i++) {
! ISession session = sessions[i];
HibernateDialect dialect = getDialect(session);
createTestTable(session);
TableColumnInfo firstCol =
getIntegerColumn("nullint", true, "0", "An int comment");
addColumn(session, firstCol);
! addColumn(session, getIntegerColumn("notnullint", false, "0", "An int comment"));
! addColumn(session, getVarcharColumn("nullvc", true, "defVal", "A varchar comment"));
! addColumn(session, getVarcharColumn("notnullvc", false, "defVal", "A varchar comment"));
if (dialect.supportsDropColumn()) {
dropColumn(session, firstCol);
}
}
--- 38,79 ----
private void initSessions() throws Exception {
! String dbsToTest = bundle.getString("dbsToTest");
! StringTokenizer st = new StringTokenizer(dbsToTest, ",");
! ArrayList dbs = new ArrayList();
! while (st.hasMoreTokens()) {
! String db = st.nextToken().trim();
! dbs.add(db);
! }
! for (Iterator iter = dbs.iterator(); iter.hasNext();) {
! String db = (String) iter.next();
! String url = bundle.getString(db+"_jdbcUrl");
! String user = bundle.getString(db+"_jdbcUser");
! String pass = bundle.getString(db+"_jdbcPass");
! String driver = bundle.getString(db+"_jdbcDriver");
! sessions.add(new MockSession(driver, url, user, pass));
! }
}
private void runTests() throws Exception {
!
! for (Iterator iter = sessions.iterator(); iter.hasNext();) {
! ISession session = (ISession) iter.next();
HibernateDialect dialect = getDialect(session);
createTestTable(session);
TableColumnInfo firstCol =
getIntegerColumn("nullint", true, "0", "An int comment");
+ TableColumnInfo secondCol =
+ getIntegerColumn("notnullint", false, "0", "An int comment");
+ TableColumnInfo thirdCol =
+ getVarcharColumn("nullvc", true, "defVal", "A varchar comment");
+ TableColumnInfo fourthCol =
+ getVarcharColumn("notnullvc", false, "defVal", "A varchar comment");
addColumn(session, firstCol);
! addColumn(session, secondCol);
! addColumn(session, thirdCol);
! addColumn(session, fourthCol);
if (dialect.supportsDropColumn()) {
dropColumn(session, firstCol);
+ dropColumn(session, secondCol);
}
}
***************
*** 70,74 ****
runSQL(session, dialect.getTableDropSQL("test", true));
} catch (SQLException e) {
! // Don't care if table doesn't exist
}
runSQL(session, "create table test ( mychar char(10))");
--- 86,90 ----
runSQL(session, dialect.getTableDropSQL("test", true));
} catch (SQLException e) {
! e.printStackTrace();
}
runSQL(session, "create table test ( mychar char(10))");
Index: dialectLiveTest.properties
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/fw/dialects/dialectLiveTest.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dialectLiveTest.properties 22 Oct 2006 09:50:40 -0000 1.1
--- dialectLiveTest.properties 29 Oct 2006 11:22:57 -0000 1.2
***************
*** 1,26 ****
! jdbcPropCount=4
# Daffodil
! jdbcUrl_0=jdbc:daffodilDB://127.0.0.1:3456/dbcopydest
! jdbcUser_0=dbcopy
! jdbcPass_0=password
! jdbcDriver_0=in.co.daffodil.db.rmi.RmiDaffodilDBDriver
# DB2
! jdbcUrl_1=jdbc:db2://localhost:50000/sample
! jdbcUser_1=dbcopy
! jdbcPass_1=password
! jdbcDriver_1=com.ibm.db2.jcc.DB2Driver
! # Frontbase
! jdbcUrl_2=jdbc:FrontBase://127.0.0.1/dbcopy
! jdbcUser_2=dbcopy
! jdbcPass_2=
! jdbcDriver_2=jdbc.FrontBase.FBJDriver
# MySQL
! jdbcUrl_3=jdbc:mysql://localhost:3306/test
! jdbcUser_3=test.user
! jdbcPass_3=password
! jdbcDriver_3=com.mysql.jdbc.Driver
--- 1,157 ----
! # Individual databases for testing one at a time
! #dbsToTest=axion
! #dbsToTest=daffodil
! #dbsToTest=db2
! #dbsToTest=derby
! #dbsToTest=firebird
! #dbsToTest=frontbase
! #dbsToTest=h2
! #dbsToTest=hsqldb
! dbsToTest=ingres
! #dbsToTest=
! #dbsToTest=
! #dbsToTest=
! #dbsToTest=
!
! # All dbs (includes dbs I don't currently have setup)
! #dbsToTest=axion, daffodil, db2, derby, firebird, frontbase, h2, hsqldb, inges, informix, maxdb, mysql, oracle
!
! # All dbs that I have setups for
! #dbsToTest=axion, daffodil, db2, derby, firebird, frontbase, h2, hsqldb, inges, maxdb, mssql, mysql, oracle, pointbase, postgres, sybase
!
! # jdbc connection setting template (XXX is replaced with database name):
! XXX_jdbcUrl=
! XXX_jdbcUser=
! XXX_jdbcPass=
! XXX_jdbcDriver=
!
! #
! # Begin database connection settings
! #
!
! # Axion
! axion_jdbcUrl=jdbc:axiondb:dbcopydest:C:/home/projects/axion/data_files/dbcopydest
! axion_jdbcUser=
! axion_jdbcPass=
! axion_jdbcDriver=org.axiondb.jdbc.AxionDriver
# Daffodil
! daffodil_jdbcUrl=jdbc:daffodilDB://127.0.0.1:3456/dbcopydest
! daffodil_jdbcUser=dbcopy
! daffodil_jdbcPass=password
! daffodil_jdbcDriver=in.co.daffodil.db.rmi.RmiDaffodilDBDriver
# DB2
! db2_jdbcUrl=jdbc:db2://localhost:50000/sample
! db2_jdbcUser=dbcopy
! db2_jdbcPass=password
! db2_jdbcDriver=com.ibm.db2.jcc.DB2Driver
! # Derby
! derby_jdbcUrl=jdbc:derby://localhost:1527/csuite
! derby_jdbcUser=csuite
! derby_jdbcPass=csuite
! derby_jdbcDriver=org.apache.derby.jdbc.ClientDriver
!
! # Firebird
! firebird_jdbcUrl=jdbc:firebirdsql://localhost/c:/tools/FIREBIRD_1_5/data/dbcopy.fdb
! firebird_jdbcUser=sysdba
! firebird_jdbcPass=password
! firebird_jdbcDriver=org.firebirdsql.jdbc.FBDriver
!
! # Frontbase - currently this doesn't start - throws a windows exception
! frontbase_jdbcUrl=jdbc:FrontBase://127.0.0.1/dbcopy
! frontbase_jdbcUser=dbcopy
! frontbase_jdbcPass=
! frontbase_jdbcDriver=com.frontbase.jdbc.FBJDriver
!
! # H2
! h2_jdbcUrl=jdbc:h2:tcp://localhost:9094/test
! h2_jdbcUser=sa
! h2_jdbcPass=
! h2_jdbcDriver=org.h2.Driver
!
! # HSQL
! hsqldb_jdbcUrl=jdbc:hsqldb:hsql://localhost:8082
! hsqldb_jdbcUser=sa
! hsqldb_jdbcPass=
! hsqldb_jdbcDriver=org.hsqldb.jdbcDriver
!
! # Informix - no server to test against yet - dialect is incomplete
! informix_jdbcUrl=
! informix_jdbcUser=
! informix_jdbcPass=
! informix_jdbcDriver=
!
! # Ingres
! ingres_jdbcUrl=jdbc:ingres://192.168.1.100:ii7/dbcopydest
! ingres_jdbcUser=ingres
! ingres_jdbcPass=password
! ingres_jdbcDriver=ca.ingres.jdbc.IngresDriver
!
! # Interbase - no server to test against yet - dialect is incomplete
! XXX_jdbcUrl=
! XXX_jdbcUser=
! XXX_jdbcPass=
! XXX_jdbcDriver=
!
! # MAXDB
! maxdb_jdbcUrl=jdbc:sapdb://localhost/MAXDB1
! maxdb_jdbcUser=dbcopy
! maxdb_jdbcPass=password
! maxdb_jdbcDriver=com.sap.dbtech.jdbc.DriverSapDB
!
! # McKOI
! XXX_jdbcUrl=
! XXX_jdbcUser=
! XXX_jdbcPass=
! XXX_jdbcDriver=
# MySQL
! mysql_jdbcUrl=jdbc:mysql://localhost:3306/test
! mysql_jdbcUser=test.user
! mysql_jdbcPass=password
! mysql_jdbcDriver=com.mysql.jdbc.Driver
!
! # Oracle
! oracle_jdbcUrl=jdbc:oracle:thin:@localhost:1521:csuite
! oracle_jdbcUser=test
! oracle_jdbcPass=password
! oracle_jdbcDriver=oracle.jdbc.OracleDriver
!
! # Pointbase
! pointbase_jdbcUrl=jdbc:pointbase:server://localhost:9093/workshop
! pointbase_jdbcUser=csuite
! pointbase_jdbcPass=csuite
! pointbase_jdbcDriver=com.pointbase.jdbc.jdbcUniversalDriver
!
! # Postgres
! postgres_jdbcUrl=jdbc:postgresql://localhost:5432/dbcopytest
! postgres_jdbcUser=dbcopy
! postgres_jdbcPass=dbcopy
! postgres_jdbcDriver=org.postgresql.Driver
!
! # Progress - no server to test against. Dialect is incomplete
! progress_jdbcUrl=
! progress_jdbcUser=
! progress_jdbcPass=
! progress_jdbcDriver=
!
! # MS-SQLServer
! mssql_jdbcUrl=jdbc:sqlserver://robspc:1433/database=dbcopydest
! mssql_jdbcUser=dbcopy
! mssql_jdbcPass=password
! mssql_jdbcDriver=com.microsoft.sqlserver.jdbc.SQLServerDriver
!
! # Sybase
! sybase_jdbcUrl=jdbc:sybase:Tds:robspc:4100
! sybase_jdbcUser=dbcopydest
! sybase_jdbcPass=password
! sybase_jdbcDriver=com.sybase.jdbc3.jdbc.SybDriver
!
! # TimesTen - server is on other machine
! XXX_jdbcUrl=jdbc:timesten:client:RunDataCS_csuite
! XXX_jdbcUser=dbcopy
! XXX_jdbcPass=password
! XXX_jdbcDriver=com.timesten.jdbc.TimesTenClientDriver
|
