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: <jef...@us...> - 2012-09-30 13:52:56
|
Revision: 1238
http://dbunit.svn.sourceforge.net/dbunit/?rev=1238&view=rev
Author: jeffjensen
Date: 2012-09-30 13:52:50 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
Add news item for the release.
Modified Paths:
--------------
trunk/dbunit/src/site/xdoc/index.xml
Modified: trunk/dbunit/src/site/xdoc/index.xml
===================================================================
--- trunk/dbunit/src/site/xdoc/index.xml 2012-09-30 13:52:29 UTC (rev 1237)
+++ trunk/dbunit/src/site/xdoc/index.xml 2012-09-30 13:52:50 UTC (rev 1238)
@@ -26,6 +26,10 @@
<section name="News">
<table border="1">
<tr>
+ <td>2012-09-30</td>
+ <td>DbUnit project team is proud to deliver the new 2.4.9 release: please have a look at the <a href="changes-report.html#a2.4.9">changes</a> report for the release contents.</td>
+ </tr>
+ <tr>
<td>2010-08-31</td>
<td>DbUnit project team is proud to deliver the new 2.4.8 release: please have a look at the <a href="changes-report.html#a2.4.8">changes</a> report for the release contents.</td>
</tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2012-09-30 13:52:35
|
Revision: 1237
http://dbunit.svn.sourceforge.net/dbunit/?rev=1237&view=rev
Author: jeffjensen
Date: 2012-09-30 13:52:29 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
Adjust release date.
Modified Paths:
--------------
trunk/dbunit/src/changes/changes.xml
Modified: trunk/dbunit/src/changes/changes.xml
===================================================================
--- trunk/dbunit/src/changes/changes.xml 2012-09-30 13:48:18 UTC (rev 1236)
+++ trunk/dbunit/src/changes/changes.xml 2012-09-30 13:52:29 UTC (rev 1237)
@@ -10,7 +10,7 @@
</properties>
<body>
- <release version="2.4.9" date="Sep 29, 2012" description="Additional toString()s, schema name usage, logging, timestamp, unique ID, table name in Operation exceptions, build with JDK 6.">
+ <release version="2.4.9" date="Sep 30, 2012" description="Additional toString()s, schema name usage, logging, timestamp, unique ID, table name in Operation exceptions, build with JDK 6.">
<action dev="jeffjensen" type="add" issue="3573007" due-to="jeffjensen">Change build to use current compiler on path vs 1.4. This is first dbUnit release done with JDK 6. If you encounter problems, please open a bug tracker item.</action>
<action dev="jeffjensen" type="add" due-to="jeffjensen">Add toString() methods to AbstractResultSetTable, ForwardOnlyResultSetTable, ScrollableResultSetTable, ColumnFilterTable.</action>
<action dev="jeffjensen" type="update" due-to="jeffjensen">For DefaultPrepAndExpectedTestCase, catch, log, and rethrow all log messages to help with troubleshooting. Tweak log messages. Improve doc example.</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2012-09-30 13:48:24
|
Revision: 1236
http://dbunit.svn.sourceforge.net/dbunit/?rev=1236&view=rev
Author: jeffjensen
Date: 2012-09-30 13:48:18 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
Add note to Changes Report, as this doc has not been maintained.
Modified Paths:
--------------
trunk/dbunit/src/site/xdoc/migration.xml
Modified: trunk/dbunit/src/site/xdoc/migration.xml
===================================================================
--- trunk/dbunit/src/site/xdoc/migration.xml 2012-09-30 13:02:28 UTC (rev 1235)
+++ trunk/dbunit/src/site/xdoc/migration.xml 2012-09-30 13:48:18 UTC (rev 1236)
@@ -5,8 +5,10 @@
<section>
<h2>Migration guide</h2>
- <p>To migrate from an older DbUnit release to a newer one you can find some useful information here.</p>
-
+ <p>To migrate from an older DbUnit release to a newer one you can find some useful information here.</p>
+
+ <p>Be sure to review the <a href="changes-report.html">Changes Report</a> for more current details.</p>
+
<subsection name="2.4.3 to 2.4.4">
<p>There has been a very small change to the API.</p>
<table border="1">
@@ -52,7 +54,7 @@
</tr>
</table>
</subsection>
-
+
<subsection name="2.4.2 to 2.4.3">
<p>There has been a very small change to the API.</p>
<table border="1">
@@ -87,8 +89,6 @@
</table>
</subsection>
-
-
<subsection name="2.2.x to 2.3.x">
<p>There have been some smaller changes to the API from 2.2.x to 2.3.x with the effect that those versions are not source compatible.</p>
<table border="1">
@@ -108,7 +108,7 @@
(or copy-pasted) multiple times before.
</td>
</tr>
-
+
<tr>
<td>1961269</td>
<td><code>org.dbunit.dataset.datatype.IDataTypeFactory.createDataType(int sqlType, String sqlTypeName, String tableName, String columnName)</code></td>
@@ -122,7 +122,6 @@
</table>
</subsection>
-
</section>
</body>
</document>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2012-09-30 13:02:34
|
Revision: 1235
http://dbunit.svn.sourceforge.net/dbunit/?rev=1235&view=rev
Author: jeffjensen
Date: 2012-09-30 13:02:28 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
Remove license report config from maven-changes-plugin. The Maven site gen fails as it is not a valid report. I could find not info on a license report on the plugin's web site.
Modified Paths:
--------------
trunk/dbunit/pom.xml
Modified: trunk/dbunit/pom.xml
===================================================================
--- trunk/dbunit/pom.xml 2012-09-30 12:43:27 UTC (rev 1234)
+++ trunk/dbunit/pom.xml 2012-09-30 13:02:28 UTC (rev 1235)
@@ -673,7 +673,6 @@
<reportSet>
<reports>
<report>changes-report</report>
- <report>license</report>
</reports>
</reportSet>
</reportSets>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2012-09-30 12:43:33
|
Revision: 1234
http://dbunit.svn.sourceforge.net/dbunit/?rev=1234&view=rev
Author: jeffjensen
Date: 2012-09-30 12:43:27 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
rollback the release of dbunit-2.4.9
Removed Paths:
-------------
tags/dbunit-2.4.9/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2012-09-30 12:37:00
|
Revision: 1233
http://dbunit.svn.sourceforge.net/dbunit/?rev=1233&view=rev
Author: jeffjensen
Date: 2012-09-30 12:36:54 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
[maven-release-plugin] rollback the release of dbunit-2.4.9
Modified Paths:
--------------
trunk/dbunit/pom.xml
Modified: trunk/dbunit/pom.xml
===================================================================
--- trunk/dbunit/pom.xml 2012-09-30 02:58:41 UTC (rev 1232)
+++ trunk/dbunit/pom.xml 2012-09-30 12:36:54 UTC (rev 1233)
@@ -4,7 +4,7 @@
<groupId>org.dbunit</groupId>
<artifactId>dbunit</artifactId>
- <version>2.4.10-SNAPSHOT</version>
+ <version>2.4.9-SNAPSHOT</version>
<packaging>jar</packaging>
<name>dbUnit Extension</name>
<url>http://dbunit.sourceforge.net</url>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2012-09-30 02:58:48
|
Revision: 1232
http://dbunit.svn.sourceforge.net/dbunit/?rev=1232&view=rev
Author: jeffjensen
Date: 2012-09-30 02:58:41 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/dbunit/pom.xml
Modified: trunk/dbunit/pom.xml
===================================================================
--- trunk/dbunit/pom.xml 2012-09-30 02:58:37 UTC (rev 1231)
+++ trunk/dbunit/pom.xml 2012-09-30 02:58:41 UTC (rev 1232)
@@ -4,7 +4,7 @@
<groupId>org.dbunit</groupId>
<artifactId>dbunit</artifactId>
- <version>2.4.9</version>
+ <version>2.4.10-SNAPSHOT</version>
<packaging>jar</packaging>
<name>dbUnit Extension</name>
<url>http://dbunit.sourceforge.net</url>
@@ -37,9 +37,9 @@
</properties>
<scm>
- <connection>scm:svn:https://dbunit.svn.sourceforge.net/svnroot/dbunit/tags/dbunit-2.4.9</connection>
- <developerConnection>scm:svn:https://dbunit.svn.sourceforge.net/svnroot/dbunit/tags/dbunit-2.4.9</developerConnection>
- <url>http://dbunit.svn.sourceforge.net/svnroot/dbunit/tags/dbunit-2.4.9</url>
+ <connection>scm:svn:https://dbunit.svn.sourceforge.net/svnroot/dbunit/trunk/dbunit</connection>
+ <developerConnection>scm:svn:https://dbunit.svn.sourceforge.net/svnroot/dbunit/trunk/dbunit</developerConnection>
+ <url>http://dbunit.svn.sourceforge.net/svnroot/dbunit/trunk/dbunit</url>
</scm>
<issueManagement>
<system>SourceForge</system>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2012-09-30 02:58:43
|
Revision: 1231
http://dbunit.svn.sourceforge.net/dbunit/?rev=1231&view=rev
Author: jeffjensen
Date: 2012-09-30 02:58:37 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
[maven-scm] copy for tag dbunit-2.4.9
Added Paths:
-----------
tags/dbunit-2.4.9/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2012-09-30 02:58:36
|
Revision: 1230
http://dbunit.svn.sourceforge.net/dbunit/?rev=1230&view=rev
Author: jeffjensen
Date: 2012-09-30 02:58:30 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
[maven-release-plugin] prepare release dbunit-2.4.9
Modified Paths:
--------------
trunk/dbunit/pom.xml
Modified: trunk/dbunit/pom.xml
===================================================================
--- trunk/dbunit/pom.xml 2012-09-29 17:55:43 UTC (rev 1229)
+++ trunk/dbunit/pom.xml 2012-09-30 02:58:30 UTC (rev 1230)
@@ -4,7 +4,7 @@
<groupId>org.dbunit</groupId>
<artifactId>dbunit</artifactId>
- <version>2.4.9-SNAPSHOT</version>
+ <version>2.4.9</version>
<packaging>jar</packaging>
<name>dbUnit Extension</name>
<url>http://dbunit.sourceforge.net</url>
@@ -37,9 +37,9 @@
</properties>
<scm>
- <connection>scm:svn:https://dbunit.svn.sourceforge.net/svnroot/dbunit/trunk/dbunit</connection>
- <developerConnection>scm:svn:https://dbunit.svn.sourceforge.net/svnroot/dbunit/trunk/dbunit</developerConnection>
- <url>http://dbunit.svn.sourceforge.net/svnroot/dbunit/trunk/dbunit</url>
+ <connection>scm:svn:https://dbunit.svn.sourceforge.net/svnroot/dbunit/tags/dbunit-2.4.9</connection>
+ <developerConnection>scm:svn:https://dbunit.svn.sourceforge.net/svnroot/dbunit/tags/dbunit-2.4.9</developerConnection>
+ <url>http://dbunit.svn.sourceforge.net/svnroot/dbunit/tags/dbunit-2.4.9</url>
</scm>
<issueManagement>
<system>SourceForge</system>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2012-09-29 17:55:49
|
Revision: 1229
http://dbunit.svn.sourceforge.net/dbunit/?rev=1229&view=rev
Author: jeffjensen
Date: 2012-09-29 17:55:43 +0000 (Sat, 29 Sep 2012)
Log Message:
-----------
[3573007] Remove POM setting and note related to using JDK 1.4.
Modified Paths:
--------------
trunk/dbunit/pom.xml
trunk/dbunit/src/changes/changes.xml
Modified: trunk/dbunit/pom.xml
===================================================================
--- trunk/dbunit/pom.xml 2012-09-29 17:54:06 UTC (rev 1228)
+++ trunk/dbunit/pom.xml 2012-09-29 17:55:43 UTC (rev 1229)
@@ -451,11 +451,6 @@
<source>${compileSource}</source>
<target>${compileSource}</target>
<compilerVersion>${compileSource}</compilerVersion>
- <!--
- TODO somehow we must ensure that the used rt.jar is really a
- 1.4 and not higher, also for continuous integration
- -->
- <!--<executable>${JAVA_1_4_HOME}/bin/javac</executable>-->
<debug>true</debug>
<fork>true</fork>
</configuration>
@@ -741,7 +736,6 @@
<source>${compileSource}</source>
<target>${compileSource}</target>
<compilerVersion>${compileSource}</compilerVersion>
- <executable>${JAVA_1_4_HOME}/bin/javac</executable>
<debug>true</debug>
<fork>true</fork>
</configuration>
Modified: trunk/dbunit/src/changes/changes.xml
===================================================================
--- trunk/dbunit/src/changes/changes.xml 2012-09-29 17:54:06 UTC (rev 1228)
+++ trunk/dbunit/src/changes/changes.xml 2012-09-29 17:55:43 UTC (rev 1229)
@@ -10,7 +10,8 @@
</properties>
<body>
- <release version="2.4.9" date="Sep 29, 2012" description="Additional toString()s, schema name usage, logging, timestamp, unique ID, table name in Operation exceptions.">
+ <release version="2.4.9" date="Sep 29, 2012" description="Additional toString()s, schema name usage, logging, timestamp, unique ID, table name in Operation exceptions, build with JDK 6.">
+ <action dev="jeffjensen" type="add" issue="3573007" due-to="jeffjensen">Change build to use current compiler on path vs 1.4. This is first dbUnit release done with JDK 6. If you encounter problems, please open a bug tracker item.</action>
<action dev="jeffjensen" type="add" due-to="jeffjensen">Add toString() methods to AbstractResultSetTable, ForwardOnlyResultSetTable, ScrollableResultSetTable, ColumnFilterTable.</action>
<action dev="jeffjensen" type="update" due-to="jeffjensen">For DefaultPrepAndExpectedTestCase, catch, log, and rethrow all log messages to help with troubleshooting. Tweak log messages. Improve doc example.</action>
<action dev="jeffjensen" type="fix" due-to="jeffjensen">Add schema name, if specified, to table name in query in AbstractDatabaseConnection.createTable().</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2012-09-29 17:54:12
|
Revision: 1228
http://dbunit.svn.sourceforge.net/dbunit/?rev=1228&view=rev
Author: jeffjensen
Date: 2012-09-29 17:54:06 +0000 (Sat, 29 Sep 2012)
Log Message:
-----------
Add use of Maven Enforcer plugin.
Modified Paths:
--------------
trunk/dbunit/pom.xml
Modified: trunk/dbunit/pom.xml
===================================================================
--- trunk/dbunit/pom.xml 2012-09-29 15:00:06 UTC (rev 1227)
+++ trunk/dbunit/pom.xml 2012-09-29 17:54:06 UTC (rev 1228)
@@ -20,12 +20,20 @@
</license>
</licenses>
<properties>
+ <!-- Maven configuration -->
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+ <!-- General values -->
<compileSource>1.4</compileSource>
<checkstyle.excludes>org/dbunit/util/concurrent/*.java</checkstyle.excludes>
+
+ <!-- Maven plugin versions -->
+ <enforcerPluginVersion>1.1.1</enforcerPluginVersion>
+
+ <!-- Framework versions -->
<logbackVersion>0.9.15</logbackVersion>
<slf4jVersion>1.5.6</slf4jVersion>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
<scm>
@@ -547,6 +555,26 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>${enforcerPluginVersion}</version>
+ <executions>
+ <execution>
+ <id>enforce-versions</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+ <version>1.4</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </plugin>
</plugins>
</build>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2012-09-29 15:00:12
|
Revision: 1227
http://dbunit.svn.sourceforge.net/dbunit/?rev=1227&view=rev
Author: jeffjensen
Date: 2012-09-29 15:00:06 +0000 (Sat, 29 Sep 2012)
Log Message:
-----------
Set release date for 2.4.9 in changes.xml.
Modified Paths:
--------------
trunk/dbunit/src/changes/changes.xml
Modified: trunk/dbunit/src/changes/changes.xml
===================================================================
--- trunk/dbunit/src/changes/changes.xml 2012-09-29 14:51:00 UTC (rev 1226)
+++ trunk/dbunit/src/changes/changes.xml 2012-09-29 15:00:06 UTC (rev 1227)
@@ -10,7 +10,7 @@
</properties>
<body>
- <release version="next" date="in SCM" description="Additional toString()s, schema name usage, logging, timestamp, unique ID, table name in Operation exceptions.">
+ <release version="2.4.9" date="Sep 29, 2012" description="Additional toString()s, schema name usage, logging, timestamp, unique ID, table name in Operation exceptions.">
<action dev="jeffjensen" type="add" due-to="jeffjensen">Add toString() methods to AbstractResultSetTable, ForwardOnlyResultSetTable, ScrollableResultSetTable, ColumnFilterTable.</action>
<action dev="jeffjensen" type="update" due-to="jeffjensen">For DefaultPrepAndExpectedTestCase, catch, log, and rethrow all log messages to help with troubleshooting. Tweak log messages. Improve doc example.</action>
<action dev="jeffjensen" type="fix" due-to="jeffjensen">Add schema name, if specified, to table name in query in AbstractDatabaseConnection.createTable().</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2012-09-29 14:51:07
|
Revision: 1226
http://dbunit.svn.sourceforge.net/dbunit/?rev=1226&view=rev
Author: jeffjensen
Date: 2012-09-29 14:51:00 +0000 (Sat, 29 Sep 2012)
Log Message:
-----------
[3071408] Fix testTypeCast to account for running from different timezones. Originally only worked with GMT offset of 0.
Modified Paths:
--------------
trunk/dbunit/src/test/java/org/dbunit/dataset/datatype/TimestampDataTypeTest.java
Modified: trunk/dbunit/src/test/java/org/dbunit/dataset/datatype/TimestampDataTypeTest.java
===================================================================
--- trunk/dbunit/src/test/java/org/dbunit/dataset/datatype/TimestampDataTypeTest.java 2011-05-25 14:10:21 UTC (rev 1225)
+++ trunk/dbunit/src/test/java/org/dbunit/dataset/datatype/TimestampDataTypeTest.java 2012-09-29 14:51:00 UTC (rev 1226)
@@ -103,6 +103,15 @@
public void testTypeCast() throws Exception
{
+ // Useful when manually testing this for other timezones
+ // Default setting is to test from default timezone
+ // TimeZone testTimeZone = TimeZone.getTimeZone("America/New_York");
+ // TimeZone testTimeZone = TimeZone.getTimeZone("Europe/Berlin");
+ // TimeZone.setDefault(testTimeZone);
+ TimeZone currentTimeZone = TimeZone.getDefault();
+ int rawOffset = currentTimeZone.getRawOffset();
+ int hourOffset = rawOffset / 1000 / 60 / 60;
+
Object[] values = {
null,
new Timestamp(1234),
@@ -128,13 +137,13 @@
new Timestamp(1234),
new Timestamp(Date.valueOf((new Date(1234).toString())).getTime()),
new Timestamp(1234),
- makeTimestamp(1995, 0, 7, 1, 22, 41, 900, "America/New_York"),
- makeTimestamp(1995, 0, 7, 1, 22, 41, 923, "America/New_York"),
+ makeTimestamp(1995, 0, 7, 1 - hourOffset, 22, 41, 900, "America/New_York"),
+ makeTimestamp(1995, 0, 7, 1 - hourOffset, 22, 41, 923, "America/New_York"),
makeTimestamp(1995, 0, 7, 1, 22, 41, 900),
makeTimestamp(1995, 0, 7, 1, 22, 41, 923),
- makeTimestamp(1995, 0, 7, 1, 22, 41, "America/New_York"),
+ makeTimestamp(1995, 0, 7, 1 - hourOffset, 22, 41, "America/New_York"),
makeTimestamp(1995, 0, 7, 1, 22, 41),
- makeTimestamp(2008, 10, 27, 14, 52, 38, "Europe/Berlin")
+ makeTimestamp(2008, 10, 27, 14 - hourOffset, 52, 38, "Europe/Berlin")
};
assertEquals("actual vs expected count", values.length, expected.length);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2011-05-25 14:10:27
|
Revision: 1225
http://dbunit.svn.sourceforge.net/dbunit/?rev=1225&view=rev
Author: jeffjensen
Date: 2011-05-25 14:10:21 +0000 (Wed, 25 May 2011)
Log Message:
-----------
Add log.trace message of which table processing. Add table name to exception to name the table with problem. This affects delete, insert, and update operations (remaining are delete all, truncate, insert identity).
Modified Paths:
--------------
trunk/dbunit/src/changes/changes.xml
trunk/dbunit/src/main/java/org/dbunit/operation/AbstractBatchOperation.java
Modified: trunk/dbunit/src/changes/changes.xml
===================================================================
--- trunk/dbunit/src/changes/changes.xml 2011-05-24 15:43:15 UTC (rev 1224)
+++ trunk/dbunit/src/changes/changes.xml 2011-05-25 14:10:21 UTC (rev 1225)
@@ -10,13 +10,14 @@
</properties>
<body>
- <release version="next" date="in SCM" description="Additional toString()s, schema usage, logging, timestamp.">
+ <release version="next" date="in SCM" description="Additional toString()s, schema name usage, logging, timestamp, unique ID, table name in Operation exceptions.">
<action dev="jeffjensen" type="add" due-to="jeffjensen">Add toString() methods to AbstractResultSetTable, ForwardOnlyResultSetTable, ScrollableResultSetTable, ColumnFilterTable.</action>
<action dev="jeffjensen" type="update" due-to="jeffjensen">For DefaultPrepAndExpectedTestCase, catch, log, and rethrow all log messages to help with troubleshooting. Tweak log messages. Improve doc example.</action>
<action dev="jeffjensen" type="fix" due-to="jeffjensen">Add schema name, if specified, to table name in query in AbstractDatabaseConnection.createTable().</action>
<action dev="rlogiacco" type="fix" issue="3071408" due-to="chrisphe">New Handling of Timestamp in 2.4.8 has error with subseconds</action>
<action dev="jeffjensen" type="fix" issue="3132130" due-to="jeffjensen">AbstractDatabaseConnection createQueryTable throws UOEx.</action>
<action dev="jeffjensen" type="add" issue="3170998" due-to="mcpierceaim">Provides support for the uniqueidentifier type in Microsoft SQLServer.</action>
+ <action dev="jeffjensen" type="update" due-to="jeffjensen">To help troubleshooting, add table name to Operation exceptions: refresh, delete, insert, update.</action>
</release>
<release version="2.4.8" date="Sep 2, 2010" description="Bug fixes, timezone support, Oracle support improvements, new DataFileLoader, new PrepAndExpectedTestCase">
<action dev="gommma" type="add" issue="3027485" due-to="Yishai">MSSQL JDBC Driver 3.0 doesn't work well</action>
Modified: trunk/dbunit/src/main/java/org/dbunit/operation/AbstractBatchOperation.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/operation/AbstractBatchOperation.java 2011-05-24 15:43:15 UTC (rev 1224)
+++ trunk/dbunit/src/main/java/org/dbunit/operation/AbstractBatchOperation.java 2011-05-25 14:10:21 UTC (rev 1225)
@@ -131,6 +131,9 @@
{
ITable table = iterator.getTable();
+ String tableName=table.getTableMetaData().getTableName();
+ logger.trace("execute: processing table='{}'", tableName);
+
// Do not process empty table
if (isEmpty(table))
{
@@ -206,6 +209,12 @@
statement.executeBatch();
statement.clearBatch();
}
+ catch (SQLException e)
+ {
+ final String msg =
+ "Exception processing table name='" + tableName + "'";
+ throw new DatabaseUnitException(msg, e);
+ }
finally
{
if (statement != null)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2011-05-24 15:43:21
|
Revision: 1224
http://dbunit.svn.sourceforge.net/dbunit/?rev=1224&view=rev
Author: jeffjensen
Date: 2011-05-24 15:43:15 +0000 (Tue, 24 May 2011)
Log Message:
-----------
Add log.trace message of which table processing. Add table name to exception to name the table with problem (should do this with other operations too).
Modified Paths:
--------------
trunk/dbunit/src/main/java/org/dbunit/operation/RefreshOperation.java
Modified: trunk/dbunit/src/main/java/org/dbunit/operation/RefreshOperation.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/operation/RefreshOperation.java 2011-05-03 14:45:06 UTC (rev 1223)
+++ trunk/dbunit/src/main/java/org/dbunit/operation/RefreshOperation.java 2011-05-24 15:43:15 UTC (rev 1224)
@@ -88,6 +88,9 @@
while (iterator.next())
{
ITable table = iterator.getTable();
+
+ String tableName=table.getTableMetaData().getTableName();
+ logger.trace("execute: processing table='{}'", tableName);
// Do not process empty table
if (isEmpty(table))
@@ -120,6 +123,12 @@
// end of table
}
+ catch (SQLException e)
+ {
+ final String msg =
+ "Exception processing table name='" + tableName + "'";
+ throw new DatabaseUnitException(msg, e);
+ }
finally
{
// cleanup
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2011-05-03 14:45:12
|
Revision: 1223
http://dbunit.svn.sourceforge.net/dbunit/?rev=1223&view=rev
Author: jeffjensen
Date: 2011-05-03 14:45:06 +0000 (Tue, 03 May 2011)
Log Message:
-----------
Add verifyData() to interface, which should have originally been there.
Modified Paths:
--------------
trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java
trunk/dbunit/src/main/java/org/dbunit/PrepAndExpectedTestCase.java
Modified: trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java 2011-04-27 20:07:29 UTC (rev 1222)
+++ trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java 2011-05-03 14:45:06 UTC (rev 1223)
@@ -314,11 +314,8 @@
}
/**
- * For the provided VerifyTableDefinitions, verify each table's actual
- * results are as expected. Uses the connection from the provided
- * databaseTester.
- *
- * @throws Exception
+ * {@inheritDoc}
+ * Uses the connection from the provided databaseTester.
*/
public void verifyData() throws Exception {
if (databaseTester == null) {
Modified: trunk/dbunit/src/main/java/org/dbunit/PrepAndExpectedTestCase.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/PrepAndExpectedTestCase.java 2011-04-27 20:07:29 UTC (rev 1222)
+++ trunk/dbunit/src/main/java/org/dbunit/PrepAndExpectedTestCase.java 2011-05-03 14:45:06 UTC (rev 1223)
@@ -89,6 +89,14 @@
void postTest(boolean verifyData) throws Exception;
/**
+ * For the provided VerifyTableDefinitions, verify each table's actual
+ * results are as expected.
+ *
+ * @throws Exception
+ */
+ public void verifyData() throws Exception;
+
+ /**
* Cleanup tables specified in prep and expected datasets, using the
* provided databaseTester. See
* {@link org.dbunit.IDatabaseTester#onTearDown()}.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2011-04-27 20:07:35
|
Revision: 1222
http://dbunit.svn.sourceforge.net/dbunit/?rev=1222&view=rev
Author: jeffjensen
Date: 2011-04-27 20:07:29 +0000 (Wed, 27 Apr 2011)
Log Message:
-----------
DefaultPrepAndExpectedTestCase: Add display of additional column info on comparison failures. Improve/correct log messages.
Modified Paths:
--------------
trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java
Modified: trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java 2011-04-27 15:21:28 UTC (rev 1221)
+++ trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java 2011-04-27 20:07:29 UTC (rev 1222)
@@ -24,6 +24,7 @@
import java.util.List;
import org.dbunit.database.IDatabaseConnection;
+import org.dbunit.dataset.Column;
import org.dbunit.dataset.CompositeDataSet;
import org.dbunit.dataset.DataSetException;
import org.dbunit.dataset.IDataSet;
@@ -292,7 +293,7 @@
databaseTester.setDataSet(dataset);
databaseTester.onTearDown();
- LOG.debug("verifyData: Clean up done");
+ LOG.debug("cleanupData: Clean up done");
}
/**
@@ -400,28 +401,33 @@
public void verifyData(ITable expectedTable, ITable actualTable,
String[] excludeColumns, String[] includeColumns)
throws DatabaseUnitException {
+ final String method = "verifyData: ";
// Filter out the columns from the expected and actual results
- LOG.debug("Applying filters to expected table");
+ LOG.debug(method + "Applying filters to expected table");
ITable expectedFilteredTable =
applyColumnFilters(expectedTable, excludeColumns,
includeColumns);
- LOG.debug("Applying filters to actual table");
+ LOG.debug(method + "Applying filters to actual table");
ITable actualFilteredTable =
applyColumnFilters(actualTable, excludeColumns, includeColumns);
- LOG.debug("Sorting expected table");
+ LOG.debug(method + "Sorting expected table");
SortedTable expectedSortedTable =
new SortedTable(expectedFilteredTable);
- LOG.debug("Sorted expected table={}", expectedSortedTable);
+ LOG.debug(method + "Sorted expected table={}", expectedSortedTable);
- LOG.debug("Sorting actual table");
+ LOG.debug(method + "Sorting actual table");
SortedTable actualSortedTable =
new SortedTable(actualFilteredTable, expectedFilteredTable
.getTableMetaData());
- LOG.debug("Sorted actual table={}", actualSortedTable);
+ LOG.debug(method + "Sorted actual table={}", actualSortedTable);
- LOG.debug("Comparing expected table to actual table");
- Assertion.assertEquals(expectedSortedTable, actualSortedTable);
+ LOG.debug(method + "Comparing expected table to actual table");
+ Column[] additionalColumnInfo =
+ expectedTable.getTableMetaData().getColumns();
+
+ Assertion.assertEquals(expectedSortedTable, actualSortedTable,
+ additionalColumnInfo);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2011-04-27 15:21:34
|
Revision: 1221
http://dbunit.svn.sourceforge.net/dbunit/?rev=1221&view=rev
Author: jeffjensen
Date: 2011-04-27 15:21:28 +0000 (Wed, 27 Apr 2011)
Log Message:
-----------
Debug log the sorted expected and actual tables to help troubleshooting in DefaultPrepAndExpectedTestCase.
Modified Paths:
--------------
trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java
Modified: trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java 2011-04-27 15:17:49 UTC (rev 1220)
+++ trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java 2011-04-27 15:21:28 UTC (rev 1221)
@@ -412,10 +412,13 @@
LOG.debug("Sorting expected table");
SortedTable expectedSortedTable =
new SortedTable(expectedFilteredTable);
+ LOG.debug("Sorted expected table={}", expectedSortedTable);
+
LOG.debug("Sorting actual table");
SortedTable actualSortedTable =
new SortedTable(actualFilteredTable, expectedFilteredTable
.getTableMetaData());
+ LOG.debug("Sorted actual table={}", actualSortedTable);
LOG.debug("Comparing expected table to actual table");
Assertion.assertEquals(expectedSortedTable, actualSortedTable);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2011-04-27 15:17:55
|
Revision: 1220
http://dbunit.svn.sourceforge.net/dbunit/?rev=1220&view=rev
Author: jeffjensen
Date: 2011-04-27 15:17:49 +0000 (Wed, 27 Apr 2011)
Log Message:
-----------
Add toString() to ColumnFilterTable so log messages will display contents.
Modified Paths:
--------------
trunk/dbunit/src/changes/changes.xml
trunk/dbunit/src/main/java/org/dbunit/dataset/ColumnFilterTable.java
Modified: trunk/dbunit/src/changes/changes.xml
===================================================================
--- trunk/dbunit/src/changes/changes.xml 2011-04-11 02:43:23 UTC (rev 1219)
+++ trunk/dbunit/src/changes/changes.xml 2011-04-27 15:17:49 UTC (rev 1220)
@@ -11,7 +11,7 @@
<body>
<release version="next" date="in SCM" description="Additional toString()s, schema usage, logging, timestamp.">
- <action dev="jeffjensen" type="add" due-to="jeffjensen">Add toString() methods to AbstractResultSetTable, ForwardOnlyResultSetTable, ScrollableResultSetTable.</action>
+ <action dev="jeffjensen" type="add" due-to="jeffjensen">Add toString() methods to AbstractResultSetTable, ForwardOnlyResultSetTable, ScrollableResultSetTable, ColumnFilterTable.</action>
<action dev="jeffjensen" type="update" due-to="jeffjensen">For DefaultPrepAndExpectedTestCase, catch, log, and rethrow all log messages to help with troubleshooting. Tweak log messages. Improve doc example.</action>
<action dev="jeffjensen" type="fix" due-to="jeffjensen">Add schema name, if specified, to table name in query in AbstractDatabaseConnection.createTable().</action>
<action dev="rlogiacco" type="fix" issue="3071408" due-to="chrisphe">New Handling of Timestamp in 2.4.8 has error with subseconds</action>
Modified: trunk/dbunit/src/main/java/org/dbunit/dataset/ColumnFilterTable.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/dataset/ColumnFilterTable.java 2011-04-11 02:43:23 UTC (rev 1219)
+++ trunk/dbunit/src/main/java/org/dbunit/dataset/ColumnFilterTable.java 2011-04-27 15:17:49 UTC (rev 1220)
@@ -99,4 +99,8 @@
return this.originalTable.getTableMetaData();
}
+ public String toString()
+ {
+ return this.originalTable.toString();
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2011-04-11 02:43:29
|
Revision: 1219
http://dbunit.svn.sourceforge.net/dbunit/?rev=1219&view=rev
Author: jeffjensen
Date: 2011-04-11 02:43:23 +0000 (Mon, 11 Apr 2011)
Log Message:
-----------
Add TODO for missing tests.
Modified Paths:
--------------
trunk/dbunit/src/test/java/org/dbunit/ext/mssql/UniqueIdentifierTypeTest.java
Modified: trunk/dbunit/src/test/java/org/dbunit/ext/mssql/UniqueIdentifierTypeTest.java
===================================================================
--- trunk/dbunit/src/test/java/org/dbunit/ext/mssql/UniqueIdentifierTypeTest.java 2011-04-11 02:41:50 UTC (rev 1218)
+++ trunk/dbunit/src/test/java/org/dbunit/ext/mssql/UniqueIdentifierTypeTest.java 2011-04-11 02:43:23 UTC (rev 1219)
@@ -32,8 +32,8 @@
* <code>UniqueIdentifierTypeTest</code> ensures that the {@link UniqueIdentifierType} works as expected.
*
* @author Darryl L. Pierce <dp...@re...>
- *
*/
+// TODO add tests for setSqlValue(Object, int, PreparedStatement)
public class UniqueIdentifierTypeTest extends TestCase {
private UUID existingUuid;
private UniqueIdentifierType uuidType;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2011-04-11 02:41:56
|
Revision: 1218
http://dbunit.svn.sourceforge.net/dbunit/?rev=1218&view=rev
Author: jeffjensen
Date: 2011-04-11 02:41:50 +0000 (Mon, 11 Apr 2011)
Log Message:
-----------
Remove line from apparent leftover of copy/paste in MsSqlDataTypeFactoryTest.
Modified Paths:
--------------
trunk/dbunit/src/test/java/org/dbunit/ext/mssql/MsSqlDataTypeFactoryTest.java
Modified: trunk/dbunit/src/test/java/org/dbunit/ext/mssql/MsSqlDataTypeFactoryTest.java
===================================================================
--- trunk/dbunit/src/test/java/org/dbunit/ext/mssql/MsSqlDataTypeFactoryTest.java 2011-04-11 02:29:39 UTC (rev 1217)
+++ trunk/dbunit/src/test/java/org/dbunit/ext/mssql/MsSqlDataTypeFactoryTest.java 2011-04-11 02:41:50 UTC (rev 1218)
@@ -70,7 +70,6 @@
int sqlType = Types.CHAR;
String sqlTypeName = UniqueIdentifierType.UNIQUE_IDENTIFIER_TYPE;
- DataType expected = DataType.CHAR;
DataType actual = createFactory().createDataType(sqlType, sqlTypeName);
assertTrue(actual instanceof UniqueIdentifierType);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2011-04-11 02:29:47
|
Revision: 1217
http://dbunit.svn.sourceforge.net/dbunit/?rev=1217&view=rev
Author: jeffjensen
Date: 2011-04-11 02:29:39 +0000 (Mon, 11 Apr 2011)
Log Message:
-----------
SF Feature Request 3170998. Patch by Darryl Pierce (mcpierceaim): Provides support for the uniqueidentifier column type in SQLServer.
The column type is handled via the UniqueIdentierType provided by the patch. This type marshalls a UUID value into a uniqueidentifier column and back. Modified the MsSqlDataTypeFactory to correctly return this new type when it detects a UUID. Also included are unit tests to verify some of the new code.
Modified Paths:
--------------
trunk/dbunit/pom.xml
trunk/dbunit/src/changes/changes.xml
trunk/dbunit/src/main/java/org/dbunit/ext/mssql/MsSqlDataTypeFactory.java
trunk/dbunit/src/test/java/org/dbunit/ext/mssql/AllTests.java
trunk/dbunit/src/test/java/org/dbunit/ext/mssql/MsSqlDataTypeFactoryTest.java
Added Paths:
-----------
trunk/dbunit/src/main/java/org/dbunit/ext/mssql/UniqueIdentifierType.java
trunk/dbunit/src/test/java/org/dbunit/ext/mssql/UniqueIdentifierTypeTest.java
Modified: trunk/dbunit/pom.xml
===================================================================
--- trunk/dbunit/pom.xml 2011-02-22 03:22:19 UTC (rev 1216)
+++ trunk/dbunit/pom.xml 2011-04-11 02:29:39 UTC (rev 1217)
@@ -213,6 +213,13 @@
<role>IDatabaseTester creator</role>
</roles>
</contributor>
+ <contributor>
+ <name>Darryl Pierce</name>
+ <email>mcp...@us...</email>
+ <roles>
+ <role>SQLServer uniqueidentifier column type</role>
+ </roles>
+ </contributor>
</contributors>
Modified: trunk/dbunit/src/changes/changes.xml
===================================================================
--- trunk/dbunit/src/changes/changes.xml 2011-02-22 03:22:19 UTC (rev 1216)
+++ trunk/dbunit/src/changes/changes.xml 2011-04-11 02:29:39 UTC (rev 1217)
@@ -16,6 +16,7 @@
<action dev="jeffjensen" type="fix" due-to="jeffjensen">Add schema name, if specified, to table name in query in AbstractDatabaseConnection.createTable().</action>
<action dev="rlogiacco" type="fix" issue="3071408" due-to="chrisphe">New Handling of Timestamp in 2.4.8 has error with subseconds</action>
<action dev="jeffjensen" type="fix" issue="3132130" due-to="jeffjensen">AbstractDatabaseConnection createQueryTable throws UOEx.</action>
+ <action dev="jeffjensen" type="add" issue="3170998" due-to="mcpierceaim">Provides support for the uniqueidentifier type in Microsoft SQLServer.</action>
</release>
<release version="2.4.8" date="Sep 2, 2010" description="Bug fixes, timezone support, Oracle support improvements, new DataFileLoader, new PrepAndExpectedTestCase">
<action dev="gommma" type="add" issue="3027485" due-to="Yishai">MSSQL JDBC Driver 3.0 doesn't work well</action>
Modified: trunk/dbunit/src/main/java/org/dbunit/ext/mssql/MsSqlDataTypeFactory.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/ext/mssql/MsSqlDataTypeFactory.java 2011-02-22 03:22:19 UTC (rev 1216)
+++ trunk/dbunit/src/main/java/org/dbunit/ext/mssql/MsSqlDataTypeFactory.java 2011-04-11 02:29:39 UTC (rev 1217)
@@ -20,6 +20,7 @@
*/
package org.dbunit.ext.mssql;
+import java.sql.Types;
import java.util.Arrays;
import java.util.Collection;
@@ -67,6 +68,14 @@
logger.debug("createDataType(sqlType={}, sqlTypeName={}) - start", String.valueOf(sqlType), sqlTypeName);
// TODO : Process MS SQL Server custom datatype here
+ if(sqlType == Types.CHAR)
+ {
+ if (UniqueIdentifierType.UNIQUE_IDENTIFIER_TYPE.equals(sqlTypeName))
+ {
+ return new UniqueIdentifierType();
+ }
+ }
+
switch(sqlType) {
case NCHAR: return DataType.CHAR; // nchar
case NVARCHAR: return DataType.VARCHAR; // nvarchar
Added: trunk/dbunit/src/main/java/org/dbunit/ext/mssql/UniqueIdentifierType.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/ext/mssql/UniqueIdentifierType.java (rev 0)
+++ trunk/dbunit/src/main/java/org/dbunit/ext/mssql/UniqueIdentifierType.java 2011-04-11 02:29:39 UTC (rev 1217)
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2011, Red Hat, Inc.
+ * Written by Darryl L. Pierce <dp...@re...>.
+ *
+ * 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.ext.mssql;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.UUID;
+
+import org.dbunit.dataset.datatype.AbstractDataType;
+import org.dbunit.dataset.datatype.TypeCastException;
+
+/**
+ * <code>UniqueIdentifierType</code> provides support for the "uniqueidentifier" column in Microsoft SQLServer
+ * databases. It users the {@link UUID}
+ *
+ * @Author Darryl L. Pierce <dp...@re...>
+ * @Since 02 February 2011
+ * @version $Revision$
+ */
+public class UniqueIdentifierType extends AbstractDataType {
+ static final String UNIQUE_IDENTIFIER_TYPE = "uniqueidentifier";
+
+ public UniqueIdentifierType() {
+ super(UNIQUE_IDENTIFIER_TYPE, Types.CHAR, UUID.class, false);
+ }
+
+ public Object typeCast(Object value) throws TypeCastException {
+ return value.toString();
+ }
+
+ public Object getSqlValue(int column, ResultSet resultSet) throws SQLException, TypeCastException {
+ String value = resultSet.getString(column);
+
+ try {
+ return value != null && !value.isEmpty() ? UUID.fromString(value) : null;
+ } catch (NumberFormatException error) {
+ throw new TypeCastException("Invalid UUID: " + value, error);
+ }
+ }
+
+ public void setSqlValue(Object value, int column, PreparedStatement statement) throws SQLException,
+ TypeCastException {
+ if (value == null)
+ statement.setObject(column, null);
+ else
+ statement.setObject(column, value.toString());
+ }
+}
Property changes on: trunk/dbunit/src/main/java/org/dbunit/ext/mssql/UniqueIdentifierType.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/dbunit/src/test/java/org/dbunit/ext/mssql/AllTests.java
===================================================================
--- trunk/dbunit/src/test/java/org/dbunit/ext/mssql/AllTests.java 2011-02-22 03:22:19 UTC (rev 1216)
+++ trunk/dbunit/src/test/java/org/dbunit/ext/mssql/AllTests.java 2011-04-11 02:29:39 UTC (rev 1217)
@@ -36,6 +36,7 @@
suite.addTest(new TestSuite(InsertIdentityOperationIT.class));
suite.addTest(new TestSuite(MsSqlDataTypeFactoryTest.class));
+ suite.addTest(new TestSuite(UniqueIdentifierTypeTest.class));
return suite;
}
Modified: trunk/dbunit/src/test/java/org/dbunit/ext/mssql/MsSqlDataTypeFactoryTest.java
===================================================================
--- trunk/dbunit/src/test/java/org/dbunit/ext/mssql/MsSqlDataTypeFactoryTest.java 2011-02-22 03:22:19 UTC (rev 1216)
+++ trunk/dbunit/src/test/java/org/dbunit/ext/mssql/MsSqlDataTypeFactoryTest.java 2011-04-11 02:29:39 UTC (rev 1217)
@@ -1,5 +1,7 @@
package org.dbunit.ext.mssql;
+import java.sql.Types;
+
import org.dbunit.dataset.datatype.DataType;
import org.dbunit.dataset.datatype.IDataTypeFactory;
import junit.framework.TestCase;
@@ -62,4 +64,14 @@
DataType expected = DataType.LONGVARCHAR;
DataType actual = createFactory().createDataType(sqlType, sqlTypeName);
assertEquals("type", expected, actual);
- }}
+ }
+
+ public void testCreateUniqueIdentifierType() throws Exception {
+ int sqlType = Types.CHAR;
+ String sqlTypeName = UniqueIdentifierType.UNIQUE_IDENTIFIER_TYPE;
+
+ DataType expected = DataType.CHAR;
+ DataType actual = createFactory().createDataType(sqlType, sqlTypeName);
+ assertTrue(actual instanceof UniqueIdentifierType);
+ }
+}
Added: trunk/dbunit/src/test/java/org/dbunit/ext/mssql/UniqueIdentifierTypeTest.java
===================================================================
--- trunk/dbunit/src/test/java/org/dbunit/ext/mssql/UniqueIdentifierTypeTest.java (rev 0)
+++ trunk/dbunit/src/test/java/org/dbunit/ext/mssql/UniqueIdentifierTypeTest.java 2011-04-11 02:29:39 UTC (rev 1217)
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2011, Red Hat, Inc.
+ * Written by Darryl L. Pierce <dp...@re...>.
+ *
+ * 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.ext.mssql;
+
+import java.sql.SQLException;
+import java.util.UUID;
+
+import junit.framework.TestCase;
+
+import org.dbunit.dataset.datatype.TypeCastException;
+
+import com.mockobjects.sql.MockSingleRowResultSet;
+
+/**
+ * <code>UniqueIdentifierTypeTest</code> ensures that the {@link UniqueIdentifierType} works as expected.
+ *
+ * @author Darryl L. Pierce <dp...@re...>
+ *
+ */
+public class UniqueIdentifierTypeTest extends TestCase {
+ private UUID existingUuid;
+ private UniqueIdentifierType uuidType;
+ private MockSingleRowResultSet resultSet;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ uuidType = new UniqueIdentifierType();
+
+ resultSet = new MockSingleRowResultSet();
+ existingUuid = UUID.randomUUID();
+ }
+
+ protected void tearDown() throws Exception {
+ resultSet.verify();
+ }
+
+ /**
+ * Ensures that an exception occurs if the UUID value is invalid.
+ *
+ * @throws SQLException
+ */
+ public void testGetSqlValueWithBadValue() throws SQLException {
+ resultSet.addExpectedIndexedValues(new String[] { existingUuid.toString() + "Z" });
+
+ try {
+ uuidType.getSqlValue(1, resultSet);
+
+ fail("Method should have throw an exception");
+ } catch (TypeCastException e) {
+ assertTrue(true);
+ }
+ }
+
+ /**
+ * Ensures that unmarshalling a UUID value works correctly.
+ *
+ * @throws SQLException
+ * @throws TypeCastException
+ */
+ public void testGetValue() throws TypeCastException, SQLException {
+ resultSet.addExpectedIndexedValues(new String[] { existingUuid.toString() });
+
+ UUID result = (UUID) uuidType.getSqlValue(1, resultSet);
+
+ assertEquals(existingUuid, result);
+
+ resultSet.verify();
+ }
+}
Property changes on: trunk/dbunit/src/test/java/org/dbunit/ext/mssql/UniqueIdentifierTypeTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2011-02-22 03:22:25
|
Revision: 1216
http://dbunit.svn.sourceforge.net/dbunit/?rev=1216&view=rev
Author: jeffjensen
Date: 2011-02-22 03:22:19 +0000 (Tue, 22 Feb 2011)
Log Message:
-----------
Update changes for 3132130 fix.
Modified Paths:
--------------
trunk/dbunit/src/changes/changes.xml
Modified: trunk/dbunit/src/changes/changes.xml
===================================================================
--- trunk/dbunit/src/changes/changes.xml 2011-02-22 03:19:38 UTC (rev 1215)
+++ trunk/dbunit/src/changes/changes.xml 2011-02-22 03:22:19 UTC (rev 1216)
@@ -15,6 +15,7 @@
<action dev="jeffjensen" type="update" due-to="jeffjensen">For DefaultPrepAndExpectedTestCase, catch, log, and rethrow all log messages to help with troubleshooting. Tweak log messages. Improve doc example.</action>
<action dev="jeffjensen" type="fix" due-to="jeffjensen">Add schema name, if specified, to table name in query in AbstractDatabaseConnection.createTable().</action>
<action dev="rlogiacco" type="fix" issue="3071408" due-to="chrisphe">New Handling of Timestamp in 2.4.8 has error with subseconds</action>
+ <action dev="jeffjensen" type="fix" issue="3132130" due-to="jeffjensen">AbstractDatabaseConnection createQueryTable throws UOEx.</action>
</release>
<release version="2.4.8" date="Sep 2, 2010" description="Bug fixes, timezone support, Oracle support improvements, new DataFileLoader, new PrepAndExpectedTestCase">
<action dev="gommma" type="add" issue="3027485" due-to="Yishai">MSSQL JDBC Driver 3.0 doesn't work well</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2011-02-22 03:19:44
|
Revision: 1215
http://dbunit.svn.sourceforge.net/dbunit/?rev=1215&view=rev
Author: jeffjensen
Date: 2011-02-22 03:19:38 +0000 (Tue, 22 Feb 2011)
Log Message:
-----------
[3132130] AbstractDatabaseConnection createQueryTable throws UOEx.
Modified Paths:
--------------
trunk/dbunit/src/main/java/org/dbunit/database/AbstractDatabaseConnection.java
Modified: trunk/dbunit/src/main/java/org/dbunit/database/AbstractDatabaseConnection.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/database/AbstractDatabaseConnection.java 2011-02-22 03:11:43 UTC (rev 1214)
+++ trunk/dbunit/src/main/java/org/dbunit/database/AbstractDatabaseConnection.java 2011-02-22 03:19:38 UTC (rev 1215)
@@ -88,8 +88,22 @@
IResultSetTableFactory tableFactory = getResultSetTableFactory();
IResultSetTable rsTable = tableFactory.createTable(resultName, sql, this);
- logger.debug("createQueryTable: rowCount={}", Integer.valueOf(rsTable
- .getRowCount()));
+ if (logger.isDebugEnabled())
+ {
+ String rowCount = null;
+ try
+ {
+ int rowCountInt = rsTable.getRowCount();
+ rowCount = String.valueOf(rowCountInt);
+ }
+ catch (Exception e)
+ {
+ rowCount =
+ "Unable to determine row count due to Exception: "
+ + e.getLocalizedMessage();
+ }
+ logger.debug("createQueryTable: rowCount={}", rowCount);
+ }
return rsTable;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2011-02-22 03:11:49
|
Revision: 1214
http://dbunit.svn.sourceforge.net/dbunit/?rev=1214&view=rev
Author: jeffjensen
Date: 2011-02-22 03:11:43 +0000 (Tue, 22 Feb 2011)
Log Message:
-----------
Fix indent on example.
Modified Paths:
--------------
trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java
Modified: trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java 2011-02-22 03:05:22 UTC (rev 1213)
+++ trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java 2011-02-22 03:11:43 UTC (rev 1214)
@@ -88,20 +88,20 @@
*
* @Test
* public void testExample() throws Exception {
- * try {
- * final String[] prepDataFiles = {}; // define prep files
- * final String[] expectedDataFiles = {}; // define expected files
- * final VerifyTableDefinition[] tables = {}; // define tables to verify
+ * try {
+ * final String[] prepDataFiles = {}; // define prep files
+ * final String[] expectedDataFiles = {}; // define expected files
+ * final VerifyTableDefinition[] tables = {}; // define tables to verify
*
- * tc.preTest(tables, prepDataFiles, expectedDataFiles);
+ * tc.preTest(tables, prepDataFiles, expectedDataFiles);
*
- * // execute test
- * } catch (Exception e) {
- * log.error("Test error", e);
- * throw e;
- * } finally {
- * tc.postTest();
- * }
+ * // execute test
+ * } catch (Exception e) {
+ * log.error("Test error", e);
+ * throw e;
+ * } finally {
+ * tc.postTest();
+ * }
* }
* </pre>
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
