Menu
▾
▴
[Maven-plugins-cvs] cvs commit: maven-plugins/dbunit/xdocs changes.xml
|
From: dion g. <dio...@us...> - 2005-06-22 11:43:47
|
diongillard 05/06/22 04:43:41
Modified: dbunit/src/main/net/sourceforge/mavenplugins/dbunit
DataSetTool.java
dbunit/xdocs changes.xml
Log:
Order dataset on export.
Thanks to Josh Holtzman
Revision Changes Path
1.6 +22 -2 maven-plugins/dbunit/src/main/net/sourceforge/mavenplugins/dbunit/DataSetTool.java
Index: DataSetTool.java
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/dbunit/src/main/net/sourceforge/mavenplugins/dbunit/DataSetTool.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DataSetTool.java 9 May 2005 12:26:44 -0000 1.5
+++ DataSetTool.java 22 Jun 2005 11:43:40 -0000 1.6
@@ -58,9 +58,12 @@
import org.apache.commons.lang.StringUtils;
import org.dbunit.DatabaseUnitException;
+import org.dbunit.database.DatabaseSequenceFilter;
import org.dbunit.database.IDatabaseConnection;
import org.dbunit.dataset.DataSetException;
+import org.dbunit.dataset.FilteredDataSet;
import org.dbunit.dataset.IDataSet;
+import org.dbunit.dataset.filter.ITableFilter;
import org.dbunit.ext.mssql.InsertIdentityOperation;
import org.dbunit.operation.DatabaseOperation;
@@ -146,8 +149,25 @@
*/
private IDataSet getDataSet(IDatabaseConnection connection) throws SQLException
{
- if (getExportTables() == null) return connection.createDataSet();
- return connection.createDataSet(StringUtils.split(getExportTables(), ","));
+ IDataSet dataSet = null;
+ if (getExportTables() == null)
+ {
+ dataSet = connection.createDataSet();
+ }
+ else
+ {
+ String[] tables = StringUtils.split(getExportTables(), ",");
+ dataSet = connection.createDataSet(tables);
+ }
+ try
+ {
+ ITableFilter filter = new DatabaseSequenceFilter(connection);
+ return new FilteredDataSet(filter, dataSet);
+ }
+ catch (DataSetException e)
+ {
+ throw new SQLException(e.getMessage());
+ }
}
/**
1.19 +1 -0 maven-plugins/dbunit/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/dbunit/xdocs/changes.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- changes.xml 9 May 2005 12:26:45 -0000 1.18
+++ changes.xml 22 Jun 2005 11:43:40 -0000 1.19
@@ -7,6 +7,7 @@
</properties>
<body>
<release version="1.6" data="in cvs">
+ <action dev="diongillard" type="add" due-to="Josh Holtzman">Order tables on export.</action>
<action dev="dep4b" type="fix" due-to="Fabrizio Giustina" issue="1159028">Support mssql operations and warning for invalid values</action>
</release>
<release version="1.5" date="2004-08-27">
|
