Menu
▾
▴
dbunit-commit
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(5) |
Jul
(7) |
Aug
(37) |
Sep
|
Oct
|
Nov
(1) |
Dec
(22) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(8) |
Feb
(68) |
Mar
(72) |
Apr
(149) |
May
(32) |
Jun
(46) |
Jul
(26) |
Aug
(59) |
Sep
(25) |
Oct
(18) |
Nov
(4) |
Dec
(3) |
| 2004 |
Jan
(90) |
Feb
(19) |
Mar
(38) |
Apr
(41) |
May
(44) |
Jun
(2) |
Jul
(10) |
Aug
|
Sep
(14) |
Oct
|
Nov
(1) |
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(15) |
Jun
(1) |
Jul
|
Aug
(9) |
Sep
|
Oct
(17) |
Nov
|
Dec
|
| 2006 |
Jan
(1) |
Feb
(16) |
Mar
|
Apr
(1) |
May
(48) |
Jun
|
Jul
(2) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(29) |
| 2007 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
(23) |
Mar
(31) |
Apr
|
May
(26) |
Jun
(6) |
Jul
(1) |
Aug
|
Sep
(7) |
Oct
(1) |
Nov
(8) |
Dec
(8) |
| 2009 |
Jan
(5) |
Feb
(9) |
Mar
(1) |
Apr
|
May
(23) |
Jun
(3) |
Jul
|
Aug
(1) |
Sep
(9) |
Oct
(28) |
Nov
(18) |
Dec
(8) |
| 2010 |
Jan
(19) |
Feb
(24) |
Mar
(3) |
Apr
|
May
(5) |
Jun
(4) |
Jul
|
Aug
(1) |
Sep
(11) |
Oct
|
Nov
(2) |
Dec
(1) |
| 2011 |
Jan
|
Feb
(7) |
Mar
|
Apr
(6) |
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(32) |
Oct
(6) |
Nov
|
Dec
|
|
From: <de...@us...> - 2003-08-09 11:23:35
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit In directory sc8-pr-cvs1:/tmp/cvs-serv13148/src/test/org/dbunit Modified Files: Main.java Log Message: A bunch of import fixes and unused variables suggested by running PMD using Maven Index: Main.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/Main.java,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** Main.java 19 Jun 2003 03:17:16 -0000 1.31 --- Main.java 9 Aug 2003 11:23:32 -0000 1.32 *************** *** 23,26 **** --- 23,35 ---- package org.dbunit; + import java.io.FileOutputStream; + import java.io.FileReader; + import java.io.FileWriter; + import java.io.IOException; + import java.io.OutputStream; + import java.io.OutputStreamWriter; + import java.io.Reader; + import java.io.Writer; + import org.dbunit.database.IDatabaseConnection; import org.dbunit.dataset.DataSetException; *************** *** 30,42 **** import org.dbunit.dataset.excel.XlsDataSet; import org.dbunit.dataset.xml.FlatXmlDataSet; ! import org.dbunit.dataset.xml.FlatXmlProducer; import org.dbunit.dataset.xml.XmlDataSet; import org.dbunit.dataset.xml.XmlDataSetWriter; - import org.dbunit.dataset.xml.XmlProducer; - import org.dbunit.dataset.xml.FlatXmlWriter; - - import org.xml.sax.InputSource; - - import java.io.*; /** --- 39,45 ---- import org.dbunit.dataset.excel.XlsDataSet; import org.dbunit.dataset.xml.FlatXmlDataSet; ! import org.dbunit.dataset.xml.FlatXmlWriter; import org.dbunit.dataset.xml.XmlDataSet; import org.dbunit.dataset.xml.XmlDataSetWriter; /** |
|
From: <de...@us...> - 2003-08-09 11:23:35
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/ext/mssqlserver In directory sc8-pr-cvs1:/tmp/cvs-serv13148/src/java/org/dbunit/ext/mssqlserver Modified Files: MsSqlDataTypeFactory.java Log Message: A bunch of import fixes and unused variables suggested by running PMD using Maven Index: MsSqlDataTypeFactory.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ext/mssqlserver/MsSqlDataTypeFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MsSqlDataTypeFactory.java 20 May 2003 01:01:20 -0000 1.1 --- MsSqlDataTypeFactory.java 9 Aug 2003 11:23:31 -0000 1.2 *************** *** 21,25 **** package org.dbunit.ext.mssqlserver; - import org.dbunit.dataset.datatype.IDataTypeFactory; import org.dbunit.dataset.datatype.DataType; import org.dbunit.dataset.datatype.DataTypeException; --- 21,24 ---- |
|
From: <de...@us...> - 2003-08-09 11:23:35
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/ant
In directory sc8-pr-cvs1:/tmp/cvs-serv13148/src/test/org/dbunit/ant
Modified Files:
DbUnitTaskTest.java
Log Message:
A bunch of import fixes and unused variables suggested by running PMD using Maven
Index: DbUnitTaskTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/ant/DbUnitTaskTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DbUnitTaskTest.java 10 Apr 2003 02:52:06 -0000 1.9
--- DbUnitTaskTest.java 9 Aug 2003 11:23:31 -0000 1.10
***************
*** 81,85 ****
}
! public void testInvalidDatbaseInformation()
{
Throwable sql = null;
--- 81,85 ----
}
! public void testInvalidDatabaseInformation()
{
Throwable sql = null;
|
|
From: <de...@us...> - 2003-08-09 11:23:35
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/ext/db2 In directory sc8-pr-cvs1:/tmp/cvs-serv13148/src/test/org/dbunit/ext/db2 Modified Files: AllTests.java Log Message: A bunch of import fixes and unused variables suggested by running PMD using Maven Index: AllTests.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/ext/db2/AllTests.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AllTests.java 17 Jul 2003 12:06:34 -0000 1.1 --- AllTests.java 9 Aug 2003 11:23:32 -0000 1.2 *************** *** 25,29 **** import junit.framework.Test; import junit.framework.TestSuite; - import org.dbunit.dataset.*; /** --- 25,28 ---- |
|
From: <de...@us...> - 2003-08-09 11:23:34
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/mssqlserver
In directory sc8-pr-cvs1:/tmp/cvs-serv13148/src/java/org/dbunit/operation/mssqlserver
Modified Files:
InsertIdentityOperation.java
Log Message:
A bunch of import fixes and unused variables suggested by running PMD using Maven
Index: InsertIdentityOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/mssqlserver/InsertIdentityOperation.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** InsertIdentityOperation.java 1 Aug 2003 02:29:11 -0000 1.17
--- InsertIdentityOperation.java 9 Aug 2003 11:23:31 -0000 1.18
***************
*** 21,31 ****
package org.dbunit.operation.mssqlserver;
! import org.dbunit.database.*;
import org.dbunit.DatabaseUnitException;
import org.dbunit.database.IDatabaseConnection;
! import org.dbunit.dataset.*;
! import org.dbunit.operation.*;
!
! import java.sql.*;
/**
--- 21,40 ----
package org.dbunit.operation.mssqlserver;
! import java.sql.Connection;
! import java.sql.SQLException;
! import java.sql.Statement;
!
import org.dbunit.DatabaseUnitException;
import org.dbunit.database.IDatabaseConnection;
! import org.dbunit.dataset.Column;
! import org.dbunit.dataset.DataSetException;
! import org.dbunit.dataset.DefaultDataSet;
! import org.dbunit.dataset.IDataSet;
! import org.dbunit.dataset.ITable;
! import org.dbunit.dataset.ITableIterator;
! import org.dbunit.dataset.ITableMetaData;
! import org.dbunit.operation.CompositeOperation;
! import org.dbunit.operation.DatabaseOperation;
! import org.dbunit.operation.ExclusiveTransactionException;
/**
***************
*** 99,103 ****
{
IDataSet databaseDataSet = connection.createDataSet();
! String schemaName = connection.getSchema();
// INSERT_IDENTITY need to be enabled/disabled inside the
--- 108,112 ----
{
IDataSet databaseDataSet = connection.createDataSet();
!
// INSERT_IDENTITY need to be enabled/disabled inside the
|
|
From: <de...@us...> - 2003-08-09 11:23:34
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation
In directory sc8-pr-cvs1:/tmp/cvs-serv13148/src/java/org/dbunit/operation
Modified Files:
DatabaseOperation.java RefreshOperation.java
Log Message:
A bunch of import fixes and unused variables suggested by running PMD using Maven
Index: DatabaseOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/DatabaseOperation.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DatabaseOperation.java 1 Aug 2003 02:29:11 -0000 1.11
--- DatabaseOperation.java 9 Aug 2003 11:23:30 -0000 1.12
***************
*** 23,34 ****
package org.dbunit.operation;
import org.dbunit.DatabaseUnitException;
- import org.dbunit.database.IDatabaseConnection;
- import org.dbunit.database.DatabaseConnection;
import org.dbunit.database.DatabaseConfig;
! import org.dbunit.dataset.IDataSet;
import org.dbunit.dataset.DataSetUtils;
!
! import java.sql.SQLException;
/**
--- 23,33 ----
package org.dbunit.operation;
+ import java.sql.SQLException;
+
import org.dbunit.DatabaseUnitException;
import org.dbunit.database.DatabaseConfig;
! import org.dbunit.database.IDatabaseConnection;
import org.dbunit.dataset.DataSetUtils;
! import org.dbunit.dataset.IDataSet;
/**
Index: RefreshOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/RefreshOperation.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** RefreshOperation.java 1 Aug 2003 02:29:11 -0000 1.27
--- RefreshOperation.java 9 Aug 2003 11:23:31 -0000 1.28
***************
*** 69,74 ****
throws DatabaseUnitException, SQLException
{
! String schema = connection.getSchema();
!
// for each table
ITableIterator iterator = dataSet.iterator();
--- 69,73 ----
throws DatabaseUnitException, SQLException
{
!
// for each table
ITableIterator iterator = dataSet.iterator();
***************
*** 86,90 ****
table.getTableMetaData());
RowOperation updateRowOperation = createUpdateOperation(connection,
! schema, metaData);
RowOperation insertRowOperation = new InsertRowOperation(connection,
metaData);
--- 85,89 ----
table.getTableMetaData());
RowOperation updateRowOperation = createUpdateOperation(connection,
! metaData);
RowOperation insertRowOperation = new InsertRowOperation(connection,
metaData);
***************
*** 116,120 ****
private RowOperation createUpdateOperation(IDatabaseConnection connection,
! String schema, ITableMetaData metaData)
throws DataSetException, SQLException
{
--- 115,119 ----
private RowOperation createUpdateOperation(IDatabaseConnection connection,
! ITableMetaData metaData)
throws DataSetException, SQLException
{
***************
*** 126,130 ****
// otherwise, operation only verify if row exist
! return new RowExistOperation(connection, schema, metaData);
}
--- 125,129 ----
// otherwise, operation only verify if row exist
! return new RowExistOperation(connection, metaData);
}
***************
*** 211,215 ****
public RowExistOperation(IDatabaseConnection connection,
! String schema, ITableMetaData metaData)
throws DataSetException, SQLException
{
--- 210,214 ----
public RowExistOperation(IDatabaseConnection connection,
! ITableMetaData metaData)
throws DataSetException, SQLException
{
|
|
From: <de...@us...> - 2003-08-09 11:23:34
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/datatype In directory sc8-pr-cvs1:/tmp/cvs-serv13148/src/test/org/dbunit/dataset/datatype Modified Files: StringDataTypeTest.java Log Message: A bunch of import fixes and unused variables suggested by running PMD using Maven Index: StringDataTypeTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/datatype/StringDataTypeTest.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** StringDataTypeTest.java 31 Mar 2003 13:22:06 -0000 1.8 --- StringDataTypeTest.java 9 Aug 2003 11:23:31 -0000 1.9 *************** *** 23,28 **** import java.sql.Types; - import java.math.BigDecimal; - import java.math.BigInteger; /** --- 23,26 ---- |
|
From: <de...@us...> - 2003-08-09 11:23:34
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter In directory sc8-pr-cvs1:/tmp/cvs-serv13148/src/test/org/dbunit/dataset/filter Modified Files: SequenceTableIteratorTest.java Log Message: A bunch of import fixes and unused variables suggested by running PMD using Maven Index: SequenceTableIteratorTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter/SequenceTableIteratorTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SequenceTableIteratorTest.java 13 Apr 2003 05:13:52 -0000 1.4 --- SequenceTableIteratorTest.java 9 Aug 2003 11:23:31 -0000 1.5 *************** *** 21,32 **** package org.dbunit.dataset.filter; - import org.dbunit.DatabaseEnvironment; - import org.dbunit.database.DatabaseDataSet; - import org.dbunit.database.IDatabaseConnection; - import org.dbunit.dataset.MockDataSet; - import org.dbunit.database.MockResultSetTable; - import org.dbunit.database.DatabaseTableIterator; import org.dbunit.dataset.AbstractTableIteratorTest; import org.dbunit.dataset.ITableIterator; /** --- 21,27 ---- package org.dbunit.dataset.filter; import org.dbunit.dataset.AbstractTableIteratorTest; import org.dbunit.dataset.ITableIterator; + import org.dbunit.dataset.MockDataSet; /** |
|
From: <de...@us...> - 2003-08-09 11:23:34
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/excel In directory sc8-pr-cvs1:/tmp/cvs-serv13148/src/test/org/dbunit/dataset/excel Modified Files: XlsTableWriteTest.java Log Message: A bunch of import fixes and unused variables suggested by running PMD using Maven Index: XlsTableWriteTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/excel/XlsTableWriteTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** XlsTableWriteTest.java 21 Mar 2003 03:14:50 -0000 1.1 --- XlsTableWriteTest.java 9 Aug 2003 11:23:31 -0000 1.2 *************** *** 21,31 **** package org.dbunit.dataset.excel; ! import org.dbunit.dataset.*; ! import org.dbunit.dataset.xml.FlatXmlDataSet; ! import org.dbunit.dataset.xml.XmlTableTest; ! import org.dbunit.dataset.xml.FlatXmlTableTest; ! import org.dbunit.Assertion; ! import java.io.*; /** --- 21,37 ---- package org.dbunit.dataset.excel; ! import java.io.File; ! import java.io.FileInputStream; ! import java.io.FileOutputStream; ! import java.io.InputStream; ! import java.io.OutputStream; ! import org.dbunit.Assertion; ! import org.dbunit.dataset.CompositeTable; ! import org.dbunit.dataset.DefaultDataSet; ! import org.dbunit.dataset.DefaultTableMetaData; ! import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.ITable; ! import org.dbunit.dataset.ITableMetaData; /** |
|
From: <de...@us...> - 2003-08-09 11:23:34
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/util/concurrent
In directory sc8-pr-cvs1:/tmp/cvs-serv13148/src/java/org/dbunit/util/concurrent
Modified Files:
PropertyChangeMulticaster.java
Log Message:
A bunch of import fixes and unused variables suggested by running PMD using Maven
Index: PropertyChangeMulticaster.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/util/concurrent/PropertyChangeMulticaster.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PropertyChangeMulticaster.java 19 Jun 2003 03:17:17 -0000 1.2
--- PropertyChangeMulticaster.java 9 Aug 2003 11:23:31 -0000 1.3
***************
*** 439,444 ****
s.defaultWriteObject();
! for (int i = 0; i < listeners.length; i++) {
! PropertyChangeListener l = listeners[i];
if (listeners[i] instanceof Serializable) {
s.writeObject(listeners[i]);
--- 439,443 ----
s.defaultWriteObject();
! for (int i = 0; i < listeners.length; i++) {
if (listeners[i] instanceof Serializable) {
s.writeObject(listeners[i]);
|
|
From: <de...@us...> - 2003-08-09 11:23:33
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/database In directory sc8-pr-cvs1:/tmp/cvs-serv13148/src/test/org/dbunit/database Modified Files: DatabaseTableMetaDataTest.java QueryDataSetTest.java Log Message: A bunch of import fixes and unused variables suggested by running PMD using Maven Index: DatabaseTableMetaDataTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/DatabaseTableMetaDataTest.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** DatabaseTableMetaDataTest.java 1 Aug 2003 02:29:12 -0000 1.17 --- DatabaseTableMetaDataTest.java 9 Aug 2003 11:23:28 -0000 1.18 *************** *** 23,31 **** package org.dbunit.database; - import org.dbunit.*; import org.dbunit.AbstractDatabaseTest; ! import org.dbunit.dataset.*; import org.dbunit.dataset.datatype.DataType; - import org.dbunit.dataset.datatype.DefaultDataTypeFactory; /** --- 23,33 ---- package org.dbunit.database; import org.dbunit.AbstractDatabaseTest; ! import org.dbunit.dataset.Column; ! import org.dbunit.dataset.DataSetUtils; ! import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.ITableMetaData; ! import org.dbunit.dataset.NoColumnsFoundException; import org.dbunit.dataset.datatype.DataType; /** Index: QueryDataSetTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/QueryDataSetTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** QueryDataSetTest.java 13 Apr 2003 02:40:11 -0000 1.4 --- QueryDataSetTest.java 9 Aug 2003 11:23:30 -0000 1.5 *************** *** 24,29 **** import org.dbunit.DatabaseEnvironment; - import org.dbunit.HypersonicEnvironment; - import org.dbunit.TestFeature; import org.dbunit.dataset.AbstractDataSetTest; import org.dbunit.dataset.IDataSet; --- 24,27 ---- |
|
From: <mla...@us...> - 2003-08-01 02:58:45
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit
In directory sc8-pr-cvs1:/tmp/cvs-serv8252/test/org/dbunit
Modified Files:
AbstractDatabaseTest.java
Log Message:
Added DatabaseConfig class to query and set feature flags and property values for an IDatabaseConnection. No more usage of System properties. See updated properties.html documentation for more details.
Index: AbstractDatabaseTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/AbstractDatabaseTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** AbstractDatabaseTest.java 9 Apr 2003 22:52:12 -0000 1.12
--- AbstractDatabaseTest.java 1 Aug 2003 02:29:12 -0000 1.13
***************
*** 35,39 ****
public abstract class AbstractDatabaseTest extends DatabaseTestCase
{
- private static final String ESCAPE_PATTERN_KEY = "dbunit.name.escapePattern";
protected IDatabaseConnection _connection;
--- 35,38 ----
***************
*** 57,70 ****
}
- public static void setEscapePattern(String pattern)
- {
- if (pattern == null)
- {
- System.getProperties().remove(ESCAPE_PATTERN_KEY);
- return;
- }
- System.setProperty(ESCAPE_PATTERN_KEY, pattern);
- }
-
////////////////////////////////////////////////////////////////////////////
// TestCase class
--- 56,59 ----
***************
*** 84,88 ****
_connection = null;
- setEscapePattern(null);
}
--- 73,76 ----
|
|
From: <mla...@us...> - 2003-08-01 02:58:44
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation
In directory sc8-pr-cvs1:/tmp/cvs-serv8252/java/org/dbunit/operation
Modified Files:
AbstractBatchOperation.java DatabaseOperation.java
DeleteAllOperation.java DeleteOperation.java
InsertOperation.java RefreshOperation.java
TruncateTableOperation.java UpdateOperation.java
Log Message:
Added DatabaseConfig class to query and set feature flags and property values for an IDatabaseConnection. No more usage of System properties. See updated properties.html documentation for more details.
Index: AbstractBatchOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/AbstractBatchOperation.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** AbstractBatchOperation.java 13 Apr 2003 16:49:58 -0000 1.18
--- AbstractBatchOperation.java 1 Aug 2003 02:29:11 -0000 1.19
***************
*** 25,28 ****
--- 25,29 ----
import org.dbunit.DatabaseUnitException;
import org.dbunit.database.IDatabaseConnection;
+ import org.dbunit.database.DatabaseConfig;
import org.dbunit.database.statement.IPreparedBatchStatement;
import org.dbunit.database.statement.IStatementFactory;
***************
*** 109,114 ****
}
! abstract public OperationData getOperationData(String schemaName,
! ITableMetaData metaData) throws DataSetException;
////////////////////////////////////////////////////////////////////////////
--- 110,115 ----
}
! abstract public OperationData getOperationData(
! ITableMetaData metaData, IDatabaseConnection connection) throws DataSetException;
////////////////////////////////////////////////////////////////////////////
***************
*** 118,122 ****
throws DatabaseUnitException, SQLException
{
! IStatementFactory factory = connection.getStatementFactory();
// for each table
--- 119,125 ----
throws DatabaseUnitException, SQLException
{
! DatabaseConfig databaseConfig = connection.getConfig();
! IStatementFactory factory = (IStatementFactory)databaseConfig.getProperty(
! DatabaseConfig.PROPERTY_STATEMENT_FACTORY);
// for each table
***************
*** 135,139 ****
table.getTableMetaData());
OperationData operationData = getOperationData(
! connection.getSchema(), metaData);
IPreparedBatchStatement statement = factory.createPreparedBatchStatement(
--- 138,142 ----
table.getTableMetaData());
OperationData operationData = getOperationData(
! metaData, connection);
IPreparedBatchStatement statement = factory.createPreparedBatchStatement(
Index: DatabaseOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/DatabaseOperation.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** DatabaseOperation.java 13 Apr 2003 17:46:10 -0000 1.10
--- DatabaseOperation.java 1 Aug 2003 02:29:11 -0000 1.11
***************
*** 25,29 ****
--- 25,32 ----
import org.dbunit.DatabaseUnitException;
import org.dbunit.database.IDatabaseConnection;
+ import org.dbunit.database.DatabaseConnection;
+ import org.dbunit.database.DatabaseConfig;
import org.dbunit.dataset.IDataSet;
+ import org.dbunit.dataset.DataSetUtils;
import java.sql.SQLException;
***************
*** 56,59 ****
--- 59,70 ----
public abstract void execute(IDatabaseConnection connection,
IDataSet dataSet) throws DatabaseUnitException, SQLException;
+
+ public static String getQualifiedName(String prefix, String name, IDatabaseConnection connection)
+ {
+ String escapePattern = (String)connection.getConfig().getProperty(
+ DatabaseConfig.PROPERTY_ESCAPE_PATTERN);
+
+ return DataSetUtils.getQualifiedName(prefix, name, escapePattern);
+ }
private static class DummyOperation extends DatabaseOperation
Index: DeleteAllOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/DeleteAllOperation.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DeleteAllOperation.java 13 Apr 2003 17:46:10 -0000 1.15
--- DeleteAllOperation.java 1 Aug 2003 02:29:11 -0000 1.16
***************
*** 23,26 ****
--- 23,27 ----
import org.dbunit.DatabaseUnitException;
import org.dbunit.database.IDatabaseConnection;
+ import org.dbunit.database.DatabaseConfig;
import org.dbunit.database.statement.IBatchStatement;
import org.dbunit.database.statement.IStatementFactory;
***************
*** 64,68 ****
IDataSet databaseDataSet = connection.createDataSet();
! IStatementFactory statementFactory = connection.getStatementFactory();
IBatchStatement statement = statementFactory.createBatchStatement(connection);
try
--- 65,71 ----
IDataSet databaseDataSet = connection.createDataSet();
! DatabaseConfig databaseConfig = connection.getConfig();
! IStatementFactory statementFactory = (IStatementFactory)databaseConfig.getProperty(
! DatabaseConfig.PROPERTY_STATEMENT_FACTORY);
IBatchStatement statement = statementFactory.createBatchStatement(connection);
try
***************
*** 81,86 ****
StringBuffer sqlBuffer = new StringBuffer(128);
sqlBuffer.append(getDeleteAllCommand());
! sqlBuffer.append(DataSetUtils.getQualifiedName(
! connection.getSchema(), tableName, true));
statement.addBatch(sqlBuffer.toString());
--- 84,88 ----
StringBuffer sqlBuffer = new StringBuffer(128);
sqlBuffer.append(getDeleteAllCommand());
! sqlBuffer.append(getQualifiedName(connection.getSchema(), tableName, connection));
statement.addBatch(sqlBuffer.toString());
Index: DeleteOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/DeleteOperation.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** DeleteOperation.java 9 Apr 2003 22:52:11 -0000 1.13
--- DeleteOperation.java 1 Aug 2003 02:29:11 -0000 1.14
***************
*** 24,27 ****
--- 24,28 ----
import org.dbunit.DatabaseUnitException;
+ import org.dbunit.database.IDatabaseConnection;
import org.dbunit.dataset.*;
***************
*** 49,54 ****
}
! public OperationData getOperationData(String schemaName,
! ITableMetaData metaData) throws DataSetException
{
// cannot construct where clause if no primary key
--- 50,55 ----
}
! public OperationData getOperationData(
! ITableMetaData metaData, IDatabaseConnection connection) throws DataSetException
{
// cannot construct where clause if no primary key
***************
*** 62,67 ****
StringBuffer sqlBuffer = new StringBuffer(128);
sqlBuffer.append("delete from ");
! sqlBuffer.append(DataSetUtils.getQualifiedName(
! schemaName, metaData.getTableName(), true));
// where
--- 63,68 ----
StringBuffer sqlBuffer = new StringBuffer(128);
sqlBuffer.append("delete from ");
! sqlBuffer.append(getQualifiedName(connection.getSchema(),
! metaData.getTableName(), connection));
// where
***************
*** 70,75 ****
{
// escape column name
! String columnName = DataSetUtils.getQualifiedName(null,
! primaryKeys[i].getColumnName(), true);
sqlBuffer.append(columnName);
--- 71,76 ----
{
// escape column name
! String columnName = getQualifiedName(null,
! primaryKeys[i].getColumnName(), connection);
sqlBuffer.append(columnName);
Index: InsertOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/InsertOperation.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** InsertOperation.java 4 Aug 2002 01:07:13 -0000 1.12
--- InsertOperation.java 1 Aug 2003 02:29:11 -0000 1.13
***************
*** 24,27 ****
--- 24,28 ----
import org.dbunit.dataset.*;
+ import org.dbunit.database.IDatabaseConnection;
/**
***************
*** 43,48 ****
// AbstractBatchOperation class
! public OperationData getOperationData(String schemaName,
! ITableMetaData metaData) throws DataSetException
{
Column[] columns = metaData.getColumns();
--- 44,49 ----
// AbstractBatchOperation class
! public OperationData getOperationData(
! ITableMetaData metaData, IDatabaseConnection connection) throws DataSetException
{
Column[] columns = metaData.getColumns();
***************
*** 51,56 ****
StringBuffer sqlBuffer = new StringBuffer(128);
sqlBuffer.append("insert into ");
! sqlBuffer.append(DataSetUtils.getQualifiedName(schemaName,
! metaData.getTableName(), true));
// columns
--- 52,57 ----
StringBuffer sqlBuffer = new StringBuffer(128);
sqlBuffer.append("insert into ");
! sqlBuffer.append(getQualifiedName(connection.getSchema(),
! metaData.getTableName(), connection));
// columns
***************
*** 64,69 ****
// escape column name
! String columnName = DataSetUtils.getQualifiedName(null,
! columns[i].getColumnName(), true);
sqlBuffer.append(columnName);
}
--- 65,70 ----
// escape column name
! String columnName = getQualifiedName(null,
! columns[i].getColumnName(), connection);
sqlBuffer.append(columnName);
}
Index: RefreshOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/RefreshOperation.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** RefreshOperation.java 17 May 2003 15:38:52 -0000 1.26
--- RefreshOperation.java 1 Aug 2003 02:29:11 -0000 1.27
***************
*** 88,92 ****
schema, metaData);
RowOperation insertRowOperation = new InsertRowOperation(connection,
! schema, metaData);
try
--- 88,92 ----
schema, metaData);
RowOperation insertRowOperation = new InsertRowOperation(connection,
! metaData);
try
***************
*** 122,126 ****
if (metaData.getColumns().length > metaData.getPrimaryKeys().length)
{
! return new UpdateRowOperation(connection, schema, metaData);
}
--- 122,126 ----
if (metaData.getColumns().length > metaData.getPrimaryKeys().length)
{
! return new UpdateRowOperation(connection, metaData);
}
***************
*** 171,180 ****
{
public InsertRowOperation(IDatabaseConnection connection,
! String schema, ITableMetaData metaData)
throws DataSetException, SQLException
{
// setup insert statement
! OperationData insertData = _insertOperation.getOperationData(schema,
! metaData);
_statement = new SimplePreparedStatement(insertData.getSql(),
connection.getConnection());
--- 171,180 ----
{
public InsertRowOperation(IDatabaseConnection connection,
! ITableMetaData metaData)
throws DataSetException, SQLException
{
// setup insert statement
! OperationData insertData = _insertOperation.getOperationData(
! metaData, connection);
_statement = new SimplePreparedStatement(insertData.getSql(),
connection.getConnection());
***************
*** 191,200 ****
public UpdateRowOperation(IDatabaseConnection connection,
! String schema, ITableMetaData metaData)
throws DataSetException, SQLException
{
// setup update statement
! OperationData updateData = _updateOperation.getOperationData(schema,
! metaData);
_statement = new SimplePreparedStatement(updateData.getSql(),
connection.getConnection());
--- 191,200 ----
public UpdateRowOperation(IDatabaseConnection connection,
! ITableMetaData metaData)
throws DataSetException, SQLException
{
// setup update statement
! OperationData updateData = _updateOperation.getOperationData(
! metaData, connection);
_statement = new SimplePreparedStatement(updateData.getSql(),
connection.getConnection());
***************
*** 215,219 ****
{
// setup select count statement
! OperationData countData = getSelectCountData(schema, metaData);
_countStatement = connection.getConnection().prepareStatement(
countData.getSql());
--- 215,219 ----
{
// setup select count statement
! OperationData countData = getSelectCountData(metaData, connection);
_countStatement = connection.getConnection().prepareStatement(
countData.getSql());
***************
*** 221,226 ****
}
! private OperationData getSelectCountData(String schemaName,
! ITableMetaData metaData) throws DataSetException
{
Column[] primaryKeys = metaData.getPrimaryKeys();
--- 221,226 ----
}
! private OperationData getSelectCountData(
! ITableMetaData metaData, IDatabaseConnection connection) throws DataSetException
{
Column[] primaryKeys = metaData.getPrimaryKeys();
***************
*** 235,240 ****
StringBuffer sqlBuffer = new StringBuffer(128);
sqlBuffer.append("select COUNT(*) from ");
! sqlBuffer.append(DataSetUtils.getQualifiedName(schemaName,
! metaData.getTableName(), true));
// where
--- 235,240 ----
StringBuffer sqlBuffer = new StringBuffer(128);
sqlBuffer.append("select COUNT(*) from ");
! sqlBuffer.append(getQualifiedName(connection.getSchema(),
! metaData.getTableName(), connection));
// where
Index: TruncateTableOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/TruncateTableOperation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TruncateTableOperation.java 13 Apr 2003 17:46:10 -0000 1.1
--- TruncateTableOperation.java 1 Aug 2003 02:29:11 -0000 1.2
***************
*** 25,28 ****
--- 25,29 ----
import org.dbunit.DatabaseUnitException;
import org.dbunit.database.IDatabaseConnection;
+ import org.dbunit.database.DatabaseConfig;
import org.dbunit.dataset.IDataSet;
***************
*** 47,52 ****
public class TruncateTableOperation extends DeleteAllOperation
{
- static final String SUPPORT_BATCH_STATEMENT = "dbunit.database.supportBatchStatement";
-
TruncateTableOperation()
{
--- 48,51 ----
***************
*** 68,80 ****
{
// Patch to make it work with MS SQL Server
! String oldValue = System.getProperty(SUPPORT_BATCH_STATEMENT, "true");
try
{
! System.setProperty(SUPPORT_BATCH_STATEMENT, "false");
super.execute(connection, dataSet);
}
finally
{
! System.setProperty(SUPPORT_BATCH_STATEMENT, oldValue);
}
}
--- 67,80 ----
{
// Patch to make it work with MS SQL Server
! DatabaseConfig config = connection.getConfig();
! boolean oldValue = config.getFeature(DatabaseConfig.FEATURE_BATCHED_STATEMENTS);
try
{
! config.setFeature(DatabaseConfig.FEATURE_BATCHED_STATEMENTS, false);
super.execute(connection, dataSet);
}
finally
{
! config.setFeature(DatabaseConfig.FEATURE_BATCHED_STATEMENTS, oldValue);
}
}
Index: UpdateOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/UpdateOperation.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** UpdateOperation.java 4 Aug 2002 01:07:13 -0000 1.9
--- UpdateOperation.java 1 Aug 2003 02:29:11 -0000 1.10
***************
*** 24,27 ****
--- 24,28 ----
import org.dbunit.dataset.*;
+ import org.dbunit.database.IDatabaseConnection;
import java.util.ArrayList;
***************
*** 44,49 ****
// AbstractBatchOperation class
! public OperationData getOperationData(String schemaName,
! ITableMetaData metaData) throws DataSetException
{
Column[] columns = metaData.getColumns();
--- 45,50 ----
// AbstractBatchOperation class
! public OperationData getOperationData(
! ITableMetaData metaData, IDatabaseConnection connection) throws DataSetException
{
Column[] columns = metaData.getColumns();
***************
*** 59,64 ****
StringBuffer sqlBuffer = new StringBuffer(128);
sqlBuffer.append("update ");
! sqlBuffer.append(DataSetUtils.getQualifiedName(schemaName,
! metaData.getTableName(), true));
// set
--- 60,65 ----
StringBuffer sqlBuffer = new StringBuffer(128);
sqlBuffer.append("update ");
! sqlBuffer.append(getQualifiedName(connection.getSchema(),
! metaData.getTableName(), connection));
// set
***************
*** 80,85 ****
// escape column name
! String columnName = DataSetUtils.getQualifiedName(null,
! column.getColumnName(), true);
sqlBuffer.append(columnName);
sqlBuffer.append(" = ?");
--- 81,86 ----
// escape column name
! String columnName = getQualifiedName(null,
! column.getColumnName(), connection);
sqlBuffer.append(columnName);
sqlBuffer.append(" = ?");
***************
*** 100,105 ****
// escape column name
! String columnName = DataSetUtils.getQualifiedName(null,
! column.getColumnName(), true);
sqlBuffer.append(columnName);
sqlBuffer.append(" = ?");
--- 101,106 ----
// escape column name
! String columnName = getQualifiedName(null,
! column.getColumnName(), connection);
sqlBuffer.append(columnName);
sqlBuffer.append(" = ?");
|
|
From: <mla...@us...> - 2003-08-01 02:58:44
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/ext/db2
In directory sc8-pr-cvs1:/tmp/cvs-serv8252/java/org/dbunit/ext/db2
Modified Files:
Db2Connection.java
Log Message:
Added DatabaseConfig class to query and set feature flags and property values for an IDatabaseConnection. No more usage of System properties. See updated properties.html documentation for more details.
Index: Db2Connection.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ext/db2/Db2Connection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Db2Connection.java 17 Jul 2003 12:06:57 -0000 1.1
--- Db2Connection.java 1 Aug 2003 02:29:11 -0000 1.2
***************
*** 23,41 ****
package org.dbunit.ext.db2;
! import org.dbunit.database.*;
! import org.dbunit.dataset.datatype.IDataTypeFactory;
import java.sql.Connection;
! public class Db2Connection extends DatabaseConnection {
!
! private final IDataTypeFactory _dataTypeFactory = new Db2DataTypeFactory();
! public Db2Connection(Connection connection, String schema) {
super(connection, schema);
! }
- protected IDataTypeFactory getDataTypeFactory() {
- return _dataTypeFactory;
}
}
--- 23,40 ----
package org.dbunit.ext.db2;
! import org.dbunit.database.DatabaseConfig;
! import org.dbunit.database.DatabaseConnection;
import java.sql.Connection;
! public class Db2Connection extends DatabaseConnection
! {
! public Db2Connection(Connection connection, String schema)
! {
super(connection, schema);
! getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY,
! new Db2DataTypeFactory());
}
}
|
|
From: <mla...@us...> - 2003-08-01 02:58:44
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/statement
In directory sc8-pr-cvs1:/tmp/cvs-serv8252/java/org/dbunit/database/statement
Modified Files:
AbstractStatementFactory.java
Log Message:
Added DatabaseConfig class to query and set feature flags and property values for an IDatabaseConnection. No more usage of System properties. See updated properties.html documentation for more details.
Index: AbstractStatementFactory.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/statement/AbstractStatementFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AbstractStatementFactory.java 13 Jun 2002 17:24:56 -0000 1.2
--- AbstractStatementFactory.java 1 Aug 2003 02:29:11 -0000 1.3
***************
*** 11,14 ****
--- 11,15 ----
import org.dbunit.database.IDatabaseConnection;
+ import org.dbunit.database.DatabaseConfig;
import java.sql.SQLException;
***************
*** 16,21 ****
public abstract class AbstractStatementFactory implements IStatementFactory
{
- static final String SUPPORT_BATCH_STATEMENT = "dbunit.database.supportBatchStatement";
-
/**
* Returns <code>true</code> if target database supports batch statement.
--- 17,20 ----
***************
*** 24,28 ****
throws SQLException
{
! if (System.getProperty(SUPPORT_BATCH_STATEMENT, "true").equals("true"))
{
return connection.getConnection().getMetaData().supportsBatchUpdates();
--- 23,27 ----
throws SQLException
{
! if (connection.getConfig().getFeature(DatabaseConfig.FEATURE_BATCHED_STATEMENTS))
{
return connection.getConnection().getMetaData().supportsBatchUpdates();
|
|
From: <mla...@us...> - 2003-08-01 02:58:43
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype
In directory sc8-pr-cvs1:/tmp/cvs-serv8252/java/org/dbunit/dataset/datatype
Modified Files:
DataType.java DefaultDataTypeFactory.java
Log Message:
Added DatabaseConfig class to query and set feature flags and property values for an IDatabaseConnection. No more usage of System properties. See updated properties.html documentation for more details.
Index: DataType.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/DataType.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** DataType.java 19 May 2003 22:09:20 -0000 1.20
--- DataType.java 1 Aug 2003 02:29:11 -0000 1.21
***************
*** 161,164 ****
--- 161,165 ----
* type name.
*
+ * @deprecated Should not be used anymore
*/
public static DataType forSqlTypeName(String sqlTypeName) throws DataTypeException
Index: DefaultDataTypeFactory.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/DefaultDataTypeFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DefaultDataTypeFactory.java 20 May 2003 01:01:20 -0000 1.2
--- DefaultDataTypeFactory.java 1 Aug 2003 02:29:11 -0000 1.3
***************
*** 41,45 ****
else
{
! dataType = DataType.forSqlTypeName(sqlTypeName);
}
return dataType;
--- 41,59 ----
else
{
! // Necessary for compatibility with DbUnit 1.5 and older
! /*
!
! // BLOB
! if ("BLOB".equals(sqlTypeName))
! {
! return DataType.BLOB;
! }
!
! // CLOB
! if ("CLOB".equals(sqlTypeName))
! {
! return DataType.CLOB;
! }
! */
}
return dataType;
|
|
From: <mla...@us...> - 2003-08-01 02:58:40
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant
In directory sc8-pr-cvs1:/tmp/cvs-serv8252/java/org/dbunit/ant
Modified Files:
DbUnitTask.java
Log Message:
Added DatabaseConfig class to query and set feature flags and property values for an IDatabaseConnection. No more usage of System properties. See updated properties.html documentation for more details.
Index: DbUnitTask.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant/DbUnitTask.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DbUnitTask.java 25 Mar 2003 12:34:48 -0000 1.6
--- DbUnitTask.java 1 Aug 2003 02:29:10 -0000 1.7
***************
*** 26,29 ****
--- 26,30 ----
import org.dbunit.database.IDatabaseConnection;
import org.dbunit.database.DatabaseConnection;
+ import org.dbunit.database.DatabaseConfig;
import java.sql.*;
***************
*** 94,98 ****
* Flag for using botched statements.
*/
! private boolean supportBatchStatement = true;
/**
--- 95,99 ----
* Flag for using botched statements.
*/
! private boolean supportBatchStatement = false;
/**
***************
*** 247,259 ****
}
- if (useQualifiedTableNames)
- {
- System.setProperty("dbunit.qualified.table.names", "true");
- }
- if (!supportBatchStatement)
- {
- System.setProperty("dbunit.database.supportBatchStatement", "false");
- }
-
Driver driverInstance = null;
try
--- 248,251 ----
***************
*** 304,310 ****
throw new SQLException("No suitable Driver for " + url);
}
-
conn.setAutoCommit(true);
IDatabaseConnection connection = new DatabaseConnection(conn, schema);
Iterator stepIter = steps.listIterator();
while (stepIter.hasNext())
--- 296,306 ----
throw new SQLException("No suitable Driver for " + url);
}
conn.setAutoCommit(true);
+
IDatabaseConnection connection = new DatabaseConnection(conn, schema);
+ DatabaseConfig config = connection.getConfig();
+ config.setFeature(DatabaseConfig.FEATURE_BATCHED_STATEMENTS, supportBatchStatement);
+ config.setFeature(DatabaseConfig.FEATURE_QUALIFIED_TABLE_NAMES, useQualifiedTableNames);
+
Iterator stepIter = steps.listIterator();
while (stepIter.hasNext())
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/database
In directory sc8-pr-cvs1:/tmp/cvs-serv8252/java/org/dbunit/database
Modified Files:
AbstractDatabaseConnection.java AbstractResultSetTable.java
CachedResultSetTable.java DatabaseDataSet.java
DatabaseTableMetaData.java IDatabaseConnection.java
Added Files:
CachedResultSetTableFactory.java DatabaseConfig.java
ForwardOnlyResultSetTableFactory.java
IResultSetTableFactory.java
Log Message:
Added DatabaseConfig class to query and set feature flags and property values for an IDatabaseConnection. No more usage of System properties. See updated properties.html documentation for more details.
--- NEW FILE: CachedResultSetTableFactory.java ---
/*
*
* The DbUnit Database Testing Framework
* Copyright (C)2002, Manuel Laflamme
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
package org.dbunit.database;
import org.dbunit.dataset.DataSetException;
import org.dbunit.dataset.ITableMetaData;
import java.sql.SQLException;
/**
*
* @author manuel.laflamme$
* @since Jul 31, 2003$
* @version $Revision: 1.1 $
*/
public class CachedResultSetTableFactory implements IResultSetTableFactory
{
public IResultSetTable createTable(String tableName, String selectStatement,
IDatabaseConnection connection) throws SQLException, DataSetException
{
return new CachedResultSetTable(new ForwardOnlyResultSetTable(
tableName, selectStatement, connection));
}
public IResultSetTable createTable(ITableMetaData metaData,
IDatabaseConnection connection) throws SQLException, DataSetException
{
return new CachedResultSetTable(metaData, connection);
}
}
--- NEW FILE: DatabaseConfig.java ---
/*
*
* The DbUnit Database Testing Framework
* Copyright (C)2002, Manuel Laflamme
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
package org.dbunit.database;
import org.dbunit.dataset.datatype.DefaultDataTypeFactory;
import org.dbunit.database.statement.PreparedStatementFactory;
import java.util.Set;
import java.util.Map;
import java.util.HashSet;
import java.util.HashMap;
/**
*
* @author manuel.laflamme
* @since Jul 17, 2003
* @version $Revision: 1.1 $
*/
public class DatabaseConfig
{
public static final String PROPERTY_STATEMENT_FACTORY =
"http://www.dbunit.org/properties/statementFactory";
public static final String PROPERTY_RESULTSET_TABLE_FACTORY =
"http://www.dbunit.org/properties/resultSetTableFactory";
public static final String PROPERTY_DATATYPE_FACTORY =
"http://www.dbunit.org/properties/datatypeFactory";
public static final String PROPERTY_ESCAPE_PATTERN =
"http://www.dbunit.org/properties/escapePattern";
public static final String FEATURE_QUALIFIED_TABLE_NAMES =
"http://www.dbunit.org/features/qualifiedTableNames";
public static final String FEATURE_BATCHED_STATEMENTS =
"http://www.dbunit.org/features/batchedStatements";
private Set _featuresSet = new HashSet();
private Map _propertyMap = new HashMap();
public DatabaseConfig()
{
setFeature(FEATURE_BATCHED_STATEMENTS, false);
setFeature(FEATURE_QUALIFIED_TABLE_NAMES, false);
setProperty(PROPERTY_STATEMENT_FACTORY, new PreparedStatementFactory());
setProperty(PROPERTY_RESULTSET_TABLE_FACTORY, new CachedResultSetTableFactory());
setProperty(PROPERTY_DATATYPE_FACTORY, new DefaultDataTypeFactory());
setProperty(PROPERTY_ESCAPE_PATTERN, null);
}
/**
* Set the value of a feature flag.
*
* @param name
* @param value
*/
public void setFeature(String name, boolean value)
{
if (value)
{
_featuresSet.add(name);
}
else
{
_featuresSet.remove(name);
}
}
/**
* Look up the value of a feature flag.
*
* @param name
* @return
*/
public boolean getFeature(String name)
{
return _featuresSet.contains(name);
}
/**
* Set the value of a property.
*
* @param name
* @param value
*/
public void setProperty(String name, Object value)
{
_propertyMap.put(name, value);
}
/**
* Look up the value of a property.
*
* @param name
* @return
*/
public Object getProperty(String name)
{
return _propertyMap.get(name);
}
}
--- NEW FILE: ForwardOnlyResultSetTableFactory.java ---
/*
*
* The DbUnit Database Testing Framework
* Copyright (C)2002, Manuel Laflamme
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
package org.dbunit.database;
import org.dbunit.dataset.DataSetException;
import org.dbunit.dataset.ITableMetaData;
import java.sql.SQLException;
/**
*
* @author manuel.laflamme$
* @since Jul 31, 2003$
* @version $Revision: 1.1 $
*/
public class ForwardOnlyResultSetTableFactory implements IResultSetTableFactory
{
public IResultSetTable createTable(String tableName, String selectStatement,
IDatabaseConnection connection) throws SQLException, DataSetException
{
return new ForwardOnlyResultSetTable(tableName, selectStatement, connection);
}
public IResultSetTable createTable(ITableMetaData metaData,
IDatabaseConnection connection) throws SQLException, DataSetException
{
return new ForwardOnlyResultSetTable(metaData, connection);
}
}
--- NEW FILE: IResultSetTableFactory.java ---
/*
*
* The DbUnit Database Testing Framework
* Copyright (C)2002, Manuel Laflamme
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
package org.dbunit.database;
import org.dbunit.dataset.DataSetException;
import org.dbunit.dataset.ITableMetaData;
import java.sql.SQLException;
/**
*
* @author manuel.laflamme
* @since Jul 17, 2003
* @version $Revision: 1.1 $
*/
public interface IResultSetTableFactory
{
public IResultSetTable createTable(String tableName, String selectStatement,
IDatabaseConnection connection) throws SQLException, DataSetException;
public IResultSetTable createTable(ITableMetaData metaData,
IDatabaseConnection connection) throws SQLException, DataSetException;
}
Index: AbstractDatabaseConnection.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/AbstractDatabaseConnection.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** AbstractDatabaseConnection.java 19 May 2003 22:09:19 -0000 1.15
--- AbstractDatabaseConnection.java 1 Aug 2003 02:29:10 -0000 1.16
***************
*** 23,35 ****
package org.dbunit.database;
- import org.dbunit.DatabaseUnitRuntimeException;
import org.dbunit.database.statement.IStatementFactory;
! import org.dbunit.dataset.*;
import org.dbunit.dataset.datatype.IDataTypeFactory;
- import org.dbunit.dataset.datatype.DefaultDataTypeFactory;
! import java.lang.reflect.Constructor;
! import java.lang.reflect.InvocationTargetException;
! import java.sql.*;
/**
--- 23,37 ----
package org.dbunit.database;
import org.dbunit.database.statement.IStatementFactory;
! import org.dbunit.dataset.DataSetException;
! import org.dbunit.dataset.FilteredDataSet;
! import org.dbunit.dataset.IDataSet;
! import org.dbunit.dataset.ITable;
! import org.dbunit.dataset.ITableMetaData;
import org.dbunit.dataset.datatype.IDataTypeFactory;
! import java.sql.ResultSet;
! import java.sql.SQLException;
! import java.sql.Statement;
/**
***************
*** 39,92 ****
public abstract class AbstractDatabaseConnection implements IDatabaseConnection
{
! static final String STATEMENT_FACTORY = "dbunit.statement.factory";
! static final String DEFAULT_FACTORY =
! "org.dbunit.database.statement.PreparedStatementFactory";
! private final IStatementFactory _statementFactory;
! private final IDataTypeFactory _dataTypeFactory = new DefaultDataTypeFactory();
private IDataSet _dataSet = null;
public AbstractDatabaseConnection()
{
! String className = System.getProperty(STATEMENT_FACTORY, DEFAULT_FACTORY);
! try
! {
! Constructor constructor = Class.forName(className).getConstructor(new Class[0]);
! _statementFactory = (IStatementFactory)constructor.newInstance(new Object[0]);
! }
! catch (NoSuchMethodException e)
! {
! throw new DatabaseUnitRuntimeException(e);
! }
! catch (ClassNotFoundException e)
! {
! throw new DatabaseUnitRuntimeException(e);
! }
! catch (InstantiationException e)
! {
! throw new DatabaseUnitRuntimeException(e);
! }
! catch (IllegalAccessException e)
! {
! throw new DatabaseUnitRuntimeException(e);
! }
! catch (IllegalArgumentException e)
! {
! throw new DatabaseUnitRuntimeException(e);
! }
! catch (InvocationTargetException e)
! {
! throw new DatabaseUnitRuntimeException(e);
! }
! }
!
! public AbstractDatabaseConnection(IStatementFactory factory)
! {
! _statementFactory = factory;
! }
!
! protected IDataTypeFactory getDataTypeFactory()
! {
! return _dataTypeFactory;
}
--- 41,56 ----
public abstract class AbstractDatabaseConnection implements IDatabaseConnection
{
! // static final String STATEMENT_FACTORY = "dbunit.statement.factory";
! // static final String DEFAULT_FACTORY =
! // "org.dbunit.database.statement.PreparedStatementFactory";
! // private final IStatementFactory _statementFactory;
! // private final IDataTypeFactory _dataTypeFactory = new DefaultDataTypeFactory();
private IDataSet _dataSet = null;
+ private DatabaseConfig _databaseConfig;
public AbstractDatabaseConnection()
{
! _databaseConfig = new DatabaseConfig();
}
***************
*** 98,102 ****
if (_dataSet == null)
{
! _dataSet = new DatabaseDataSet(this, getDataTypeFactory());
}
--- 62,66 ----
if (_dataSet == null)
{
! _dataSet = new DatabaseDataSet(this);
}
***************
*** 119,124 ****
try
{
ITableMetaData metaData = AbstractResultSetTable.createTableMetaData(
! resultName, resultSet, getDataTypeFactory());
return new CachedResultSetTable(metaData, resultSet);
}
--- 83,90 ----
try
{
+ IDataTypeFactory typeFactory = (IDataTypeFactory)_databaseConfig.getProperty(
+ DatabaseConfig.PROPERTY_DATATYPE_FACTORY);
ITableMetaData metaData = AbstractResultSetTable.createTableMetaData(
! resultName, resultSet, typeFactory);
return new CachedResultSetTable(metaData, resultSet);
}
***************
*** 170,176 ****
}
public IStatementFactory getStatementFactory()
{
! return _statementFactory;
}
--- 136,148 ----
}
+ public DatabaseConfig getConfig()
+ {
+ return _databaseConfig;
+ }
+
public IStatementFactory getStatementFactory()
{
! return (IStatementFactory)_databaseConfig.getProperty(
! DatabaseConfig.PROPERTY_STATEMENT_FACTORY);
}
Index: AbstractResultSetTable.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/AbstractResultSetTable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AbstractResultSetTable.java 19 May 2003 22:09:20 -0000 1.2
--- AbstractResultSetTable.java 1 Aug 2003 02:29:10 -0000 1.3
***************
*** 79,82 ****
--- 79,84 ----
{
Connection jdbcConnection = connection.getConnection();
+ String escapePattern = (String)connection.getConfig().getProperty(
+ DatabaseConfig.PROPERTY_ESCAPE_PATTERN);
_statement = jdbcConnection.createStatement();
// _statement.setFetchDirection(ResultSet.FETCH_FORWARD);
***************
*** 85,89 ****
{
String schema = connection.getSchema();
! String selectStatement = getSelectStatement(schema, metaData);
_resultSet = _statement.executeQuery(selectStatement);
_metaData = metaData;
--- 87,91 ----
{
String schema = connection.getSchema();
! String selectStatement = getSelectStatement(schema, metaData, escapePattern);
_resultSet = _statement.executeQuery(selectStatement);
_metaData = metaData;
***************
*** 97,104 ****
}
! static String getSelectStatement(String schema, ITableMetaData metaData)
throws DataSetException
{
! return DatabaseDataSet.getSelectStatement(schema, metaData);
}
--- 99,106 ----
}
! static String getSelectStatement(String schema, ITableMetaData metaData, String escapePattern)
throws DataSetException
{
! return DatabaseDataSet.getSelectStatement(schema, metaData, escapePattern);
}
Index: CachedResultSetTable.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/CachedResultSetTable.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CachedResultSetTable.java 15 Jun 2003 15:38:49 -0000 1.10
--- CachedResultSetTable.java 1 Aug 2003 02:29:10 -0000 1.11
***************
*** 26,30 ****
import org.dbunit.dataset.DataSetException;
import org.dbunit.dataset.ITableMetaData;
- import org.dbunit.dataset.datatype.IDataTypeFactory;
import java.sql.ResultSet;
--- 26,29 ----
Index: DatabaseDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/DatabaseDataSet.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** DatabaseDataSet.java 15 Jun 2003 15:38:49 -0000 1.23
--- DatabaseDataSet.java 1 Aug 2003 02:29:10 -0000 1.24
***************
*** 31,35 ****
import org.dbunit.dataset.ITableMetaData;
import org.dbunit.dataset.NoSuchTableException;
- import org.dbunit.dataset.datatype.IDataTypeFactory;
import java.sql.Connection;
--- 31,34 ----
***************
*** 37,41 ****
import java.sql.ResultSet;
import java.sql.SQLException;
- import java.sql.Statement;
import java.util.ArrayList;
import java.util.HashMap;
--- 36,39 ----
***************
*** 50,69 ****
public class DatabaseDataSet extends AbstractDataSet
{
- static final String QUALIFIED_TABLE_NAMES =
- "dbunit.qualified.table.names";
private static final String[] TABLE_TYPE = {"TABLE"};
private final IDatabaseConnection _connection;
- private final IDataTypeFactory _dataTypeFactory;
private final Map _tableMap = new HashMap();
private List _nameList = null;
! DatabaseDataSet(IDatabaseConnection connection, IDataTypeFactory dataTypeFactory) throws SQLException
{
_connection = connection;
- _dataTypeFactory = dataTypeFactory;
}
! static String getSelectStatement(String schema, ITableMetaData metaData)
throws DataSetException
{
--- 48,63 ----
public class DatabaseDataSet extends AbstractDataSet
{
private static final String[] TABLE_TYPE = {"TABLE"};
private final IDatabaseConnection _connection;
private final Map _tableMap = new HashMap();
private List _nameList = null;
! DatabaseDataSet(IDatabaseConnection connection) throws SQLException
{
_connection = connection;
}
! static String getSelectStatement(String schema, ITableMetaData metaData, String escapePattern)
throws DataSetException
{
***************
*** 81,85 ****
}
String columnName = DataSetUtils.getQualifiedName(null,
! columns[i].getColumnName(), true);
sqlBuffer.append(columnName);
}
--- 75,79 ----
}
String columnName = DataSetUtils.getQualifiedName(null,
! columns[i].getColumnName(), escapePattern);
sqlBuffer.append(columnName);
}
***************
*** 88,92 ****
sqlBuffer.append(" from ");
sqlBuffer.append(DataSetUtils.getQualifiedName(schema,
! metaData.getTableName(), true));
// order by
--- 82,86 ----
sqlBuffer.append(" from ");
sqlBuffer.append(DataSetUtils.getQualifiedName(schema,
! metaData.getTableName(), escapePattern));
// order by
***************
*** 110,114 ****
private String getQualifiedName(String prefix, String name)
{
! if (System.getProperty(QUALIFIED_TABLE_NAMES, "false").equals("true"))
{
return DataSetUtils.getQualifiedName(prefix, name);
--- 104,110 ----
private String getQualifiedName(String prefix, String name)
{
! DatabaseConfig config = _connection.getConfig();
! boolean feature = config.getFeature(DatabaseConfig.FEATURE_QUALIFIED_TABLE_NAMES);
! if (feature)
{
return DataSetUtils.getQualifiedName(prefix, name);
***************
*** 220,224 ****
// Create metadata and cache it
metaData = new DatabaseTableMetaData(
! databaseTableName, _connection, _dataTypeFactory);
_tableMap.put(upperTableName, metaData);
break;
--- 216,220 ----
// Create metadata and cache it
metaData = new DatabaseTableMetaData(
! databaseTableName, _connection);
_tableMap.put(upperTableName, metaData);
break;
***************
*** 237,244 ****
ITableMetaData metaData = getTableMetaData(tableName);
! // Use ForwardOnlyResultSetTable to export big tables.
! // TODO: Make this configurable
! return new CachedResultSetTable(metaData, _connection);
! // return new ForwardOnlyResultSetTable(metaData, _connection);
}
catch (SQLException e)
--- 233,240 ----
ITableMetaData metaData = getTableMetaData(tableName);
! DatabaseConfig config = _connection.getConfig();
! IResultSetTableFactory factory = (IResultSetTableFactory)config.getProperty(
! DatabaseConfig.PROPERTY_RESULTSET_TABLE_FACTORY);
! return factory.createTable(metaData, _connection);
}
catch (SQLException e)
Index: DatabaseTableMetaData.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/DatabaseTableMetaData.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DatabaseTableMetaData.java 19 May 2003 22:09:20 -0000 1.15
--- DatabaseTableMetaData.java 1 Aug 2003 02:29:11 -0000 1.16
***************
*** 47,60 ****
private final String _tableName;
private final IDatabaseConnection _connection;
- private final IDataTypeFactory _dataTypeFactory;
private Column[] _columns;
private Column[] _primaryKeys;
! DatabaseTableMetaData(String tableName, IDatabaseConnection connection,
! IDataTypeFactory dataTypeFactory)
{
_tableName = tableName;
_connection = connection;
- _dataTypeFactory = dataTypeFactory;
}
--- 47,58 ----
private final String _tableName;
private final IDatabaseConnection _connection;
private Column[] _columns;
private Column[] _primaryKeys;
! DatabaseTableMetaData(String tableName, IDatabaseConnection connection
! )
{
_tableName = tableName;
_connection = connection;
}
***************
*** 164,167 ****
--- 162,169 ----
try
{
+ DatabaseConfig config = _connection.getConfig();
+ IDataTypeFactory dataTypeFactory = (IDataTypeFactory)config.getProperty(
+ DatabaseConfig.PROPERTY_DATATYPE_FACTORY);
+
List columnList = new ArrayList();
while (resultSet.next())
***************
*** 175,179 ****
// Convert SQL type to DataType
DataType dataType =
! _dataTypeFactory.createDataType(sqlType, sqlTypeName);
if (dataType != DataType.UNKNOWN)
{
--- 177,181 ----
// Convert SQL type to DataType
DataType dataType =
! dataTypeFactory.createDataType(sqlType, sqlTypeName);
if (dataType != DataType.UNKNOWN)
{
Index: IDatabaseConnection.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/IDatabaseConnection.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** IDatabaseConnection.java 5 Nov 2002 01:35:08 -0000 1.12
--- IDatabaseConnection.java 1 Aug 2003 02:29:11 -0000 1.13
***************
*** 90,93 ****
--- 90,101 ----
public int getRowCount(String tableName, String whereClause) throws SQLException;
+ /**
+ * Returns this connection database configuration
+ */
+ public DatabaseConfig getConfig();
+
+ /**
+ * @deprecated Use {@link #getConfig}
+ */
public IStatementFactory getStatementFactory();
}
|
|
From: <mla...@us...> - 2003-08-01 02:58:39
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/ext/mssqlserver
In directory sc8-pr-cvs1:/tmp/cvs-serv8252/java/org/dbunit/ext/mssqlserver
Modified Files:
MsSqlConnection.java
Log Message:
Added DatabaseConfig class to query and set feature flags and property values for an IDatabaseConnection. No more usage of System properties. See updated properties.html documentation for more details.
Index: MsSqlConnection.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ext/mssqlserver/MsSqlConnection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MsSqlConnection.java 20 May 2003 01:01:20 -0000 1.1
--- MsSqlConnection.java 1 Aug 2003 02:29:11 -0000 1.2
***************
*** 21,28 ****
package org.dbunit.ext.mssqlserver;
import org.dbunit.database.DatabaseConnection;
import org.dbunit.dataset.FilteredDataSet;
import org.dbunit.dataset.IDataSet;
- import org.dbunit.dataset.datatype.IDataTypeFactory;
import org.dbunit.dataset.filter.ExcludeTableFilter;
import org.dbunit.dataset.filter.ITableFilter;
--- 21,28 ----
package org.dbunit.ext.mssqlserver;
+ import org.dbunit.database.DatabaseConfig;
import org.dbunit.database.DatabaseConnection;
import org.dbunit.dataset.FilteredDataSet;
import org.dbunit.dataset.IDataSet;
import org.dbunit.dataset.filter.ExcludeTableFilter;
import org.dbunit.dataset.filter.ITableFilter;
***************
*** 38,42 ****
public class MsSqlConnection extends DatabaseConnection
{
- private final IDataTypeFactory _dataTypeFactory = new MsSqlDataTypeFactory();
private final ITableFilter _filter = new ExcludeTableFilter(
new String[] {"dtproperties"});
--- 38,41 ----
***************
*** 51,54 ****
--- 50,55 ----
{
super(connection, schema);
+ getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY,
+ new MsSqlDataTypeFactory());
}
***************
*** 61,64 ****
--- 62,67 ----
{
super(connection);
+ getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY,
+ new MsSqlDataTypeFactory());
}
***************
*** 76,87 ****
IDataSet dataSet = super.createDataSet(tableNames);
return new FilteredDataSet(_filter, dataSet);
- }
-
- ////////////////////////////////////////////////////////////////////////////
- // AbstractDatabaseConnection
-
- protected IDataTypeFactory getDataTypeFactory()
- {
- return _dataTypeFactory;
}
}
--- 79,82 ----
|
|
From: <mla...@us...> - 2003-08-01 02:58:39
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset
In directory sc8-pr-cvs1:/tmp/cvs-serv8252/java/org/dbunit/dataset
Modified Files:
DataSetUtils.java
Log Message:
Added DatabaseConfig class to query and set feature flags and property values for an IDatabaseConnection. No more usage of System properties. See updated properties.html documentation for more details.
Index: DataSetUtils.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/DataSetUtils.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** DataSetUtils.java 9 Apr 2003 22:52:09 -0000 1.16
--- DataSetUtils.java 1 Aug 2003 02:29:11 -0000 1.17
***************
*** 88,102 ****
public static String getQualifiedName(String prefix, String name)
{
! return getQualifiedName(prefix, name, false);
}
public static String getQualifiedName(String prefix, String name,
! boolean escape)
{
! if (escape)
{
! String pattern = System.getProperty("dbunit.name.escapePattern");
! prefix = getEscapedName(prefix, pattern);
! name = getEscapedName(name, pattern);
}
--- 88,101 ----
public static String getQualifiedName(String prefix, String name)
{
! return getQualifiedName(prefix, name, null);
}
public static String getQualifiedName(String prefix, String name,
! String escapePattern)
{
! if (escapePattern != null)
{
! prefix = getEscapedName(prefix, escapePattern);
! name = getEscapedName(name, escapePattern);
}
***************
*** 109,124 ****
}
! public static String getEscapedName(String name, String pattern)
{
! if (name == null || pattern == null)
{
return name;
}
! int index = pattern.indexOf("?");
if (index >=0 )
{
! String prefix = pattern.substring(0, index);
! String suffix = pattern.substring(index + 1);
return prefix + name + suffix;
--- 108,123 ----
}
! public static String getEscapedName(String name, String escapePattern)
{
! if (name == null || escapePattern == null)
{
return name;
}
! int index = escapePattern.indexOf("?");
if (index >=0 )
{
! String prefix = escapePattern.substring(0, index);
! String suffix = escapePattern.substring(index + 1);
return prefix + name + suffix;
|
|
From: <mla...@us...> - 2003-08-01 02:58:39
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/mssqlserver
In directory sc8-pr-cvs1:/tmp/cvs-serv8252/java/org/dbunit/operation/mssqlserver
Modified Files:
InsertIdentityOperation.java
Log Message:
Added DatabaseConfig class to query and set feature flags and property values for an IDatabaseConnection. No more usage of System properties. See updated properties.html documentation for more details.
Index: InsertIdentityOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/mssqlserver/InsertIdentityOperation.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** InsertIdentityOperation.java 13 Apr 2003 01:46:57 -0000 1.16
--- InsertIdentityOperation.java 1 Aug 2003 02:29:11 -0000 1.17
***************
*** 126,131 ****
StringBuffer sqlBuffer = new StringBuffer(128);
sqlBuffer.append("SET IDENTITY_INSERT ");
! sqlBuffer.append(DataSetUtils.getQualifiedName(
! schemaName, metaData.getTableName(), true));
sqlBuffer.append(" ON");
statement.execute(sqlBuffer.toString());
--- 126,131 ----
StringBuffer sqlBuffer = new StringBuffer(128);
sqlBuffer.append("SET IDENTITY_INSERT ");
! sqlBuffer.append(getQualifiedName(connection.getSchema(),
! metaData.getTableName(), connection));
sqlBuffer.append(" ON");
statement.execute(sqlBuffer.toString());
***************
*** 143,148 ****
StringBuffer sqlBuffer = new StringBuffer(128);
sqlBuffer.append("SET IDENTITY_INSERT ");
! sqlBuffer.append(DataSetUtils.getQualifiedName(
! schemaName, metaData.getTableName(), true));
sqlBuffer.append(" OFF");
statement.execute(sqlBuffer.toString());
--- 143,148 ----
StringBuffer sqlBuffer = new StringBuffer(128);
sqlBuffer.append("SET IDENTITY_INSERT ");
! sqlBuffer.append(getQualifiedName(connection.getSchema(),
! metaData.getTableName(), connection));
sqlBuffer.append(" OFF");
statement.execute(sqlBuffer.toString());
|
|
From: <mla...@us...> - 2003-08-01 02:58:38
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/database
In directory sc8-pr-cvs1:/tmp/cvs-serv8252/test/org/dbunit/database
Modified Files:
DatabaseDataSetTest.java DatabaseTableMetaDataTest.java
MockDatabaseConnection.java
Log Message:
Added DatabaseConfig class to query and set feature flags and property values for an IDatabaseConnection. No more usage of System properties. See updated properties.html documentation for more details.
Index: DatabaseDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/DatabaseDataSetTest.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** DatabaseDataSetTest.java 13 Apr 2003 02:40:11 -0000 1.21
--- DatabaseDataSetTest.java 1 Aug 2003 02:29:12 -0000 1.22
***************
*** 38,43 ****
public class DatabaseDataSetTest extends AbstractDataSetTest
{
- private static final String ESCAPE_PATTERN_KEY = "dbunit.name.escapePattern";
-
private IDatabaseConnection _connection;
--- 38,41 ----
***************
*** 97,101 ****
ITableMetaData metaData = new DefaultTableMetaData(tableName, columns);
! String sql = DatabaseDataSet.getSelectStatement(schemaName, metaData);
assertEquals("select statement", expected, sql);
}
--- 95,99 ----
ITableMetaData metaData = new DefaultTableMetaData(tableName, columns);
! String sql = DatabaseDataSet.getSelectStatement(schemaName, metaData, null);
assertEquals("select statement", expected, sql);
}
***************
*** 112,126 ****
String expected = "select 'c1', 'c2', 'c3' from 'schema'.'table'";
! try
! {
! System.setProperty(ESCAPE_PATTERN_KEY, "'?'");
! ITableMetaData metaData = new DefaultTableMetaData(tableName, columns);
! String sql = DatabaseDataSet.getSelectStatement(schemaName, metaData);
! assertEquals("select statement", expected, sql);
! }
! finally
! {
! System.getProperties().remove(ESCAPE_PATTERN_KEY);
! }
}
--- 110,116 ----
String expected = "select 'c1', 'c2', 'c3' from 'schema'.'table'";
! ITableMetaData metaData = new DefaultTableMetaData(tableName, columns);
! String sql = DatabaseDataSet.getSelectStatement(schemaName, metaData, "'?'");
! assertEquals("select statement", expected, sql);
}
***************
*** 137,141 ****
ITableMetaData metaData = new DefaultTableMetaData(tableName, columns, columns);
! String sql = DatabaseDataSet.getSelectStatement(schemaName, metaData);
assertEquals("select statement", expected, sql);
}
--- 127,131 ----
ITableMetaData metaData = new DefaultTableMetaData(tableName, columns, columns);
! String sql = DatabaseDataSet.getSelectStatement(schemaName, metaData, null);
assertEquals("select statement", expected, sql);
}
***************
*** 145,171 ****
String[] expectedNames = getExpectedNames();
! try
! {
! System.setProperty(DatabaseDataSet.QUALIFIED_TABLE_NAMES, "true");
!
! IDatabaseConnection connection = new DatabaseConnection(
! _connection.getConnection(), _connection.getSchema());
! IDataSet dataSet = connection.createDataSet();
! String[] actualNames = dataSet.getTableNames();
! // sort(actualNames);
! assertEquals("name count", expectedNames.length, actualNames.length);
! for (int i = 0; i < actualNames.length; i++)
! {
! String expected = DataSetUtils.getQualifiedName(
! _connection.getSchema(), expectedNames[i]);
! String actual = actualNames[i];
! assertEquals("name", expected, actual);
! }
! }
! finally
{
! System.setProperty(DatabaseDataSet.QUALIFIED_TABLE_NAMES, "false");
}
}
--- 135,152 ----
String[] expectedNames = getExpectedNames();
! IDatabaseConnection connection = new DatabaseConnection(
! _connection.getConnection(), _connection.getSchema());
! connection.getConfig().setFeature(DatabaseConfig.FEATURE_QUALIFIED_TABLE_NAMES, true);
! IDataSet dataSet = connection.createDataSet();
! String[] actualNames = dataSet.getTableNames();
! assertEquals("name count", expectedNames.length, actualNames.length);
! for (int i = 0; i < actualNames.length; i++)
{
! String expected = DataSetUtils.getQualifiedName(
! _connection.getSchema(), expectedNames[i]);
! String actual = actualNames[i];
! assertEquals("name", expected, actual);
}
}
***************
*** 177,199 ****
String[] expected = {"COLUMN0", "COLUMN1", "COLUMN2", "COLUMN3"};
! try
! {
! System.setProperty(DatabaseDataSet.QUALIFIED_TABLE_NAMES, "true");
!
! IDatabaseConnection connection = new DatabaseConnection(
! _connection.getConnection(), _connection.getSchema());
! ITableMetaData metaData = connection.createDataSet().getTableMetaData(tableName);
! Column[] columns = metaData.getColumns();
! assertEquals("column count", expected.length, columns.length);
! for (int i = 0; i < columns.length; i++)
! {
! assertEquals("column name", expected[i], columns[i].getColumnName());
! }
! }
! finally
{
! System.setProperty(DatabaseDataSet.QUALIFIED_TABLE_NAMES, "false");
}
}
--- 158,173 ----
String[] expected = {"COLUMN0", "COLUMN1", "COLUMN2", "COLUMN3"};
! IDatabaseConnection connection = new DatabaseConnection(
! _connection.getConnection(), _connection.getSchema());
! connection.getConfig().setFeature(
! DatabaseConfig.FEATURE_QUALIFIED_TABLE_NAMES, true);
! ITableMetaData metaData = connection.createDataSet().getTableMetaData(tableName);
! Column[] columns = metaData.getColumns();
! assertEquals("column count", expected.length, columns.length);
! for (int i = 0; i < columns.length; i++)
{
! assertEquals("column name", expected[i], columns[i].getColumnName());
}
}
***************
*** 205,227 ****
String[] expected = {"PK0", "PK1", "PK2"};
! try
! {
! System.setProperty(DatabaseDataSet.QUALIFIED_TABLE_NAMES, "true");
!
! IDatabaseConnection connection = new DatabaseConnection(
! _connection.getConnection(), _connection.getSchema());
! ITableMetaData metaData = connection.createDataSet().getTableMetaData(tableName);
! Column[] columns = metaData.getPrimaryKeys();
! assertEquals("column count", expected.length, columns.length);
! for (int i = 0; i < columns.length; i++)
! {
! assertEquals("column name", expected[i], columns[i].getColumnName());
! }
! }
! finally
{
! System.setProperty(DatabaseDataSet.QUALIFIED_TABLE_NAMES, "false");
}
}
--- 179,194 ----
String[] expected = {"PK0", "PK1", "PK2"};
! IDatabaseConnection connection = new DatabaseConnection(
! _connection.getConnection(), _connection.getSchema());
! connection.getConfig().setFeature(
! DatabaseConfig.FEATURE_QUALIFIED_TABLE_NAMES, true);
! ITableMetaData metaData = connection.createDataSet().getTableMetaData(tableName);
! Column[] columns = metaData.getPrimaryKeys();
! assertEquals("column count", expected.length, columns.length);
! for (int i = 0; i < columns.length; i++)
{
! assertEquals("column name", expected[i], columns[i].getColumnName());
}
}
Index: DatabaseTableMetaDataTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/DatabaseTableMetaDataTest.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** DatabaseTableMetaDataTest.java 19 May 2003 22:09:21 -0000 1.16
--- DatabaseTableMetaDataTest.java 1 Aug 2003 02:29:12 -0000 1.17
***************
*** 77,81 ****
ITableMetaData metaData = new DatabaseTableMetaData(tableName,
! getConnection(), new DefaultDataTypeFactory());
try
{
--- 77,81 ----
ITableMetaData metaData = new DatabaseTableMetaData(tableName,
! getConnection());
try
{
Index: MockDatabaseConnection.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/MockDatabaseConnection.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MockDatabaseConnection.java 4 Jul 2002 21:33:42 -0000 1.7
--- MockDatabaseConnection.java 1 Aug 2003 02:29:12 -0000 1.8
***************
*** 44,48 ****
private String _schema;
private IDataSet _dataSet;
! private IStatementFactory _statementFactory;
public void setupSchema(String schema)
--- 44,49 ----
private String _schema;
private IDataSet _dataSet;
! // private IStatementFactory _statementFactory;
! private DatabaseConfig _databaseConfig = new DatabaseConfig();
public void setupSchema(String schema)
***************
*** 73,79 ****
public void setupStatementFactory(IStatementFactory statementFactory)
{
! _statementFactory = statementFactory;
}
public void setExpectedCloseCalls(int callsCount)
{
--- 74,85 ----
public void setupStatementFactory(IStatementFactory statementFactory)
{
! _databaseConfig.setProperty(DatabaseConfig.PROPERTY_STATEMENT_FACTORY, statementFactory);
}
+ // public void setupEscapePattern(String escapePattern)
+ // {
+ // _databaseConfig.setProperty(DatabaseConfig.PROPERTY_ESCAPE_PATTERN, escapePattern);
+ // }
+ //
public void setExpectedCloseCalls(int callsCount)
{
***************
*** 135,139 ****
public IStatementFactory getStatementFactory()
{
! return _statementFactory;
}
}
--- 141,151 ----
public IStatementFactory getStatementFactory()
{
! return (IStatementFactory)_databaseConfig.getProperty(
! DatabaseConfig.PROPERTY_STATEMENT_FACTORY);
! }
!
! public DatabaseConfig getConfig()
! {
! return _databaseConfig;
}
}
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation
In directory sc8-pr-cvs1:/tmp/cvs-serv8252/test/org/dbunit/operation
Modified Files:
DeleteAllOperationTest.java DeleteOperationTest.java
InsertOperationTest.java UpdateOperationTest.java
Log Message:
Added DatabaseConfig class to query and set feature flags and property values for an IDatabaseConnection. No more usage of System properties. See updated properties.html documentation for more details.
Index: DeleteAllOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/DeleteAllOperationTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** DeleteAllOperationTest.java 13 Apr 2003 17:46:11 -0000 1.13
--- DeleteAllOperationTest.java 1 Aug 2003 02:29:12 -0000 1.14
***************
*** 25,28 ****
--- 25,29 ----
import org.dbunit.AbstractDatabaseTest;
import org.dbunit.database.MockDatabaseConnection;
+ import org.dbunit.database.DatabaseConfig;
import org.dbunit.database.statement.MockBatchStatement;
import org.dbunit.database.statement.MockStatementFactory;
***************
*** 117,129 ****
// execute operation
! setEscapePattern("'?'");
! try
! {
! getDeleteAllOperation().execute(connection, dataSet);
! }
! finally
! {
! setEscapePattern(null);
! }
statement.verify();
--- 118,124 ----
// execute operation
! connection.getConfig().setProperty(
! DatabaseConfig.PROPERTY_ESCAPE_PATTERN, "'?'");
! getDeleteAllOperation().execute(connection, dataSet);
statement.verify();
Index: DeleteOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/DeleteOperationTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DeleteOperationTest.java 1 Apr 2003 21:16:31 -0000 1.15
--- DeleteOperationTest.java 1 Aug 2003 02:29:12 -0000 1.16
***************
*** 25,28 ****
--- 25,29 ----
import org.dbunit.AbstractDatabaseTest;
import org.dbunit.database.MockDatabaseConnection;
+ import org.dbunit.database.DatabaseConfig;
import org.dbunit.database.statement.MockBatchStatement;
import org.dbunit.database.statement.MockStatementFactory;
***************
*** 140,152 ****
// execute operation
! setEscapePattern("[?]");
! try
! {
! new DeleteOperation().execute(connection, dataSet);
! }
! finally
! {
! setEscapePattern(null);
! }
statement.verify();
--- 141,147 ----
// execute operation
! connection.getConfig().setProperty(
! DatabaseConfig.PROPERTY_ESCAPE_PATTERN, "[?]");
! new DeleteOperation().execute(connection, dataSet);
statement.verify();
***************
*** 235,239 ****
{
new DeleteOperation().getOperationData(
! _connection.getSchema(), metaData);
fail("Should throw a NoPrimaryKeyException");
}
--- 230,234 ----
{
new DeleteOperation().getOperationData(
! metaData, _connection);
fail("Should throw a NoPrimaryKeyException");
}
Index: InsertOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/InsertOperationTest.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** InsertOperationTest.java 13 Apr 2003 16:49:59 -0000 1.20
--- InsertOperationTest.java 1 Aug 2003 02:29:12 -0000 1.21
***************
*** 28,31 ****
--- 28,32 ----
import org.dbunit.TestFeature;
import org.dbunit.database.MockDatabaseConnection;
+ import org.dbunit.database.DatabaseConfig;
import org.dbunit.database.statement.MockBatchStatement;
import org.dbunit.database.statement.MockStatementFactory;
***************
*** 146,158 ****
// execute operation
! setEscapePattern("'?'");
! try
! {
! new InsertOperation().execute(connection, dataSet);
! }
! finally
! {
! setEscapePattern(null);
! }
statement.verify();
--- 147,153 ----
// execute operation
! connection.getConfig().setProperty(
! DatabaseConfig.PROPERTY_ESCAPE_PATTERN, "'?'");
! new InsertOperation().execute(connection, dataSet);
statement.verify();
Index: UpdateOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/UpdateOperationTest.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** UpdateOperationTest.java 13 Apr 2003 16:49:59 -0000 1.20
--- UpdateOperationTest.java 1 Aug 2003 02:29:12 -0000 1.21
***************
*** 28,31 ****
--- 28,32 ----
import org.dbunit.TestFeature;
import org.dbunit.database.MockDatabaseConnection;
+ import org.dbunit.database.DatabaseConfig;
import org.dbunit.database.statement.MockBatchStatement;
import org.dbunit.database.statement.MockStatementFactory;
***************
*** 169,181 ****
// execute operation
! setEscapePattern("[?]");
! try
! {
! new UpdateOperation().execute(connection, dataSet);
! }
! finally
! {
! setEscapePattern(null);
! }
statement.verify();
--- 170,176 ----
// execute operation
! connection.getConfig().setProperty(
! DatabaseConfig.PROPERTY_ESCAPE_PATTERN, "[?]");
! new UpdateOperation().execute(connection, dataSet);
statement.verify();
|
|
From: <mla...@us...> - 2003-08-01 02:44:23
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset
In directory sc8-pr-cvs1:/tmp/cvs-serv8252/test/org/dbunit/dataset
Modified Files:
DataSetUtilsTest.java
Log Message:
Added DatabaseConfig class to query and set feature flags and property values for an IDatabaseConnection. No more usage of System properties. See updated properties.html documentation for more details.
Index: DataSetUtilsTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/DataSetUtilsTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** DataSetUtilsTest.java 15 Feb 2003 05:42:43 -0000 1.13
--- DataSetUtilsTest.java 1 Aug 2003 02:29:12 -0000 1.14
***************
*** 59,66 ****
DataSetUtils.getQualifiedName("prefix", "name"));
- System.setProperty("dbunit.name.escapePattern", "[?]");
assertEquals("escaped prefix + name", "[prefix].[name]",
! DataSetUtils.getQualifiedName("prefix", "name", true));
! System.getProperties().remove("dbunit.name.escapePattern");
}
--- 59,64 ----
DataSetUtils.getQualifiedName("prefix", "name"));
assertEquals("escaped prefix + name", "[prefix].[name]",
! DataSetUtils.getQualifiedName("prefix", "name", "[?]"));
}
|
|
From: <mla...@us...> - 2003-08-01 02:39:25
|
Update of /cvsroot/dbunit/dbunit/docs
In directory sc8-pr-cvs1:/tmp/cvs-serv8387/docs
Modified Files:
properties.html
Log Message:
Added DatabaseConfig class to query and set feature flags and property values for an IDatabaseConnection. No more usage of System properties. See updated properties.html documentation for more details.
Index: properties.html
===================================================================
RCS file: /cvsroot/dbunit/dbunit/docs/properties.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** properties.html 24 Feb 2003 01:40:18 -0000 1.3
--- properties.html 1 Aug 2003 02:29:27 -0000 1.4
***************
*** 44,116 ****
</td>
<td class="body" valign="top"> <!-- #BeginEditable "body" -->
! <h2>System properties</h2>
! <p>You can modify the behavior of DbUnit with the following system properties:</p>
! <h3>dbunit.database.supportBatchStatement</h3>
<table border="1">
<tr>
<td>Description</td>
! <td>This property allows disabling the usage of batch statement by DbUnit
! even if your database report supporting it. This property cannot be
! used to force the usage of batch statement if your database does not
! support it.</td>
</tr>
<tr>
! <td>Type</td>
! <td>java.lang.String</td>
</tr>
<tr>
! <td>Possible Values</td>
! <td>"true" or "false"</td>
</tr>
<tr>
! <td>Default Value</td>
! <td>"true"</td>
</tr>
</table>
! <h3><br>
! dbunit.qualified.table.names</h3>
<table border="1">
<tr>
<td>Description</td>
! <td>This property enable or disable multiple schemas support. If enabled,
! Dbunit works with table names qualified by their schema name using
! this format: SCHEMA.TABLE. Also see <a href="howto.html#multipleschema">how
! to import/export with multiple schema</a>. </td>
</tr>
<tr>
! <td>Type</td>
! <td>java.lang.String</td>
</tr>
<tr>
! <td>Possible Values</td>
! <td>"true" or "false"</td>
</tr>
<tr>
! <td>Default Value</td>
! <td>"false"</td>
</tr>
</table>
! <h3><a name=escapepattern></a>dbunit.name.escapePattern <font color="#FF0000">(new)</font></h3>
<table border="1">
<tr>
<td>Description</td>
! <td>This property allows schema, table and column names escaping. The
! property value is an escape pattern where the ? is replaced by the
! name. For example, the pattern "[?]" is expanded as "[MY_NAME]"
! for a table named "MY_TABLE".<br>
! Attention this feature is not compatible with the qualified names
! name feature!</td>
</tr>
<tr>
! <td>Type</td>
! <td>java.lang.String</td>
</tr>
<tr>
! <td>Possible Values</td>
! <td>See description.</td>
</tr>
<tr>
! <td>Default Value</td>
! <td>none</td>
</tr>
</table>
--- 44,177 ----
</td>
<td class="body" valign="top"> <!-- #BeginEditable "body" -->
! <p>DbUnit does use System properties anymore since version 1.6/2.0. DbUnit
! use a configuration object, <a class=code>DatabaseConfig</a>, to query
! and set feature flags and property values for a <a class=code>IDatabaseConnection</a>.
! It is possible to change DbUnit behaviors, such as using batched statements
! or not, using the <a class=code>getFeature</a>, <a class=code>setFeature</a>,
! <a class=code>getProperty</a>, and <a class=code>setProperty</a> methods
! of <a class=code>DatabaseConfig</a>: </p>
! <pre> String id = "http://www.dbunit.org/features/batchedStatements";
! DatabaseConfig config = connection.getConfig();
! if (config.getFeature(id))
! {
! System.out.println("Batched statements is enabled.");
! }
! else
! {
! System.out.println("Batched statements is disabled.");
! }
! </pre>
! While feature flags are always boolean, property values are arbitrary objects.
! <br>
! Here is the complete list of standard DbUnit feature flags and properties.
! <br>
! <h2>Feature Flags</h2>
<table border="1">
<tr>
+ <td>Feature ID</td>
+ <td>http://www.dbunit.org/features/batchedStatements</td>
+ </tr>
+ <tr>
+ <td>Default</td>
+ <td>false</td>
+ </tr>
+ <tr>
<td>Description</td>
! <td>Enable or disable multiple schemas support. If enabled, Dbunit access
! tables with names fully qualified by schema using this format: SCHEMA.TABLE.
! Also see <a href="howto.html#multipleschema">how to import/export
! with multiple schema</a>. </td>
</tr>
+ </table>
+ <p> <a name=qualifiedtablenames></a>
+ <table border="1">
<tr>
! <td>Feature ID</td>
! <td>http://www.dbunit.org/features/qualifiedTableNames</td>
</tr>
<tr>
! <td>Default</td>
! <td>false (since 1.5.5)</td>
</tr>
<tr>
! <td>Description</td>
! <td>Enable or disable usage of JDBC batched statement by DbUnit. </td>
! </tr>
! <tr>
! <td>Note</td>
! <td>This feature is not compatible with the <a href=#escapepattern>escape pattern</a> property.</td>
</tr>
</table>
! <h2>Properties</h2>
! <p> <a name=escapepattern></a>
<table border="1">
<tr>
+ <td>Property ID</td>
+ <td>http://www.dbunit.org/properties/escapePattern</td>
+ </tr>
+ <tr>
+ <td>Default</td>
+ <td><i>none</i></td>
+ </tr>
+ <tr>
<td>Description</td>
! <td>Allows schema, table and column names escaping. The property value
! is an escape pattern where the ? is replaced by the name. For example,
! the pattern "[?]" is expanded as "[MY_TABLE]" for a table named "MY_TABLE".
! </td>
</tr>
<tr>
! <td>Note</td>
! <td>This property is not compatible with the <a href=#qualifiedtablenames>qualified
! table names</a> feature.</td>
</tr>
+ </table>
+ <p>
+ <table border="1">
<tr>
! <td>Property ID</td>
! <td>http://www.dbunit.org/properties/datatypeFactory</td>
</tr>
<tr>
! <td>Default</td>
! <td>org.dbunit.dataset.datatype.DefaultDataTypeFactory</td>
! </tr>
! <tr>
! <td>Description</td>
! <td>Used to configure the DataType factory. You can replace the default
! factory to add support for non-standard database vendor data types.
! The Object must implement <a href="api/org/dbunit/dataset/datatype/IDataTypeFactory.html">org.dbunit.dataset.datatype.IDataTypeFactory</a>.</td>
</tr>
</table>
! <p>
<table border="1">
<tr>
+ <td>Property ID</td>
+ <td>http://www.dbunit.org/properties/statementFactory</td>
+ </tr>
+ <tr>
+ <td>Default</td>
+ <td>org.dbunit.database.statement.PreparedStatementFactory</td>
+ </tr>
+ <tr>
<td>Description</td>
! <td>Used to configure the statement factory. The Object must implement
! org.dbunit.database.statement.IStatementFactory.</td>
</tr>
+ </table>
+ <p>
+ <table border="1">
<tr>
! <td>Property ID</td>
! <td>http://www.dbunit.org/properties/resultSetTableFactory</td>
</tr>
<tr>
! <td>Default</td>
! <td>org.dbunit.database.CachedResultSetTableFactory</td>
</tr>
<tr>
! <td>Description</td>
! <td>Used to configure the ResultSet table factory. The Object must implement
! org.dbunit.database.IResultSetTableFactory.</td>
</tr>
</table>
|
