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: <mla...@us...> - 2002-11-05 01:35:11
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/database
In directory usw-pr-cvs1:/tmp/cvs-serv20148/dbunit/src/java/org/dbunit/database
Modified Files:
IDatabaseConnection.java
Log Message:
Fixed some minor Javadoc error for
createQueryTable() method .
Index: IDatabaseConnection.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/IDatabaseConnection.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** IDatabaseConnection.java 13 Jun 2002 17:24:56 -0000 1.11
--- IDatabaseConnection.java 5 Nov 2002 01:35:08 -0000 1.12
***************
*** 67,71 ****
* table can be the result of a join statement.
*
! * @param resultName The name tobe returned by {@link TableMetaData.getTableName}.
* @param sql The SQL <code>SELECT</code> statement
*/
--- 67,71 ----
* table can be the result of a join statement.
*
! * @param resultName The name to be returned by {@link ITableMetaData#getTableName}.
* @param sql The SQL <code>SELECT</code> statement
*/
|
|
From: <mla...@us...> - 2002-08-07 01:32:16
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/database
In directory usw-pr-cvs1:/tmp/cvs-serv4464/dbunit/src/test/org/dbunit/database
Modified Files:
DatabaseDataSetTest.java DatabaseTableMetaDataTest.java
Log Message:
* Updated HypersonicSQL version from 1.61 to 1.70. This version now support multiple
primary keys and tests have been updated accordingly.
Index: DatabaseDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/DatabaseDataSetTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DatabaseDataSetTest.java 4 Aug 2002 01:07:13 -0000 1.15
--- DatabaseDataSetTest.java 7 Aug 2002 01:32:12 -0000 1.16
***************
*** 221,225 ****
String tableName = DataSetUtils.getQualifiedName(
_connection.getSchema(), "PK_TABLE");
! String[] expected = {"PK0"};
try
--- 221,225 ----
String tableName = DataSetUtils.getQualifiedName(
_connection.getSchema(), "PK_TABLE");
! String[] expected = {"PK0", "PK1", "PK2"};
try
Index: DatabaseTableMetaDataTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/DatabaseTableMetaDataTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** DatabaseTableMetaDataTest.java 13 Jun 2002 17:24:59 -0000 1.10
--- DatabaseTableMetaDataTest.java 7 Aug 2002 01:32:12 -0000 1.11
***************
*** 46,51 ****
{
String tableName = "PK_TABLE";
! String[] expected = {"PK0"};
! // String[] expected = {"PK0", "PK1", "PK2"};
ITableMetaData metaData = createDataSet().getTableMetaData(tableName);
--- 46,51 ----
{
String tableName = "PK_TABLE";
! // String[] expected = {"PK0"};
! String[] expected = {"PK0", "PK1", "PK2"};
ITableMetaData metaData = createDataSet().getTableMetaData(tableName);
|
|
From: <mla...@us...> - 2002-08-07 01:32:16
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit
In directory usw-pr-cvs1:/tmp/cvs-serv4464/dbunit/src/test/org/dbunit
Modified Files:
DatabaseProfile.java HypersonicEnvironment.java
Log Message:
* Updated HypersonicSQL version from 1.61 to 1.70. This version now support multiple
primary keys and tests have been updated accordingly.
Index: DatabaseProfile.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/DatabaseProfile.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DatabaseProfile.java 13 Jun 2002 17:24:59 -0000 1.6
--- DatabaseProfile.java 7 Aug 2002 01:32:12 -0000 1.7
***************
*** 38,42 ****
private static final String USER = "user";
private static final String PASSWORD = "password";
- private static final String PRIMARY_KEY_SUPPORT = "primaryKey";
private final Properties _properties;
--- 38,41 ----
***************
*** 82,91 ****
}
- public PrimaryKeySupport getPrimaryKeySupport()
- {
- String value = _properties.getProperty(
- getPropertyKey(PRIMARY_KEY_SUPPORT));
- return PrimaryKeySupport.forName(value);
- }
}
--- 81,84 ----
Index: HypersonicEnvironment.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/HypersonicEnvironment.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** HypersonicEnvironment.java 13 Jun 2002 17:24:59 -0000 1.7
--- HypersonicEnvironment.java 7 Aug 2002 01:32:12 -0000 1.8
***************
*** 59,67 ****
}
- public PrimaryKeySupport getPrimaryKeySupport() throws Exception
- {
- return PrimaryKeySupport.SINGLE;
- }
-
}
--- 59,62 ----
|
|
From: <mla...@us...> - 2002-08-07 01:32:15
|
Update of /cvsroot/dbunit/dbunit
In directory usw-pr-cvs1:/tmp/cvs-serv4464/dbunit
Modified Files:
dbunit.ipr profile.properties
Log Message:
* Updated HypersonicSQL version from 1.61 to 1.70. This version now support multiple
primary keys and tests have been updated accordingly.
Index: dbunit.ipr
===================================================================
RCS file: /cvsroot/dbunit/dbunit/dbunit.ipr,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** dbunit.ipr 4 Aug 2002 01:07:12 -0000 1.49
--- dbunit.ipr 7 Aug 2002 01:32:11 -0000 1.50
***************
*** 156,160 ****
<option name="INVERSE_CLASS_FILLTERS" value="false" />
</breakpoint>
! <breakpoint url="file://$PROJECT_DIR$/src/java/org/dbunit/database/DatabaseTableMetaData.java" line="197">
<option name="ENABLED" value="true" />
<option name="SUSPEND_VM" value="true" />
--- 156,160 ----
<option name="INVERSE_CLASS_FILLTERS" value="false" />
</breakpoint>
! <breakpoint url="file://$PROJECT_DIR$/src/java/org/dbunit/database/DatabaseTableMetaData.java" line="201">
<option name="ENABLED" value="true" />
<option name="SUSPEND_VM" value="true" />
***************
*** 318,321 ****
--- 318,333 ----
<option name="TEST_RUNNER" value="Text" />
</configuration>
+ <configuration name="DatabaseTableMetaDataTest" type="JUnit" default="false" selected="false">
+ <option name="MAIN_CLASS_NAME" value="org.dbunit.database.DatabaseTableMetaDataTest" />
+ <option name="VM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="TEST_RUNNER" value="Text" />
+ </configuration>
+ <configuration name="RefreshOperationTest" type="JUnit" default="false" selected="false">
+ <option name="MAIN_CLASS_NAME" value="org.dbunit.operation.RefreshOperationTest" />
+ <option name="VM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="TEST_RUNNER" value="Text" />
+ </configuration>
</component>
<component class="com.intellij.ide.SelectInManager">
***************
*** 335,353 ****
<component class="com.intellij.ide.desktop.IdeDocumentManager">
<recent_files>
- <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/DatabaseEnvironment.java" column="13" line="35" />
- <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/AbstractDatabaseTest.java" column="8" line="61" />
- <file_info url="file://$PROJECT_DIR$/src/sql/hypersonic.sql" column="2" line="40" />
- <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/database/DatabaseDataSetTest.java" column="16" line="125" />
- <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/database/DatabaseDataSet.java" column="0" line="65" />
- <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/DeleteAllOperationTest.java" column="16" line="74" />
- <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/AbstractBatchOperation.java" column="16" line="93" />
- <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/UpdateOperationTest.java" column="75" line="120" />
- <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/InsertOperationTest.java" column="59" line="104" />
- <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/InsertOperation.java" column="0" line="80" />
- <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/DeleteOperationTest.java" column="40" line="95" />
- <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/UpdateOperation.java" column="0" line="81" />
- <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/DeleteOperation.java" column="36" line="58" />
<file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/database/statement/MockBatchStatement.java" column="22" line="89" />
<file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/mssqlserver/InsertIdentityOperation.java" column="13" line="48" />
</recent_files>
</component>
--- 347,365 ----
<component class="com.intellij.ide.desktop.IdeDocumentManager">
<recent_files>
<file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/database/statement/MockBatchStatement.java" column="22" line="89" />
<file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/mssqlserver/InsertIdentityOperation.java" column="13" line="48" />
+ <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/database/IDatabaseConnection.java" column="26" line="71" />
+ <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/DataSetUtils.java" column="74" line="95" />
+ <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/database/DatabaseDataSetTest.java" column="14" line="230" />
+ <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/database/DatabaseTableMetaData.java" column="47" line="117" />
+ <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/database/DatabaseTableMetaDataTest.java" column="35" line="46" />
+ <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/Assertion.java" column="0" line="141" />
+ <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/RefreshOperationTest.java" column="27" line="93" />
+ <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/UpdateOperationTest.java" column="69" line="354" />
+ <file_info url="file://$PROJECT_DIR$/src/sql/hypersonic.sql" column="30" line="47" />
+ <file_info url="file://$PROJECT_DIR$/profile.properties" column="0" line="45" />
+ <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/DatabaseProfile.java" column="0" line="39" />
+ <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/HypersonicEnvironment.java" column="0" line="59" />
+ <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/OracleEnvironment.java" column="20" line="37" />
</recent_files>
</component>
***************
*** 361,377 ****
<navigator id="ClasspathNavigator" flattenPackages="false" showMembers="false" />
<navigator id="ProjectNavigator" flattenPackages="false" showMembers="false">
- <expanded_node type="directory" url="file://$PROJECT_DIR$/src/xml" />
- <expanded_node type="directory" url="file://$PROJECT_DIR$" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src" />
! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/sql" />
! </navigator>
! <navigator id="SourcepathNavigator" flattenPackages="false" showMembers="true">
! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org" />
! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org/dbunit" />
! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org" />
! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" />
! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit" />
! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test" />
</navigator>
</component>
<component class="com.intellij.ide.structureView.StructureViewFactory">
--- 373,380 ----
<navigator id="ClasspathNavigator" flattenPackages="false" showMembers="false" />
<navigator id="ProjectNavigator" flattenPackages="false" showMembers="false">
<expanded_node type="directory" url="file://$PROJECT_DIR$/src" />
! <expanded_node type="directory" url="file://$PROJECT_DIR$" />
</navigator>
+ <navigator id="SourcepathNavigator" flattenPackages="false" showMembers="true" />
</component>
<component class="com.intellij.ide.structureView.StructureViewFactory">
Index: profile.properties
===================================================================
RCS file: /cvsroot/dbunit/dbunit/profile.properties,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** profile.properties 13 Jun 2002 17:24:54 -0000 1.20
--- profile.properties 7 Aug 2002 01:32:11 -0000 1.21
***************
*** 13,17 ****
# dbunit.profile.{profileName}.user =
# dbunit.profile.{profileName}.password =
- # dbunit.profile.{profileName}.primaryKey = single | multiple | none
dbunit.profile.hypersonic.driverClass = org.hsqldb.jdbcDriver
--- 13,16 ----
***************
*** 20,24 ****
dbunit.profile.hypersonic.user = sa
dbunit.profile.hypersonic.password =
- #dbunit.profile.hypersonic.primaryKey = single
dbunit.profile.oracle.driverClass = oracle.jdbc.driver.OracleDriver
--- 19,22 ----
***************
*** 27,31 ****
dbunit.profile.oracle.user = dbunit
dbunit.profile.oracle.password = dbunit
- #dbunit.profile.oracle.primaryKey = multiple
dbunit.profile.antoine.driverClass = oracle.jdbc.driver.OracleDriver
--- 25,28 ----
***************
*** 34,38 ****
dbunit.profile.antoine.user = antoine
dbunit.profile.antoine.password = antoine
- #dbunit.profile.antoine.primaryKey = multiple
dbunit.profile.mysql.driverClass = org.gjt.mm.mysql.Driver
--- 31,34 ----
***************
*** 41,45 ****
dbunit.profile.mysql.user = root
dbunit.profile.mysql.password =
- #dbunit.profile.mysql.primaryKey = multiple
## Needed for ant testing until profile.properties is merged
--- 37,40 ----
***************
*** 49,52 ****
dbunit.profile.user = ${dbunit.profile.hypersonic.user}
dbunit.profile.password = ${dbunit.profile.hypersonic.password}
- #dbunit.profile.primaryKey = ${dbunit.profile.hypersonic.primaryKey}
--- 44,46 ----
|
|
From: <mla...@us...> - 2002-08-07 01:32:15
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/database
In directory usw-pr-cvs1:/tmp/cvs-serv4464/dbunit/src/java/org/dbunit/database
Modified Files:
DatabaseTableMetaData.java
Log Message:
* Updated HypersonicSQL version from 1.61 to 1.70. This version now support multiple
primary keys and tests have been updated accordingly.
Index: DatabaseTableMetaData.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/DatabaseTableMetaData.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DatabaseTableMetaData.java 13 Jun 2002 17:24:56 -0000 1.12
--- DatabaseTableMetaData.java 7 Aug 2002 01:32:12 -0000 1.13
***************
*** 116,120 ****
{
PrimaryKeyData data = (PrimaryKeyData)o;
! return data.getIndex() - getIndex();
}
}
--- 116,120 ----
{
PrimaryKeyData data = (PrimaryKeyData)o;
! return getIndex() - data.getIndex();
}
}
|
Update of /cvsroot/dbunit/dbunit/src/xml In directory usw-pr-cvs1:/tmp/cvs-serv4464/dbunit/src/xml Modified Files: refreshOperationDuplicateTest.xml refreshOperationTest.xml refreshOperationTestExpected.xml updateOperationTest.xml Log Message: * Updated HypersonicSQL version from 1.61 to 1.70. This version now support multiple primary keys and tests have been updated accordingly. Index: refreshOperationDuplicateTest.xml =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/xml/refreshOperationDuplicateTest.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** refreshOperationDuplicateTest.xml 3 Aug 2002 14:49:50 -0000 1.2 --- refreshOperationDuplicateTest.xml 7 Aug 2002 01:32:12 -0000 1.3 *************** *** 1,6 **** <dataset> ! <PK_TABLE PK0="1" PK1="11" PK2="111" NORMAL0="toto" NORMAL1="qwerty"/> <ONLY_PK_TABLE PK0="0"/> ! <PK_TABLE PK0="3" PK1="33" PK2="333" NORMAL0="3333" NORMAL1="33333"/> <ONLY_PK_TABLE PK0="1"/> </dataset> --- 1,6 ---- <dataset> ! <PK_TABLE PK0="1" PK1="1" PK2="1" NORMAL0="toto" NORMAL1="qwerty"/> <ONLY_PK_TABLE PK0="0"/> ! <PK_TABLE PK0="3" PK1="3" PK2="3" NORMAL0="3333" NORMAL1="33333"/> <ONLY_PK_TABLE PK0="1"/> </dataset> Index: refreshOperationTest.xml =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/xml/refreshOperationTest.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** refreshOperationTest.xml 26 Mar 2002 15:40:11 -0000 1.4 --- refreshOperationTest.xml 7 Aug 2002 01:32:12 -0000 1.5 *************** *** 1,8 **** - <!-- edited with XML Spy v3.5 (http://www.xmlspy.com) by () --> <dataset> ! <PK_TABLE PK0="1" PK1="11" PK2="111" NORMAL0="toto" NORMAL1="qwerty"/> ! <PK_TABLE PK0="3" PK1="33" PK2="333" NORMAL0="3333" NORMAL1="33333"/> <ONLY_PK_TABLE PK0="0"/> <ONLY_PK_TABLE PK0="1"/> </dataset> - --- 1,6 ---- <dataset> ! <PK_TABLE PK0="1" PK1="1" PK2="1" NORMAL0="toto" NORMAL1="qwerty"/> ! <PK_TABLE PK0="3" PK1="3" PK2="3" NORMAL0="3333" NORMAL1="33333"/> <ONLY_PK_TABLE PK0="0"/> <ONLY_PK_TABLE PK0="1"/> </dataset> Index: refreshOperationTestExpected.xml =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/xml/refreshOperationTestExpected.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** refreshOperationTestExpected.xml 26 Mar 2002 15:40:11 -0000 1.2 --- refreshOperationTestExpected.xml 7 Aug 2002 01:32:12 -0000 1.3 *************** *** 1,10 **** ! <!-- edited with XML Spy v3.5 NT (http://www.xmlspy.com) by Manuel Laflamme (Java development) --> <dataset> <PK_TABLE PK0="0" PK1="0" PK2="0" NORMAL0="row 0" NORMAL1="0 wor"/> ! <PK_TABLE PK0="1" PK1="11" PK2="111" NORMAL0="toto" NORMAL1="qwerty"/> <PK_TABLE PK0="2" PK1="2" PK2="2" NORMAL0="row 2" NORMAL1="2 wor"/> ! <PK_TABLE PK0="3" PK1="33" PK2="333" NORMAL0="3333" NORMAL1="33333"/> <ONLY_PK_TABLE PK0="0"/> <ONLY_PK_TABLE PK0="1"/> </dataset> - --- 1,9 ---- ! <dataset> <PK_TABLE PK0="0" PK1="0" PK2="0" NORMAL0="row 0" NORMAL1="0 wor"/> ! <PK_TABLE PK0="1" PK1="1" PK2="1" NORMAL0="toto" NORMAL1="qwerty"/> <PK_TABLE PK0="2" PK1="2" PK2="2" NORMAL0="row 2" NORMAL1="2 wor"/> ! <PK_TABLE PK0="3" PK1="3" PK2="3" NORMAL0="3333" NORMAL1="33333"/> <ONLY_PK_TABLE PK0="0"/> <ONLY_PK_TABLE PK0="1"/> </dataset> Index: updateOperationTest.xml =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/xml/updateOperationTest.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** updateOperationTest.xml 18 Mar 2002 16:07:13 -0000 1.3 --- updateOperationTest.xml 7 Aug 2002 01:32:12 -0000 1.4 *************** *** 1,3 **** ! <!-- edited with XML Spy v3.5 (http://www.xmlspy.com) by () --> <dataset> <table name="PK_TABLE"> --- 1,3 ---- ! <dataset> <table name="PK_TABLE"> *************** *** 9,14 **** <row> <value>1</value> ! <value>11</value> ! <value>111</value> <value>toto</value> <value>qwerty</value> --- 9,14 ---- <row> <value>1</value> ! <value>1</value> ! <value>1</value> <value>toto</value> <value>qwerty</value> *************** *** 16,19 **** </table> </dataset> - - --- 16,17 ---- |
|
From: <mla...@us...> - 2002-08-07 01:32:15
|
Update of /cvsroot/dbunit/dbunit/src/sql
In directory usw-pr-cvs1:/tmp/cvs-serv4464/dbunit/src/sql
Modified Files:
hypersonic.sql
Log Message:
* Updated HypersonicSQL version from 1.61 to 1.70. This version now support multiple
primary keys and tests have been updated accordingly.
Index: hypersonic.sql
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/sql/hypersonic.sql,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** hypersonic.sql 4 Aug 2002 01:07:13 -0000 1.5
--- hypersonic.sql 7 Aug 2002 01:32:12 -0000 1.6
***************
*** 46,54 ****
CREATE TABLE PK_TABLE
! (PK0 NUMERIC(38, 0) NOT NULL PRIMARY KEY,
PK1 NUMERIC(38, 0) NOT NULL,
PK2 NUMERIC(38, 0) NOT NULL,
NORMAL0 VARCHAR(32),
! NORMAL1 VARCHAR(32));
-----------------------------------------------------------------------------
--- 46,54 ----
CREATE TABLE PK_TABLE
! (PK0 NUMERIC(38, 0) NOT NULL,
PK1 NUMERIC(38, 0) NOT NULL,
PK2 NUMERIC(38, 0) NOT NULL,
NORMAL0 VARCHAR(32),
! NORMAL1 VARCHAR(32), PRIMARY KEY (PK0, PK1, PK2));
-----------------------------------------------------------------------------
|
|
From: <mla...@us...> - 2002-08-07 01:32:15
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation
In directory usw-pr-cvs1:/tmp/cvs-serv4464/dbunit/src/test/org/dbunit/operation
Modified Files:
UpdateOperationTest.java
Log Message:
* Updated HypersonicSQL version from 1.61 to 1.70. This version now support multiple
primary keys and tests have been updated accordingly.
Index: UpdateOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/UpdateOperationTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** UpdateOperationTest.java 4 Aug 2002 01:07:14 -0000 1.13
--- UpdateOperationTest.java 7 Aug 2002 01:32:12 -0000 1.14
***************
*** 353,359 ****
assertEquals("PK0", "1",
tableAfter.getValue(i, "PK0").toString());
! assertEquals("PK1", "11",
tableAfter.getValue(i, "PK1").toString());
! assertEquals("PK2", "111",
tableAfter.getValue(i, "PK2").toString());
assertEquals("NORMAL0", "toto",
--- 353,359 ----
assertEquals("PK0", "1",
tableAfter.getValue(i, "PK0").toString());
! assertEquals("PK1", "1",
tableAfter.getValue(i, "PK1").toString());
! assertEquals("PK2", "1",
tableAfter.getValue(i, "PK2").toString());
assertEquals("NORMAL0", "toto",
|
|
From: <mla...@us...> - 2002-08-07 01:32:15
|
Update of /cvsroot/dbunit/dbunit/lib In directory usw-pr-cvs1:/tmp/cvs-serv4464/dbunit/lib Modified Files: hsqldb.jar Log Message: * Updated HypersonicSQL version from 1.61 to 1.70. This version now support multiple primary keys and tests have been updated accordingly. Index: hsqldb.jar =================================================================== RCS file: /cvsroot/dbunit/dbunit/lib/hsqldb.jar,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 Binary files /tmp/cvsMah46c and /tmp/cvsqIeZSg differ |
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation
In directory usw-pr-cvs1:/tmp/cvs-serv24183/dbunit/src/test/org/dbunit/operation
Modified Files:
DeleteAllOperationTest.java DeleteOperationTest.java
InsertOperationTest.java UpdateOperationTest.java
Log Message:
I added a system property that 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".
Attention this feature is not compatible with the qualified names name feature!
Index: DeleteAllOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/DeleteAllOperationTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DeleteAllOperationTest.java 3 Aug 2002 02:26:40 -0000 1.9
--- DeleteAllOperationTest.java 4 Aug 2002 01:07:13 -0000 1.10
***************
*** 73,77 ****
}
! public void testMockExecuteWithDuplicateTable() throws Exception
{
String schemaName = "schema";
--- 73,118 ----
}
! public void testExecuteWithEscapedNames() throws Exception
! {
! String schemaName = "schema";
! String tableName = "table";
! String expected = "delete from 'schema'.'table'";
!
! IDataSet dataSet = new DefaultDataSet(new DefaultTable(tableName));
!
! // setup mock objects
! MockBatchStatement statement = new MockBatchStatement();
! statement.addExpectedBatchString(expected);
! statement.setExpectedExecuteBatchCalls(1);
! statement.setExpectedClearBatchCalls(1);
! statement.setExpectedCloseCalls(1);
!
! MockStatementFactory factory = new MockStatementFactory();
! factory.setExpectedCreateStatementCalls(1);
! factory.setupStatement(statement);
!
! MockDatabaseConnection connection = new MockDatabaseConnection();
! connection.setupDataSet(dataSet);
! connection.setupSchema(schemaName);
! connection.setupStatementFactory(factory);
! connection.setExpectedCloseCalls(0);
!
! // execute operation
! setEscapePattern("'?'");
! try
! {
! new DeleteAllOperation().execute(connection, dataSet);
! }
! finally
! {
! setEscapePattern(null);
! }
!
! statement.verify();
! factory.verify();
! connection.verify();
! }
!
! public void testExecuteWithDuplicateTables() throws Exception
{
String schemaName = "schema";
Index: DeleteOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/DeleteOperationTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DeleteOperationTest.java 3 Aug 2002 02:26:40 -0000 1.11
--- DeleteOperationTest.java 4 Aug 2002 01:07:13 -0000 1.12
***************
*** 94,98 ****
}
! public void testMockExecuteWithDuplicateTables() throws Exception
{
String schemaName = "schema";
--- 94,154 ----
}
! public void testExecuteWithEscapedNames() throws Exception
! {
! String schemaName = "schema";
! String tableName = "table";
! String[] expected = {
! "delete from [schema].[table] where [c2] = 123.45 and [c1] = 'qwerty'",
! "delete from [schema].[table] where [c2] = 1234 and [c1] = 'toto'",
! };
!
! List valueList = new ArrayList();
! valueList.add(new Object[]{"toto", "1234", Boolean.FALSE});
! valueList.add(new Object[]{"qwerty", new Double("123.45"), "true"});
! Column[] columns = new Column[]{
! new Column("c1", DataType.VARCHAR),
! new Column("c2", DataType.NUMERIC),
! new Column("c3", DataType.BOOLEAN),
! };
! String[] primaryKeys = {"c2", "c1"};
!
! ITable table = new DefaultTable(new DefaultTableMetaData(
! tableName, columns, primaryKeys), valueList);
! IDataSet dataSet = new DefaultDataSet(table);
!
! // setup mock objects
! MockBatchStatement statement = new MockBatchStatement();
! statement.addExpectedBatchStrings(expected);
! statement.setExpectedExecuteBatchCalls(1);
! statement.setExpectedClearBatchCalls(1);
! statement.setExpectedCloseCalls(1);
!
! MockStatementFactory factory = new MockStatementFactory();
! factory.setExpectedCreatePreparedStatementCalls(1);
! factory.setupStatement(statement);
!
! MockDatabaseConnection connection = new MockDatabaseConnection();
! connection.setupDataSet(dataSet);
! connection.setupSchema(schemaName);
! connection.setupStatementFactory(factory);
! connection.setExpectedCloseCalls(0);
!
! // execute operation
! setEscapePattern("[?]");
! try
! {
! new DeleteOperation().execute(connection, dataSet);
! }
! finally
! {
! setEscapePattern(null);
! }
!
! statement.verify();
! factory.verify();
! connection.verify();
! }
!
! public void testExecuteWithDuplicateTables() throws Exception
{
String schemaName = "schema";
Index: InsertOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/InsertOperationTest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** InsertOperationTest.java 3 Aug 2002 02:26:40 -0000 1.14
--- InsertOperationTest.java 4 Aug 2002 01:07:13 -0000 1.15
***************
*** 98,102 ****
}
! public void testMockExecuteWithDuplicateTables() throws Exception
{
String schemaName = "schema";
--- 98,156 ----
}
! public void testExecuteWithEscapedNames() throws Exception
! {
! String schemaName = "schema";
! String tableName = "table";
! String[] expected = {
! "insert into 'schema'.'table' ('c1', 'c2', 'c3') values (NULL, 1234, 'false')",
! "insert into 'schema'.'table' ('c1', 'c2', 'c3') values ('qwerty', 123.45, 'true')",
! };
!
! // setup table
! List valueList = new ArrayList();
! valueList.add(new Object[]{null, "1234", Boolean.FALSE});
! valueList.add(new Object[]{"qwerty", new Double("123.45"), "true"});
! Column[] columns = new Column[]{
! new Column("c1", DataType.VARCHAR),
! new Column("c2", DataType.NUMERIC),
! new Column("c3", DataType.BOOLEAN),
! };
! DefaultTable table = new DefaultTable(tableName, columns, valueList);
! IDataSet dataSet = new DefaultDataSet(table);
!
! // setup mock objects
! MockBatchStatement statement = new MockBatchStatement();
! statement.addExpectedBatchStrings(expected);
! statement.setExpectedExecuteBatchCalls(1);
! statement.setExpectedClearBatchCalls(1);
! statement.setExpectedCloseCalls(1);
!
! MockStatementFactory factory = new MockStatementFactory();
! factory.setExpectedCreatePreparedStatementCalls(1);
! factory.setupStatement(statement);
!
! MockDatabaseConnection connection = new MockDatabaseConnection();
! connection.setupDataSet(dataSet);
! connection.setupSchema(schemaName);
! connection.setupStatementFactory(factory);
! connection.setExpectedCloseCalls(0);
!
! // execute operation
! setEscapePattern("'?'");
! try
! {
! new InsertOperation().execute(connection, dataSet);
! }
! finally
! {
! setEscapePattern(null);
! }
!
! statement.verify();
! factory.verify();
! connection.verify();
! }
!
! public void testExecuteWithDuplicateTables() throws Exception
{
String schemaName = "schema";
Index: UpdateOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/UpdateOperationTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** UpdateOperationTest.java 3 Aug 2002 14:49:50 -0000 1.12
--- UpdateOperationTest.java 4 Aug 2002 01:07:14 -0000 1.13
***************
*** 122,126 ****
}
! public void testMockExecuteWithDuplicateTables() throws Exception
{
String schemaName = "schema";
--- 122,182 ----
}
! public void testExecuteWithEscapedName() throws Exception
! {
! String schemaName = "schema";
! String tableName = "table";
! String[] expected = {
! "update [schema].[table] set [c2] = 1234, [c3] = 'false' where [c4] = 0 and [c1] = 'toto'",
! "update [schema].[table] set [c2] = 123.45, [c3] = NULL where [c4] = 0 and [c1] = 'qwerty'",
! };
!
! List valueList = new ArrayList();
! valueList.add(new Object[]{"toto", "1234", "false", "0"});
! valueList.add(new Object[]{"qwerty", new Double("123.45"), null, "0"});
! Column[] columns = new Column[]{
! new Column("c1", DataType.VARCHAR),
! new Column("c2", DataType.NUMERIC),
! new Column("c3", DataType.VARCHAR),
! new Column("c4", DataType.NUMERIC),
! };
! String[] primaryKeys = {"c4", "c1"};
! ITable table = new DefaultTable(new DefaultTableMetaData(
! tableName, columns, primaryKeys), valueList);
! IDataSet dataSet = new DefaultDataSet(table);
!
! // setup mock objects
! MockBatchStatement statement = new MockBatchStatement();
! statement.addExpectedBatchStrings(expected);
! statement.setExpectedExecuteBatchCalls(1);
! statement.setExpectedClearBatchCalls(1);
! statement.setExpectedCloseCalls(1);
!
! MockStatementFactory factory = new MockStatementFactory();
! factory.setExpectedCreatePreparedStatementCalls(1);
! factory.setupStatement(statement);
!
! MockDatabaseConnection connection = new MockDatabaseConnection();
! connection.setupDataSet(dataSet);
! connection.setupSchema(schemaName);
! connection.setupStatementFactory(factory);
! connection.setExpectedCloseCalls(0);
!
! // execute operation
! setEscapePattern("[?]");
! try
! {
! new UpdateOperation().execute(connection, dataSet);
! }
! finally
! {
! setEscapePattern(null);
! }
!
! statement.verify();
! factory.verify();
! connection.verify();
! }
!
! public void testExecuteWithDuplicateTables() throws Exception
{
String schemaName = "schema";
|
|
From: <mla...@us...> - 2002-08-04 01:07:16
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset
In directory usw-pr-cvs1:/tmp/cvs-serv24183/dbunit/src/test/org/dbunit/dataset
Modified Files:
AbstractDataSetTest.java DataSetUtilsTest.java
Log Message:
I added a system property that 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".
Attention this feature is not compatible with the qualified names name feature!
Index: AbstractDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/AbstractDataSetTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** AbstractDataSetTest.java 3 Aug 2002 02:26:41 -0000 1.13
--- AbstractDataSetTest.java 4 Aug 2002 01:07:13 -0000 1.14
***************
*** 90,93 ****
--- 90,94 ----
nameList.remove("DBUNIT.BLOB_TABLE");
nameList.remove("DBUNIT.CLOB_TABLE");
+ // nameList.remove("ESCAPED TABLE");
names = (String[])nameList.toArray(new String[0]);
Index: DataSetUtilsTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/DataSetUtilsTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DataSetUtilsTest.java 13 Jun 2002 17:25:00 -0000 1.11
--- DataSetUtilsTest.java 4 Aug 2002 01:07:13 -0000 1.12
***************
*** 55,59 ****
--- 55,82 ----
assertEquals("existing prefix", "prefix.name",
DataSetUtils.getQualifiedName("wrongPrefix", "prefix.name"));
+
+ assertEquals("escaped prefix + name", "prefix.name",
+ 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");
+
}
+
+ public void testGetEscapedName() throws Exception
+ {
+ assertEquals("'name'", DataSetUtils.getEscapedName("name", "'?'"));
+
+ assertEquals("[name]", DataSetUtils.getEscapedName("name", "[?]"));
+
+ assertEquals(null, DataSetUtils.getEscapedName(null, "[?]"));
+
+ assertEquals("name", DataSetUtils.getEscapedName("name", null));
+
+ assertEquals("name", DataSetUtils.getEscapedName("name", "invalid pattern!"));
+ }
+
public void testGetColumn() throws Exception
|
|
From: <mla...@us...> - 2002-08-04 01:07:16
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/mssqlserver
In directory usw-pr-cvs1:/tmp/cvs-serv24183/dbunit/src/java/org/dbunit/operation/mssqlserver
Modified Files:
InsertIdentityOperation.java
Log Message:
I added a system property that 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".
Attention this feature is not compatible with the qualified names name feature!
Index: InsertIdentityOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/mssqlserver/InsertIdentityOperation.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** InsertIdentityOperation.java 3 Aug 2002 02:26:41 -0000 1.9
--- InsertIdentityOperation.java 4 Aug 2002 01:07:13 -0000 1.10
***************
*** 113,117 ****
ITableMetaData databaseMetaData = table.getTableMetaData();
String tableName = DataSetUtils.getQualifiedName(
! connection.getSchema(), databaseMetaData.getTableName());
// enable identity insert
--- 113,118 ----
ITableMetaData databaseMetaData = table.getTableMetaData();
String tableName = DataSetUtils.getQualifiedName(
! connection.getSchema(),
! databaseMetaData.getTableName(), true);
// enable identity insert
|
|
From: <mla...@us...> - 2002-08-04 01:07:16
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/database
In directory usw-pr-cvs1:/tmp/cvs-serv24183/dbunit/src/test/org/dbunit/database
Modified Files:
DatabaseDataSetTest.java
Log Message:
I added a system property that 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".
Attention this feature is not compatible with the qualified names name feature!
Index: DatabaseDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/database/DatabaseDataSetTest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** DatabaseDataSetTest.java 3 Aug 2002 02:26:41 -0000 1.14
--- DatabaseDataSetTest.java 4 Aug 2002 01:07:13 -0000 1.15
***************
*** 37,40 ****
--- 37,42 ----
public class DatabaseDataSetTest extends AbstractDataSetTest
{
+ private static final String ESCAPE_PATTERN_KEY = "dbunit.name.escapePattern";
+
private IDatabaseConnection _connection;
***************
*** 114,117 ****
--- 116,143 ----
String sql = DatabaseDataSet.getSelectStatement(schemaName, metaData);
assertEquals("select statement", expected, sql);
+ }
+
+ public void testGetSelectStatementWithEscapedNames() throws Exception
+ {
+ String schemaName = "schema";
+ String tableName = "table";
+ Column[] columns = new Column[]{
+ new Column("c1", DataType.UNKNOWN),
+ new Column("c2", DataType.UNKNOWN),
+ new Column("c3", DataType.UNKNOWN),
+ };
+ 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);
+ }
}
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation
In directory usw-pr-cvs1:/tmp/cvs-serv24183/dbunit/src/java/org/dbunit/operation
Modified Files:
DeleteAllOperation.java DeleteOperation.java
InsertOperation.java RefreshOperation.java
UpdateOperation.java
Log Message:
I added a system property that 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".
Attention this feature is not compatible with the qualified names name feature!
Index: DeleteAllOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/DeleteAllOperation.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DeleteAllOperation.java 3 Aug 2002 02:26:41 -0000 1.11
--- DeleteAllOperation.java 4 Aug 2002 01:07:13 -0000 1.12
***************
*** 64,68 ****
sqlBuffer.append("delete from ");
sqlBuffer.append(DataSetUtils.getQualifiedName(
! connection.getSchema(), tableNames[i]));
statement.addBatch(sqlBuffer.toString());
}
--- 64,68 ----
sqlBuffer.append("delete from ");
sqlBuffer.append(DataSetUtils.getQualifiedName(
! connection.getSchema(), tableNames[i], true));
statement.addBatch(sqlBuffer.toString());
}
Index: DeleteOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/DeleteOperation.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** DeleteOperation.java 13 Jun 2002 17:24:58 -0000 1.10
--- DeleteOperation.java 4 Aug 2002 01:07:13 -0000 1.11
***************
*** 63,67 ****
sqlBuffer.append("delete from ");
sqlBuffer.append(DataSetUtils.getQualifiedName(
! schemaName, metaData.getTableName()));
// where
--- 63,67 ----
sqlBuffer.append("delete from ");
sqlBuffer.append(DataSetUtils.getQualifiedName(
! schemaName, metaData.getTableName(), true));
// where
***************
*** 69,73 ****
for (int i = 0; i < primaryKeys.length; i++)
{
! sqlBuffer.append(primaryKeys[i].getColumnName());
sqlBuffer.append(" = ?");
if (i + 1 < primaryKeys.length)
--- 69,77 ----
for (int i = 0; i < primaryKeys.length; i++)
{
! // escape column name
! String columnName = DataSetUtils.getQualifiedName(null,
! primaryKeys[i].getColumnName(), true);
! sqlBuffer.append(columnName);
!
sqlBuffer.append(" = ?");
if (i + 1 < primaryKeys.length)
Index: InsertOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/InsertOperation.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** InsertOperation.java 13 Jun 2002 17:24:58 -0000 1.11
--- InsertOperation.java 4 Aug 2002 01:07:13 -0000 1.12
***************
*** 52,56 ****
sqlBuffer.append("insert into ");
sqlBuffer.append(DataSetUtils.getQualifiedName(schemaName,
! metaData.getTableName()));
// columns
--- 52,56 ----
sqlBuffer.append("insert into ");
sqlBuffer.append(DataSetUtils.getQualifiedName(schemaName,
! metaData.getTableName(), true));
// columns
***************
*** 62,66 ****
sqlBuffer.append(", ");
}
! sqlBuffer.append(columns[i].getColumnName());
}
--- 62,70 ----
sqlBuffer.append(", ");
}
!
! // escape column name
! String columnName = DataSetUtils.getQualifiedName(null,
! columns[i].getColumnName(), true);
! sqlBuffer.append(columnName);
}
Index: RefreshOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/RefreshOperation.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** RefreshOperation.java 3 Aug 2002 02:26:41 -0000 1.19
--- RefreshOperation.java 4 Aug 2002 01:07:13 -0000 1.20
***************
*** 91,95 ****
sqlBuffer.append("select COUNT(*) from ");
sqlBuffer.append(DataSetUtils.getQualifiedName(schemaName,
! metaData.getTableName()));
// where
--- 91,95 ----
sqlBuffer.append("select COUNT(*) from ");
sqlBuffer.append(DataSetUtils.getQualifiedName(schemaName,
! metaData.getTableName(), true));
// where
Index: UpdateOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/UpdateOperation.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** UpdateOperation.java 13 Jun 2002 17:24:58 -0000 1.8
--- UpdateOperation.java 4 Aug 2002 01:07:13 -0000 1.9
***************
*** 60,64 ****
sqlBuffer.append("update ");
sqlBuffer.append(DataSetUtils.getQualifiedName(schemaName,
! metaData.getTableName()));
// set
--- 60,64 ----
sqlBuffer.append("update ");
sqlBuffer.append(DataSetUtils.getQualifiedName(schemaName,
! metaData.getTableName(), true));
// set
***************
*** 79,83 ****
firstSet = false;
! sqlBuffer.append(column.getColumnName());
sqlBuffer.append(" = ?");
columnList.add(column);
--- 79,86 ----
firstSet = false;
! // escape column name
! String columnName = DataSetUtils.getQualifiedName(null,
! column.getColumnName(), true);
! sqlBuffer.append(columnName);
sqlBuffer.append(" = ?");
columnList.add(column);
***************
*** 95,99 ****
sqlBuffer.append(" and ");
}
! sqlBuffer.append(column.getColumnName());
sqlBuffer.append(" = ?");
columnList.add(column);
--- 98,106 ----
sqlBuffer.append(" and ");
}
!
! // escape column name
! String columnName = DataSetUtils.getQualifiedName(null,
! column.getColumnName(), true);
! sqlBuffer.append(columnName);
sqlBuffer.append(" = ?");
columnList.add(column);
|
|
From: <mla...@us...> - 2002-08-04 01:07:16
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit
In directory usw-pr-cvs1:/tmp/cvs-serv24183/dbunit/src/test/org/dbunit
Modified Files:
AbstractDatabaseTest.java Main.java
Log Message:
I added a system property that 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".
Attention this feature is not compatible with the qualified names name feature!
Index: AbstractDatabaseTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/AbstractDatabaseTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AbstractDatabaseTest.java 13 Jun 2002 17:24:59 -0000 1.9
--- AbstractDatabaseTest.java 4 Aug 2002 01:07:13 -0000 1.10
***************
*** 33,36 ****
--- 33,37 ----
public abstract class AbstractDatabaseTest extends DatabaseTestCase
{
+ private static final String ESCAPE_PATTERN_KEY = "dbunit.name.escapePattern";
protected IDatabaseConnection _connection;
***************
*** 52,55 ****
--- 53,66 ----
}
+ public static void setEscapePattern(String pattern)
+ {
+ if (pattern == null)
+ {
+ System.getProperties().remove(ESCAPE_PATTERN_KEY);
+ return;
+ }
+ System.setProperty(ESCAPE_PATTERN_KEY, pattern);
+ }
+
////////////////////////////////////////////////////////////////////////////
// TestCase class
***************
*** 67,70 ****
--- 78,82 ----
_connection = null;
+ setEscapePattern(null);
}
Index: Main.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/Main.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Main.java 3 Aug 2002 02:26:40 -0000 1.23
--- Main.java 4 Aug 2002 01:07:13 -0000 1.24
***************
*** 26,29 ****
--- 26,31 ----
import org.dbunit.dataset.xml.XmlDataSet;
import org.dbunit.dataset.xml.FlatXmlDataSet;
+ import org.dbunit.dataset.IDataSet;
+ import org.dbunit.operation.DatabaseOperation;
import java.io.FileOutputStream;
***************
*** 38,43 ****
--- 40,48 ----
public static void main(String[] args) throws Exception
{
+ System.setProperty("dbunit.name.escapePattern", "\"?\"");
IDatabaseConnection connection =
DatabaseEnvironment.getInstance().getConnection();
+ IDataSet dataSet = new XmlDataSet(new FileInputStream("dataSetTest.xml"));
+ DatabaseOperation.CLEAN_INSERT.execute(connection, dataSet);
// String[] tableNames = connection.createDataSet().getTableNames();
***************
*** 48,57 ****
//
//
! // FlatXmlDataSet.write(new FilteredDataSet(tableNames,
! // connection.createDataSet()),
! // new FileOutputStream("test.xml"));
! FlatXmlDataSet.write(new FlatXmlDataSet(
! new FileInputStream("P:/dbunit-cvs/dbunit/src/xml/flatXmlDataSetDuplicateTest.xml")),
! new FileOutputStream("flattest.xml"));
--- 53,61 ----
//
//
! FlatXmlDataSet.write(connection.createDataSet(),
! new FileOutputStream("test.xml"));
! // FlatXmlDataSet.write(new FlatXmlDataSet(
! // new FileInputStream("P:/dbunit-cvs/dbunit/src/xml/flatXmlDataSetDuplicateTest.xml")),
! // new FileOutputStream("flattest.xml"));
|
|
From: <mla...@us...> - 2002-08-04 01:07:16
|
Update of /cvsroot/dbunit/dbunit/src/sql
In directory usw-pr-cvs1:/tmp/cvs-serv24183/dbunit/src/sql
Modified Files:
hypersonic.sql
Log Message:
I added a system property that 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".
Attention this feature is not compatible with the qualified names name feature!
Index: hypersonic.sql
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/sql/hypersonic.sql,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** hypersonic.sql 26 Mar 2002 15:40:11 -0000 1.4
--- hypersonic.sql 4 Aug 2002 01:07:13 -0000 1.5
***************
*** 29,32 ****
--- 29,44 ----
COLUMN3 VARCHAR(32));
+ /*
+ -----------------------------------------------------------------------------
+ -- ESCAPED TABLE
+ -----------------------------------------------------------------------------
+
+ CREATE TABLE "ESCAPED TABLE"
+ (COLUMN0 VARCHAR(32),
+ COLUMN1 VARCHAR(32),
+ COLUMN2 VARCHAR(32),
+ "COLUMN 3" VARCHAR(32));
+ */
+
-----------------------------------------------------------------------------
-- PK_TABLE
***************
*** 46,50 ****
CREATE TABLE ONLY_PK_TABLE
(PK0 NUMERIC(38, 0) NOT NULL PRIMARY KEY);
!
-----------------------------------------------------------------------------
-- EMPTY_MULTITYPE_TABLE
--- 58,62 ----
CREATE TABLE ONLY_PK_TABLE
(PK0 NUMERIC(38, 0) NOT NULL PRIMARY KEY);
!
-----------------------------------------------------------------------------
-- EMPTY_MULTITYPE_TABLE
|
|
From: <mla...@us...> - 2002-08-04 01:07:15
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset
In directory usw-pr-cvs1:/tmp/cvs-serv24183/dbunit/src/java/org/dbunit/dataset
Modified Files:
DataSetUtils.java
Log Message:
I added a system property that 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".
Attention this feature is not compatible with the qualified names name feature!
Index: DataSetUtils.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/DataSetUtils.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DataSetUtils.java 3 Aug 2002 02:26:40 -0000 1.12
--- DataSetUtils.java 4 Aug 2002 01:07:13 -0000 1.13
***************
*** 86,89 ****
--- 86,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);
+ }
+
if (prefix == null || prefix.equals("") || name.indexOf(".") >= 0)
{
***************
*** 92,95 ****
--- 105,126 ----
return prefix + "." + name;
+ }
+
+ 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;
+ }
+ return name;
}
|
|
From: <mla...@us...> - 2002-08-04 01:07:15
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/database
In directory usw-pr-cvs1:/tmp/cvs-serv24183/dbunit/src/java/org/dbunit/database
Modified Files:
DatabaseDataSet.java
Log Message:
I added a system property that 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".
Attention this feature is not compatible with the qualified names name feature!
Index: DatabaseDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/DatabaseDataSet.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DatabaseDataSet.java 3 Aug 2002 02:26:41 -0000 1.15
--- DatabaseDataSet.java 4 Aug 2002 01:07:13 -0000 1.16
***************
*** 61,65 ****
sqlBuffer.append(", ");
}
! sqlBuffer.append(columns[i].getColumnName());
}
--- 61,68 ----
sqlBuffer.append(", ");
}
! String columnName = DataSetUtils.getQualifiedName(null,
! columns[i].getColumnName(), true);
! // String columnName = columns[i].getColumnName();
! sqlBuffer.append(columnName);
}
***************
*** 67,71 ****
sqlBuffer.append(" from ");
sqlBuffer.append(DataSetUtils.getQualifiedName(schema,
! metaData.getTableName()));
// order by
--- 70,74 ----
sqlBuffer.append(" from ");
sqlBuffer.append(DataSetUtils.getQualifiedName(schema,
! metaData.getTableName(), true));
// order by
|
|
From: <mla...@us...> - 2002-08-04 01:07:15
|
Update of /cvsroot/dbunit/dbunit
In directory usw-pr-cvs1:/tmp/cvs-serv24183/dbunit
Modified Files:
dbunit.ipr
Log Message:
I added a system property that 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".
Attention this feature is not compatible with the qualified names name feature!
Index: dbunit.ipr
===================================================================
RCS file: /cvsroot/dbunit/dbunit/dbunit.ipr,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** dbunit.ipr 3 Aug 2002 14:49:49 -0000 1.48
--- dbunit.ipr 4 Aug 2002 01:07:12 -0000 1.49
***************
*** 142,146 ****
</component>
<component class="com.intellij.debugger.Debugger">
! <line_breakpoints />
<exception_breakpoints>
<breakpoint_any>
--- 142,173 ----
</component>
<component class="com.intellij.debugger.Debugger">
! <line_breakpoints>
! <breakpoint url="file://$PROJECT_DIR$/src/java/org/dbunit/database/DatabaseDataSet.java" line="162">
! <option name="ENABLED" value="true" />
! <option name="SUSPEND_VM" value="true" />
! <option name="COUNT_FILTER_ENABLED" value="false" />
! <option name="COUNT_FILTER" value="0" />
! <option name="CONDITION_ENABLED" value="true" />
! <option name="CONDITION" value="tableName.equals("ESCAPED.TABLE")" />
! <option name="LOG_ENABLED" value="false" />
! <option name="LOG_EXPRESSION_ENABLED" value="false" />
! <option name="LOG_MESSAGE" value="" />
! <option name="CLASS_FILTERS_ENABLED" value="false" />
! <option name="INVERSE_CLASS_FILLTERS" value="false" />
! </breakpoint>
! <breakpoint url="file://$PROJECT_DIR$/src/java/org/dbunit/database/DatabaseTableMetaData.java" line="197">
! <option name="ENABLED" value="true" />
! <option name="SUSPEND_VM" value="true" />
! <option name="COUNT_FILTER_ENABLED" value="false" />
! <option name="COUNT_FILTER" value="0" />
! <option name="CONDITION_ENABLED" value="false" />
! <option name="CONDITION" />
! <option name="LOG_ENABLED" value="false" />
! <option name="LOG_EXPRESSION_ENABLED" value="false" />
! <option name="LOG_MESSAGE" />
! <option name="CLASS_FILTERS_ENABLED" value="false" />
! <option name="INVERSE_CLASS_FILLTERS" value="false" />
! </breakpoint>
! </line_breakpoints>
<exception_breakpoints>
<breakpoint_any>
***************
*** 267,270 ****
--- 294,321 ----
<option name="TEST_RUNNER" value="Text" />
</configuration>
+ <configuration name="DatabaseDataSetTest" type="JUnit" default="false" selected="false">
+ <option name="MAIN_CLASS_NAME" value="org.dbunit.database.DatabaseDataSetTest" />
+ <option name="VM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="TEST_RUNNER" value="Text" />
+ </configuration>
+ <configuration name="DeleteOperationTest" type="JUnit" default="false" selected="false">
+ <option name="MAIN_CLASS_NAME" value="org.dbunit.operation.DeleteOperationTest" />
+ <option name="VM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="TEST_RUNNER" value="Text" />
+ </configuration>
+ <configuration name="InsertOperationTest" type="JUnit" default="false" selected="false">
+ <option name="MAIN_CLASS_NAME" value="org.dbunit.operation.InsertOperationTest" />
+ <option name="VM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="TEST_RUNNER" value="Text" />
+ </configuration>
+ <configuration name="UpdateOperationTest" type="JUnit" default="false" selected="false">
+ <option name="MAIN_CLASS_NAME" value="org.dbunit.operation.UpdateOperationTest" />
+ <option name="VM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="TEST_RUNNER" value="Text" />
+ </configuration>
</component>
<component class="com.intellij.ide.SelectInManager">
***************
*** 284,302 ****
<component class="com.intellij.ide.desktop.IdeDocumentManager">
<recent_files>
! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/DeleteOperation.java" column="13" line="35" />
! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/InsertOperationTest.java" column="40" line="129" />
! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/AbstractBatchOperation.java" column="0" line="56" />
! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/DeleteOperationTest.java" column="0" line="205" />
! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/database/statement/IStatementFactory.java" column="17" line="32" />
! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/DeleteAllOperationTest.java" column="41" line="89" />
! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/DeleteAllOperation.java" column="21" line="53" />
! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/RefreshOperationTest.java" column="9" line="88" />
! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/mssqlserver/InsertIdentityOperation.java" column="0" line="108" />
! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/RefreshOperation.java" column="16" line="111" />
! <file_info url="jar://J:/jdk1.3.1_03/src.jar!/src/java/net/URL.java" column="19" line="83" />
! <file_info url="jar://$PROJECT_DIR$/lib/exml.jar!/electric/xml/Document.class" column="11" line="25" />
! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/FlatXmlDataSet.java" column="39" line="139" />
! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/UpdateOperationTest.java" column="50" line="123" />
! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/Export.java" column="16" line="118" />
</recent_files>
</component>
--- 335,353 ----
<component class="com.intellij.ide.desktop.IdeDocumentManager">
<recent_files>
! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/DatabaseEnvironment.java" column="13" line="35" />
! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/AbstractDatabaseTest.java" column="8" line="61" />
! <file_info url="file://$PROJECT_DIR$/src/sql/hypersonic.sql" column="2" line="40" />
! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/database/DatabaseDataSetTest.java" column="16" line="125" />
! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/database/DatabaseDataSet.java" column="0" line="65" />
! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/DeleteAllOperationTest.java" column="16" line="74" />
! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/AbstractBatchOperation.java" column="16" line="93" />
! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/UpdateOperationTest.java" column="75" line="120" />
! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/InsertOperationTest.java" column="59" line="104" />
! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/InsertOperation.java" column="0" line="80" />
! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/DeleteOperationTest.java" column="40" line="95" />
! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/UpdateOperation.java" column="0" line="81" />
! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/DeleteOperation.java" column="36" line="58" />
! <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/database/statement/MockBatchStatement.java" column="22" line="89" />
! <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/mssqlserver/InsertIdentityOperation.java" column="13" line="48" />
</recent_files>
</component>
***************
*** 313,322 ****
<expanded_node type="directory" url="file://$PROJECT_DIR$" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src" />
</navigator>
<navigator id="SourcepathNavigator" flattenPackages="false" showMembers="true">
- <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org" />
- <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" />
</navigator>
</component>
--- 364,376 ----
<expanded_node type="directory" url="file://$PROJECT_DIR$" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/sql" />
</navigator>
<navigator id="SourcepathNavigator" flattenPackages="false" showMembers="true">
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org/dbunit" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test" />
</navigator>
</component>
|
|
From: <mla...@us...> - 2002-08-03 14:49:53
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation
In directory usw-pr-cvs1:/tmp/cvs-serv20206/dbunit/src/test/org/dbunit/operation
Modified Files:
UpdateOperationTest.java
Log Message:
Ant Task - Close output stream after dataset export.
Index: UpdateOperationTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/operation/UpdateOperationTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** UpdateOperationTest.java 3 Aug 2002 02:26:40 -0000 1.11
--- UpdateOperationTest.java 3 Aug 2002 14:49:50 -0000 1.12
***************
*** 122,126 ****
}
! public void testMockExecuteWithDuplicateTable() throws Exception
{
String schemaName = "schema";
--- 122,126 ----
}
! public void testMockExecuteWithDuplicateTables() throws Exception
{
String schemaName = "schema";
|
|
From: <mla...@us...> - 2002-08-03 14:49:53
|
Update of /cvsroot/dbunit/dbunit/src/xml In directory usw-pr-cvs1:/tmp/cvs-serv20206/dbunit/src/xml Modified Files: caseInsensitiveDataSetDuplicateTest.xml refreshOperationDuplicateTest.xml Log Message: Ant Task - Close output stream after dataset export. Index: caseInsensitiveDataSetDuplicateTest.xml =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/xml/caseInsensitiveDataSetDuplicateTest.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** caseInsensitiveDataSetDuplicateTest.xml 3 Aug 2002 02:26:40 -0000 1.1 --- caseInsensitiveDataSetDuplicateTest.xml 3 Aug 2002 14:49:50 -0000 1.2 *************** *** 1,3 **** - <!-- edited with XML Spy v4.1 U (http://www.xmlspy.com) by Stephane Besson (R&D) --> <dataset> <DUPLiCATE_TABLE COLUMN0="row 0 col 0" COLUMN1="row 0 col 1" COLUMN2="row 0 col 2" COLUMN3="row 0 col 3"/> --- 1,2 ---- Index: refreshOperationDuplicateTest.xml =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/xml/refreshOperationDuplicateTest.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** refreshOperationDuplicateTest.xml 3 Aug 2002 02:26:40 -0000 1.1 --- refreshOperationDuplicateTest.xml 3 Aug 2002 14:49:50 -0000 1.2 *************** *** 1,3 **** - <!-- edited with XML Spy v4.1 U (http://www.xmlspy.com) by Stephane Besson (R&D) --> <dataset> <PK_TABLE PK0="1" PK1="11" PK2="111" NORMAL0="toto" NORMAL1="qwerty"/> --- 1,2 ---- |
|
From: <mla...@us...> - 2002-08-03 14:49:53
|
Update of /cvsroot/dbunit/dbunit
In directory usw-pr-cvs1:/tmp/cvs-serv20206/dbunit
Modified Files:
dbunit.ipr
Log Message:
Ant Task - Close output stream after dataset export.
Index: dbunit.ipr
===================================================================
RCS file: /cvsroot/dbunit/dbunit/dbunit.ipr,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** dbunit.ipr 3 Aug 2002 02:26:41 -0000 1.47
--- dbunit.ipr 3 Aug 2002 14:49:49 -0000 1.48
***************
*** 261,265 ****
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
</configuration>
! <configuration name="AllTests" type="JUnit" default="false" selected="false">
<option name="MAIN_CLASS_NAME" value="org.dbunit.AllTests" />
<option name="VM_PARAMETERS" />
--- 261,265 ----
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
</configuration>
! <configuration name="AllTests" type="JUnit" default="false" selected="true">
<option name="MAIN_CLASS_NAME" value="org.dbunit.AllTests" />
<option name="VM_PARAMETERS" />
***************
*** 267,360 ****
<option name="TEST_RUNNER" value="Text" />
</configuration>
- <configuration name="DbUnitTaskTest" type="JUnit" default="false" selected="false">
- <option name="MAIN_CLASS_NAME" value="org.dbunit.ant.DbUnitTaskTest" />
- <option name="VM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="TEST_RUNNER" value="Text" />
- </configuration>
- <configuration name="FilteredDataSetTest" type="JUnit" default="false" selected="false">
- <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.FilteredDataSetTest" />
- <option name="VM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="TEST_RUNNER" value="Text" />
- </configuration>
- <configuration name="FlatDtdDataSetTest" type="JUnit" default="false" selected="false">
- <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.xml.FlatDtdDataSetTest" />
- <option name="VM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="TEST_RUNNER" value="Text" />
- </configuration>
- <configuration name="FlatXmlDataSetTest" type="JUnit" default="false" selected="false">
- <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.xml.FlatXmlDataSetTest" />
- <option name="VM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="TEST_RUNNER" value="Text" />
- </configuration>
- <configuration name="XmlDataSetTest" type="JUnit" default="false" selected="false">
- <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.xml.XmlDataSetTest" />
- <option name="VM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="TEST_RUNNER" value="Text" />
- </configuration>
- <configuration name="FlatXmlTableWriteTest" type="JUnit" default="false" selected="false">
- <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.xml.FlatXmlTableWriteTest" />
- <option name="VM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="TEST_RUNNER" value="Text" />
- </configuration>
- <configuration name="CaseInsensitiveDataSetTest" type="JUnit" default="false" selected="false">
- <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.CaseInsensitiveDataSetTest" />
- <option name="VM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="TEST_RUNNER" value="Text" />
- </configuration>
- <configuration name="CompositeDataSetTest" type="JUnit" default="false" selected="false">
- <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.CompositeDataSetTest" />
- <option name="VM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="TEST_RUNNER" value="Text" />
- </configuration>
- <configuration name="DefaultDataSetTest" type="JUnit" default="false" selected="false">
- <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.DefaultDataSetTest" />
- <option name="VM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="TEST_RUNNER" value="Text" />
- </configuration>
- <configuration name="DatabaseDataSetTest" type="JUnit" default="false" selected="false">
- <option name="MAIN_CLASS_NAME" value="org.dbunit.database.DatabaseDataSetTest" />
- <option name="VM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="TEST_RUNNER" value="Text" />
- </configuration>
- <configuration name="DeleteOperationTest" type="JUnit" default="false" selected="false">
- <option name="MAIN_CLASS_NAME" value="org.dbunit.operation.DeleteOperationTest" />
- <option name="VM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="TEST_RUNNER" value="Text" />
- </configuration>
- <configuration name="InsertOperationTest" type="JUnit" default="false" selected="false">
- <option name="MAIN_CLASS_NAME" value="org.dbunit.operation.InsertOperationTest" />
- <option name="VM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="TEST_RUNNER" value="Text" />
- </configuration>
- <configuration name="UpdateOperationTest" type="JUnit" default="false" selected="false">
- <option name="MAIN_CLASS_NAME" value="org.dbunit.operation.UpdateOperationTest" />
- <option name="VM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="TEST_RUNNER" value="Text" />
- </configuration>
- <configuration name="DeleteAllOperationTest" type="JUnit" default="false" selected="false">
- <option name="MAIN_CLASS_NAME" value="org.dbunit.operation.DeleteAllOperationTest" />
- <option name="VM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="TEST_RUNNER" value="Text" />
- </configuration>
- <configuration name="RefreshOperationTest" type="JUnit" default="false" selected="true">
- <option name="MAIN_CLASS_NAME" value="org.dbunit.operation.RefreshOperationTest" />
- <option name="VM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="TEST_RUNNER" value="Text" />
- </configuration>
</component>
<component class="com.intellij.ide.SelectInManager">
--- 267,270 ----
***************
*** 374,382 ****
<component class="com.intellij.ide.desktop.IdeDocumentManager">
<recent_files>
- <file_info url="file://$PROJECT_DIR$/src/xml/flatXmlDataSetDuplicateTest.xml" column="5" line="2" />
- <file_info url="file://$PROJECT_DIR$/src/xml/compositeDataSetDuplicateTest1.xml" column="5" line="2" />
- <file_info url="file://$PROJECT_DIR$/src/xml/caseInsensitiveDataSetDuplicateTest.xml" column="14" line="2" />
- <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/AbstractDataSet.java" column="29" line="65" />
- <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/UpdateOperationTest.java" column="32" line="160" />
<file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/DeleteOperation.java" column="13" line="35" />
<file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/InsertOperationTest.java" column="40" line="129" />
--- 284,287 ----
***************
*** 389,392 ****
--- 294,302 ----
<file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/mssqlserver/InsertIdentityOperation.java" column="0" line="108" />
<file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/operation/RefreshOperation.java" column="16" line="111" />
+ <file_info url="jar://J:/jdk1.3.1_03/src.jar!/src/java/net/URL.java" column="19" line="83" />
+ <file_info url="jar://$PROJECT_DIR$/lib/exml.jar!/electric/xml/Document.class" column="11" line="25" />
+ <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/FlatXmlDataSet.java" column="39" line="139" />
+ <file_info url="file://$PROJECT_DIR$/src/test/org/dbunit/operation/UpdateOperationTest.java" column="50" line="123" />
+ <file_info url="file://$PROJECT_DIR$/src/java/org/dbunit/ant/Export.java" column="16" line="118" />
</recent_files>
</component>
***************
*** 400,409 ****
<navigator id="ClasspathNavigator" flattenPackages="false" showMembers="false" />
<navigator id="ProjectNavigator" flattenPackages="false" showMembers="false">
- <expanded_node type="directory" url="file://$PROJECT_DIR$/src" />
- <expanded_node type="directory" url="file://$PROJECT_DIR$" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/xml" />
</navigator>
<navigator id="SourcepathNavigator" flattenPackages="false" showMembers="true">
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/test" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" />
</navigator>
--- 310,321 ----
<navigator id="ClasspathNavigator" flattenPackages="false" showMembers="false" />
<navigator id="ProjectNavigator" flattenPackages="false" showMembers="false">
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/xml" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src" />
</navigator>
<navigator id="SourcepathNavigator" flattenPackages="false" showMembers="true">
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/test" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" />
</navigator>
|
|
From: <mla...@us...> - 2002-08-03 14:49:53
|
Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant In directory usw-pr-cvs1:/tmp/cvs-serv20206/dbunit/src/java/org/dbunit/ant Modified Files: Export.java Log Message: Ant Task - Close output stream after dataset export. Index: Export.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant/Export.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Export.java 15 Jul 2002 01:00:30 -0000 1.3 --- Export.java 3 Aug 2002 14:49:49 -0000 1.4 *************** *** 24,36 **** import org.dbunit.DatabaseUnitException; - import org.dbunit.database.DatabaseConnection; import org.dbunit.database.IDatabaseConnection; import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.xml.FlatXmlDataSet; ! import org.dbunit.dataset.xml.FlatDtdDataSet; ! import org.dbunit.dataset.xml.XmlDataSet; import java.io.*; - import java.sql.Connection; import java.sql.SQLException; import java.util.ArrayList; --- 24,32 ---- import org.dbunit.DatabaseUnitException; import org.dbunit.database.IDatabaseConnection; import org.dbunit.dataset.IDataSet; ! import org.dbunit.dataset.xml.*; import java.io.*; import java.sql.SQLException; import java.util.ArrayList; *************** *** 39,44 **** /** * The <code>Export</code> class is the step that facilitates exporting ! * the contents of the database and/or it's corresponding dtd to a file. ! * The export can be performed on a full dataset or a partial one if * specific table names are identified. * --- 35,40 ---- /** * The <code>Export</code> class is the step that facilitates exporting ! * the contents of the database and/or it's corresponding dtd to a file. ! * The export can be performed on a full dataset or a partial one if * specific table names are identified. * *************** *** 58,65 **** } ! private String getAbsolutePath(File filename) ! { return filename != null ? filename.getAbsolutePath() : "null"; ! } public File getDest() --- 54,61 ---- } ! private String getAbsolutePath(File filename) ! { return filename != null ? filename.getAbsolutePath() : "null"; ! } public File getDest() *************** *** 85,98 **** public void setFormat(String format) { ! if (format.equalsIgnoreCase("flat") ! || format.equalsIgnoreCase("xml") ! || format.equalsIgnoreCase("dtd")) ! { ! this.format = format; ! } ! else ! { ! throw new IllegalArgumentException("Type must be one of: 'flat'(default), 'xml', or 'dtd' but was: " + format); ! } } --- 81,94 ---- public void setFormat(String format) { ! if (format.equalsIgnoreCase("flat") ! || format.equalsIgnoreCase("xml") ! || format.equalsIgnoreCase("dtd")) ! { ! this.format = format; ! } ! else ! { ! throw new IllegalArgumentException("Type must be one of: 'flat'(default), 'xml', or 'dtd' but was: " + format); ! } } *************** *** 115,137 **** dataset = connection.createDataSet(getTableArray()); } ! if (dest == null) { ! throw new DatabaseUnitException ("'dest' is a required attribute of the <export> step."); ! } ! else ! { ! if (format.equalsIgnoreCase("flat")) ! { ! FlatXmlDataSet.write(dataset, new FileOutputStream(dest)); } ! else if (format.equalsIgnoreCase("xml")) { ! XmlDataSet.write(dataset, new FileOutputStream(dest)); } ! else if (format.equalsIgnoreCase("dtd")) ! { ! FlatDtdDataSet.write(dataset, new FileOutputStream(dest)); ! } ! } } --- 111,141 ---- dataset = connection.createDataSet(getTableArray()); } ! if (dest == null) { ! throw new DatabaseUnitException("'dest' is a required attribute of the <export> step."); ! } ! else ! { ! OutputStream out = new FileOutputStream(dest); ! try ! { ! if (format.equalsIgnoreCase("flat")) ! { ! FlatXmlDataSet.write(dataset, out); ! } ! else if (format.equalsIgnoreCase("xml")) ! { ! XmlDataSet.write(dataset, out); ! } ! else if (format.equalsIgnoreCase("dtd")) ! { ! FlatDtdDataSet.write(dataset, out); ! } } ! finally { ! out.close(); } ! } } *************** *** 160,165 **** { return "Executing export: " ! + "\n in format: " + format ! + " to datafile: " + getAbsolutePath(dest); } --- 164,169 ---- { return "Executing export: " ! + "\n in format: " + format ! + " to datafile: " + getAbsolutePath(dest); } |
|
From: <mla...@us...> - 2002-08-03 14:49:53
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/ant
In directory usw-pr-cvs1:/tmp/cvs-serv20206/dbunit/src/test/org/dbunit/ant
Modified Files:
DbUnitTaskTest.java
Log Message:
Ant Task - Close output stream after dataset export.
Index: DbUnitTaskTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/ant/DbUnitTaskTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DbUnitTaskTest.java 15 Jul 2002 01:00:30 -0000 1.4
--- DbUnitTaskTest.java 3 Aug 2002 14:49:49 -0000 1.5
***************
*** 23,29 ****
package org.dbunit.ant;
- import junit.framework.Test;
- import junit.framework.TestSuite;
-
import org.dbunit.DatabaseEnvironment;
import org.dbunit.operation.DatabaseOperation;
--- 23,26 ----
***************
*** 34,37 ****
--- 31,36 ----
import java.util.*;
+ import junit.framework.Test;
+ import junit.framework.TestSuite;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Target;
***************
*** 199,205 ****
String targetName = "test-export-full";
Export export = (Export)getFirstStepFromTarget(targetName);
! assertTrue("Should have been a flat format, "
! + "but was: " + export.getFormat(),
! export.getFormat().equalsIgnoreCase("flat"));
List tables = export.getTables();
assertTrue("Should have been an empty table list "
--- 198,204 ----
String targetName = "test-export-full";
Export export = (Export)getFirstStepFromTarget(targetName);
! assertTrue("Should have been a flat format, "
! + "but was: " + export.getFormat(),
! export.getFormat().equalsIgnoreCase("flat"));
List tables = export.getTables();
assertTrue("Should have been an empty table list "
***************
*** 227,233 ****
String targetName = "test-export-format-flat";
Export export = (Export)getFirstStepFromTarget(targetName);
! assertTrue("Should have been a flat format, "
! + "but was: " + export.getFormat(),
! export.getFormat().equalsIgnoreCase("flat"));
}
--- 226,232 ----
String targetName = "test-export-format-flat";
Export export = (Export)getFirstStepFromTarget(targetName);
! assertTrue("Should have been a flat format, "
! + "but was: " + export.getFormat(),
! export.getFormat().equalsIgnoreCase("flat"));
}
***************
*** 236,251 ****
String targetName = "test-export-format-xml";
Export export = (Export)getFirstStepFromTarget(targetName);
! assertTrue("Should have been an xml format, "
! + "but was: " + export.getFormat(),
! export.getFormat().equalsIgnoreCase("xml"));
}
public void testExportDtd()
{
! String targetName = "test-export-format-dtd";
Export export = (Export)getFirstStepFromTarget(targetName);
! assertTrue("Should have been a dtd format, "
! + "but was: " + export.getFormat(),
! export.getFormat().equalsIgnoreCase("dtd"));
}
--- 235,250 ----
String targetName = "test-export-format-xml";
Export export = (Export)getFirstStepFromTarget(targetName);
! assertTrue("Should have been an xml format, "
! + "but was: " + export.getFormat(),
! export.getFormat().equalsIgnoreCase("xml"));
}
public void testExportDtd()
{
! String targetName = "test-export-format-dtd";
Export export = (Export)getFirstStepFromTarget(targetName);
! assertTrue("Should have been a dtd format, "
! + "but was: " + export.getFormat(),
! export.getFormat().equalsIgnoreCase("dtd"));
}
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset
In directory usw-pr-cvs1:/tmp/cvs-serv21203/dbunit/src/test/org/dbunit/dataset
Modified Files:
CaseInsensitiveDataSetTest.java CompositeDataSetTest.java
FilteredDataSetTest.java AbstractDataSetTest.java
DefaultDataSetTest.java
Log Message:
Feature 551925 - Allow duplicate table names in dataset.
Index: CaseInsensitiveDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/CaseInsensitiveDataSetTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CaseInsensitiveDataSetTest.java 13 Jun 2002 17:25:00 -0000 1.2
--- CaseInsensitiveDataSetTest.java 3 Aug 2002 02:26:41 -0000 1.3
***************
*** 12,15 ****
--- 12,16 ----
import org.dbunit.dataset.xml.XmlDataSet;
+ import org.dbunit.dataset.xml.FlatXmlDataSet;
import java.io.FileInputStream;
***************
*** 30,33 ****
--- 31,40 ----
return new CaseInsensitiveDataSet(new XmlDataSet(new FileInputStream(
"src/xml/caseInsensitiveDataSetTest.xml")));
+ }
+
+ protected IDataSet createDuplicateDataSet() throws Exception
+ {
+ return new CaseInsensitiveDataSet(new FlatXmlDataSet(new FileInputStream(
+ "src/xml/caseInsensitiveDataSetDuplicateTest.xml")));
}
Index: CompositeDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/CompositeDataSetTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CompositeDataSetTest.java 13 Jun 2002 17:25:00 -0000 1.5
--- CompositeDataSetTest.java 3 Aug 2002 02:26:41 -0000 1.6
***************
*** 24,27 ****
--- 24,28 ----
import org.dbunit.dataset.xml.XmlDataSet;
+ import org.dbunit.dataset.xml.FlatXmlDataSet;
import java.io.FileInputStream;
***************
*** 51,54 ****
--- 52,70 ----
return new CompositeDataSet(dataSet1, dataSet2);
+ }
+
+ protected IDataSet createDuplicateDataSet() throws Exception
+ {
+ IDataSet dataSet1 = new FlatXmlDataSet(
+ new FileInputStream("src/xml/compositeDataSetDuplicateTest1.xml"));
+ assertTrue("count before combine (1)",
+ dataSet1.getTableNames().length < getExpectedDuplicateNames().length);
+
+ IDataSet dataSet2 = new FlatXmlDataSet(
+ new FileInputStream("src/xml/compositeDataSetDuplicateTest2.xml"));
+ assertTrue("count before combine (2)",
+ dataSet2.getTableNames().length < getExpectedDuplicateNames().length);
+
+ return new CompositeDataSet(dataSet1, dataSet2, false);
}
}
Index: FilteredDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/FilteredDataSetTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FilteredDataSetTest.java 4 Jul 2002 21:33:42 -0000 1.6
--- FilteredDataSetTest.java 3 Aug 2002 02:26:41 -0000 1.7
***************
*** 24,27 ****
--- 24,29 ----
import org.dbunit.dataset.xml.XmlDataSet;
+ import org.dbunit.dataset.xml.FlatXmlDataSet;
+ import org.dbunit.database.AmbiguousTableNameException;
import java.io.FileInputStream;
***************
*** 51,54 ****
--- 53,69 ----
}
+ protected IDataSet createDuplicateDataSet() throws Exception
+ {
+ IDataSet dataSet1 = new XmlDataSet(
+ new FileInputStream("src/xml/xmlDataSetDuplicateTest.xml"));
+ IDataSet dataSet2 = new XmlDataSet(
+ new FileInputStream("src/xml/filteredDataSetTest.xml"));
+
+ IDataSet dataSet = new CompositeDataSet(dataSet1, dataSet2, false);
+ assertEquals("count before filter", getExpectedDuplicateNames().length + 1,
+ dataSet.getTableNames().length);
+ return new FilteredDataSet(getExpectedDuplicateNames(), dataSet);
+ }
+
public void testGetFilteredTableNames() throws Exception
{
***************
*** 121,124 ****
--- 136,151 ----
}
+ public void testGetDuplicateTables() throws Exception
+ {
+ IDataSet dataSet = createDuplicateDataSet();
+ try
+ {
+ dataSet.getTables();
+ fail("Should throw AmbiguousTableNameException");
+ }
+ catch (AmbiguousTableNameException e)
+ {
+ }
+ }
}
Index: AbstractDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/AbstractDataSetTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** AbstractDataSetTest.java 4 Jul 2002 21:33:42 -0000 1.12
--- AbstractDataSetTest.java 3 Aug 2002 02:26:41 -0000 1.13
***************
*** 23,26 ****
--- 23,28 ----
package org.dbunit.dataset;
+ import org.dbunit.database.AmbiguousTableNameException;
+
import java.util.*;
***************
*** 42,45 ****
--- 44,53 ----
};
+ private static final String[] DUPLICATE_TABLE_NAMES = {
+ "DUPLICATE_TABLE",
+ "EMPTY_TABLE",
+ "DUPLICATE_TABLE",
+ };
+
public AbstractDataSetTest(String s)
{
***************
*** 52,55 ****
--- 60,78 ----
}
+ protected String[] getExpectedDuplicateNames()
+ {
+ return (String[])DUPLICATE_TABLE_NAMES.clone();
+ }
+
+ protected int[] getExpectedDuplicateRows()
+ {
+ return new int[] {1, 0, 2};
+ }
+
+ protected String getDuplicateTableName()
+ {
+ return "DUPLICATE_TABLE";
+ }
+
/**
* This method exclude BLOB_TABLE and CLOB_TABLE from the specified dataset
***************
*** 74,77 ****
--- 97,102 ----
protected abstract IDataSet createDataSet() throws Exception;
+ protected abstract IDataSet createDuplicateDataSet() throws Exception;
+
/**
* Many tests in this class assume a known sequence of table. For some
***************
*** 176,179 ****
--- 201,286 ----
}
+ public void testGetTables() throws Exception
+ {
+ String[] expected = getExpectedNames();
+ sort(expected);
+
+ IDataSet dataSet = createDataSet();
+ ITable[] tables = dataSet.getTables();
+ sort(tables);
+
+ assertEquals("table count", expected.length, tables.length);
+ for (int i = 0; i < expected.length; i++)
+ {
+ assertEqualsTableName("name " + i, expected[i],
+ tables[i].getTableMetaData().getTableName());
+ }
+ }
+
+ public void testGetTablesDefensiveCopy() throws Exception
+ {
+ IDataSet dataSet = createDataSet();
+ assertTrue("Should not be same intance",
+ dataSet.getTables() != dataSet.getTables());
+ }
+
+ public void testGetDuplicateTables() throws Exception
+ {
+ String[] expectedNames = getExpectedDuplicateNames();
+ int[] expectedRows = getExpectedDuplicateRows();
+ assertEquals(expectedNames.length, expectedRows.length);
+
+ IDataSet dataSet = createDuplicateDataSet();
+ ITable[] tables = dataSet.getTables();
+
+ assertEquals("table count", expectedNames.length, tables.length);
+ for (int i = 0; i < expectedNames.length; i++)
+ {
+ ITable table = tables[i];
+ String name = table.getTableMetaData().getTableName();
+ assertEqualsTableName("name " + i, expectedNames[i], name);
+ assertEquals("row count", expectedRows[i], table.getRowCount());
+ }
+ }
+
+ public void testGetDuplicateTableNames() throws Exception
+ {
+ String[] expected = getExpectedDuplicateNames();
+
+ IDataSet dataSet = createDuplicateDataSet();
+ String[] names = dataSet.getTableNames();
+
+ assertEquals("table count", expected.length, names.length);
+ for (int i = 0; i < expected.length; i++)
+ {
+ assertEqualsTableName("name " + i, expected[i], names[i]);
+ }
+ }
+
+ public void testGetDuplicateTable() throws Exception
+ {
+ IDataSet dataSet = createDuplicateDataSet();
+ try
+ {
+ dataSet.getTable(getDuplicateTableName());
+ fail("Should throw AmbiguousTableNameException");
+ }
+ catch (AmbiguousTableNameException e)
+ {
+ }
+ }
+
+ public void testGetDuplicateTableMetaData() throws Exception
+ {
+ IDataSet dataSet = createDuplicateDataSet();
+ try
+ {
+ dataSet.getTableMetaData(getDuplicateTableName());
+ fail("Should throw AmbiguousTableNameException");
+ }
+ catch (AmbiguousTableNameException e)
+ {
+ }
+ }
}
Index: DefaultDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/DefaultDataSetTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DefaultDataSetTest.java 13 Jun 2002 17:25:00 -0000 1.5
--- DefaultDataSetTest.java 3 Aug 2002 02:26:41 -0000 1.6
***************
*** 46,49 ****
--- 46,58 ----
return new DefaultDataSet(tables);
}
+
+ protected IDataSet createDuplicateDataSet() throws Exception
+ {
+ IDataSet dataSet = new XmlDataSet(
+ new FileInputStream("src/xml/xmlDataSetDuplicateTest.xml"));
+ ITable[] tables = DataSetUtils.getTables(dataSet);
+
+ return new DefaultDataSet(tables);
+ }
}
|
