/[Apache-SVN]
ViewVC logotype

Revision 328246


Jump to revision: Previous Next
Author: kmarsden
Date: Tue Oct 25 03:26:28 2005 UTC (18 years, 5 months ago)
Changed paths: 21
Log Message:
DERBY-597 - Enhance ij connect statement to work in J2ME/CDC/FP
ummary of patch:
* If ij.dataSource property is set and the url in the 'connect' statement does not start with 'jdbc:', ij calls util.getDataSourceConnection to get connection (instead of using DriverManager).
  
* Added getDataSourceConnection(String dsName,String user,String password,String dbName,boolean firstTime) to util.java. This returns a connection using the data source passed in ij.dataSource property. This method is called by startJBMS in util.java and ConnectStatement() in ij. The parameter firstTime indicates whether this method is called at start of test by startJBMS or by ConnectStatement.
 
* getDataSourceConnection method in turn calls setupDataSource which calls the set methods of data source. If firstTime=true, it uses values of ij.dataSource.* properties to set up the data source object. Otherwise, the properties ij.dataSource.databaseName and ij.dataSource.createDatabase are ignored. Instead, value of 'dbName' parameter is used. [In first version of this patch, parameter 'firstTime' was called 'create']
  
* Removed J2ME excludes from 13 tests which pass with this patch. Some tests needed changes in the connect statement url and master files.

Contributed by Deepa Remesh 



Changed paths

Path Details
Directorydb/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/implicitConversions.out modified , text changed
Directorydb/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/lockTable.out modified , text changed
Directorydb/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/lockTableVti.out modified , text changed
Directorydb/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/aggregateOptimization_app.properties modified , text changed
Directorydb/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/autoincrement_app.properties modified , text changed
Directorydb/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/implicitConversions.sql modified , text changed
Directorydb/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/implicitConversions_app.properties modified , text changed
Directorydb/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/lockTable.sql modified , text changed
Directorydb/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/lockTable_app.properties modified , text changed
Directorydb/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/scrollCursors3_app.properties modified , text changed
Directorydb/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/supersimple_app.properties modified , text changed
Directorydb/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/TransactionTable_app.properties modified , text changed
Directorydb/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/cisco_app.properties modified , text changed
Directorydb/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/heapscan_app.properties modified , text changed
Directorydb/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/lockTableVti.sql modified , text changed
Directorydb/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/lockTableVti_app.properties modified , text changed
Directorydb/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rlliso1multi_app.properties modified , text changed
Directorydb/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rlliso2multi_app.properties modified , text changed
Directorydb/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rlliso3multi_app.properties modified , text changed
Directorydb/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj modified , text changed
Directorydb/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/util.java modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26