dbunit-commit

[dbunit-commit] dbunit/src/java/org/dbunit/dataset/filter IncludeTableFilter.java,1.7,1.8

[<de...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/filter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2876/src/java/org/dbunit/dataset/filter

Modified Files:
	IncludeTableFilter.java 
Log Message:
Import statement cleanup.  Thanks Eclipse!

Index: IncludeTableFilter.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/filter/IncludeTableFilter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** IncludeTableFilter.java	18 Apr 2004 02:48:19 -0000	1.7
--- IncludeTableFilter.java	30 Jul 2004 15:55:10 -0000	1.8
***************
*** 21,27 ****
  package org.dbunit.dataset.filter;
  
- import java.util.HashSet;
- import java.util.Iterator;
- import java.util.Set;
  
  /**
--- 21,24 ----

[dbunit-commit] dbunit/src/java/org/dbunit/operation DeleteOperation.java,1.18,1.19 UpdateOperation.java,1.14,1.15

[<de...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2876/src/java/org/dbunit/operation

Modified Files:
	DeleteOperation.java UpdateOperation.java 
Log Message:
Import statement cleanup.  Thanks Eclipse!

Index: DeleteOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/DeleteOperation.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** DeleteOperation.java	29 May 2004 00:02:25 -0000	1.18
--- DeleteOperation.java	30 Jul 2004 15:55:10 -0000	1.19
***************
*** 22,31 ****
  package org.dbunit.operation;
  
  import org.dbunit.DatabaseUnitException;
  import org.dbunit.database.IDatabaseConnection;
! import org.dbunit.dataset.*;
! 
! import java.math.BigInteger;
! import java.util.BitSet;
  
  /**
--- 22,35 ----
  package org.dbunit.operation;
  
+ import java.util.BitSet;
+ 
  import org.dbunit.DatabaseUnitException;
  import org.dbunit.database.IDatabaseConnection;
! import org.dbunit.dataset.Column;
! import org.dbunit.dataset.DataSetException;
! import org.dbunit.dataset.IDataSet;
! import org.dbunit.dataset.ITableIterator;
! import org.dbunit.dataset.ITableMetaData;
! import org.dbunit.dataset.NoPrimaryKeyException;
  
  /**

Index: UpdateOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/UpdateOperation.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** UpdateOperation.java	29 May 2004 00:02:25 -0000	1.14
--- UpdateOperation.java	30 Jul 2004 15:55:10 -0000	1.15
***************
*** 22,32 ****
  package org.dbunit.operation;
  
- import org.dbunit.database.IDatabaseConnection;
- import org.dbunit.dataset.*;
- 
- import java.math.BigInteger;
  import java.util.ArrayList;
- import java.util.List;
  import java.util.BitSet;
  
  /**
--- 22,35 ----
  package org.dbunit.operation;
  
  import java.util.ArrayList;
  import java.util.BitSet;
+ import java.util.List;
+ 
+ import org.dbunit.database.IDatabaseConnection;
+ import org.dbunit.dataset.Column;
+ import org.dbunit.dataset.DataSetException;
+ import org.dbunit.dataset.DataSetUtils;
+ import org.dbunit.dataset.ITableMetaData;
+ import org.dbunit.dataset.NoPrimaryKeyException;
  
  /**

[dbunit-commit] dbunit/src/test/org/dbunit/ext AllTests.java,1.4,1.5

[<de...@us...>]

Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/ext
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2470/src/test/org/dbunit/ext

Modified Files:
	AllTests.java 
Log Message:
Patch for working w/ booleans and HsqlDB.  Thanks to Klas Axell.

Index: AllTests.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/ext/AllTests.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AllTests.java	22 Jan 2004 02:54:23 -0000	1.4
--- AllTests.java	30 Jul 2004 15:52:51 -0000	1.5
***************
*** 38,41 ****
--- 38,42 ----
          suite.addTest(org.dbunit.ext.mysql.AllTests.suite());
          suite.addTest(org.dbunit.ext.oracle.AllTests.suite());
+         suite.addTest(org.dbunit.ext.hsqldb.AllTests.suite());
          return suite;
      }

[dbunit-commit] dbunit project.xml,1.19,1.20

[<de...@us...>]

Update of /cvsroot/dbunit/dbunit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2470

Modified Files:
	project.xml 
Log Message:
Patch for working w/ booleans and HsqlDB.  Thanks to Klas Axell.

Index: project.xml
===================================================================
RCS file: /cvsroot/dbunit/dbunit/project.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** project.xml	30 May 2004 23:45:34 -0000	1.19
--- project.xml	30 Jul 2004 15:52:51 -0000	1.20
***************
*** 13,17 ****
    <!-- The version of the project under development, e.g.
         1.1, 1.2, 2.0-dev -->
!   <currentVersion>2.1</currentVersion>
    
    <!-- details about the organization that 'owns' the project -->
--- 13,17 ----
    <!-- The version of the project under development, e.g.
         1.1, 1.2, 2.0-dev -->
!   <currentVersion>2.2-dev</currentVersion>
    
    <!-- details about the organization that 'owns' the project -->
***************
*** 126,129 ****
--- 126,137 ----
    <contributors>
      <contributor>
+       <name>Klas Axel</name>
+        <!--  
+       <roles>
+         <role>HsqldbDataTypeFactory</role>
+       </roles>
+       -->
+     </contributor>  
+     <contributor>
        <name>Erik Price</name>
         <!--  

[dbunit-commit] dbunit/src/test/org/dbunit/ext/hsqldb HsqldbDataTypeFactoryTest.java,NONE,1.1 AllTests.java,NONE,1.1

[<de...@us...>]

Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/ext/hsqldb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2470/src/test/org/dbunit/ext/hsqldb

Added Files:
	HsqldbDataTypeFactoryTest.java AllTests.java 
Log Message:
Patch for working w/ booleans and HsqlDB.  Thanks to Klas Axell.

--- NEW FILE: HsqldbDataTypeFactoryTest.java ---
/*
 *
 * The DbUnit Database Testing Framework
 * Copyright (C)2002-2004, DbUnit.org
 *
 * 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.hsqldb;

import org.dbunit.dataset.datatype.AbstractDataTypeFactoryTest;
import org.dbunit.dataset.datatype.DataType;
import org.dbunit.dataset.datatype.IDataTypeFactory;

import java.sql.Types;

/**
 * @author Klas Axell
 */
public class HsqldbDataTypeFactoryTest extends AbstractDataTypeFactoryTest
{
    public HsqldbDataTypeFactoryTest(String s)
    {
        super(s);
    }

    public IDataTypeFactory createFactory() throws Exception
    {
        return new HsqldbDataTypeFactory();
    }

    public void testCreateBooleanDataType() throws Exception
    {
        int sqlType = Types.BOOLEAN;
        String sqlTypeName = "BOOLEAN";

        DataType expected = DataType.BOOLEAN;
        DataType actual = createFactory().createDataType(sqlType, sqlTypeName);
        assertSame("type", expected, actual);
    }

}


--- NEW FILE: AllTests.java ---
/*
 *
 * The DbUnit Database Testing Framework
 * Copyright (C)2002-2004, DbUnit.org
 *
 * 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.hsqldb;

import junit.framework.Test;
import junit.framework.TestSuite;

/**
 * @author Klas Axell
 */
public class AllTests
{
    public static Test suite()
    {
        TestSuite suite = new TestSuite();
        suite.addTest(new TestSuite(HsqldbDataTypeFactoryTest.class));
        return suite;
    }
}

[dbunit-commit] dbunit/src/java/org/dbunit/ext/hsqldb HsqldbDataTypeFactory.java,NONE,1.1 HsqldbConnection.java,NONE,1.1

[<de...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/ext/hsqldb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2470/src/java/org/dbunit/ext/hsqldb

Added Files:
	HsqldbDataTypeFactory.java HsqldbConnection.java 
Log Message:
Patch for working w/ booleans and HsqlDB.  Thanks to Klas Axell.

--- NEW FILE: HsqldbDataTypeFactory.java ---
/*
 *
 * The DbUnit Database Testing Framework
 * Copyright (C)2002-2004, DbUnit.org
 *
 * 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.hsqldb;

import org.dbunit.dataset.datatype.DataType;
import org.dbunit.dataset.datatype.DataTypeException;
import org.dbunit.dataset.datatype.DefaultDataTypeFactory;

import java.sql.Types;

/**
 * Specialized factory that recognizes Hsqldb data types.
 *
 * @author Klas Axell
 */
public class HsqldbDataTypeFactory extends DefaultDataTypeFactory
{
    public DataType createDataType(int sqlType, String sqlTypeName) throws DataTypeException
    {
        if (sqlType == Types.BOOLEAN)
        {
            return DataType.BOOLEAN;
        }

        return super.createDataType(sqlType, sqlTypeName);
    }
}
--- NEW FILE: HsqldbConnection.java ---
/*
 *
 * The DbUnit Database Testing Framework
 * Copyright (C)2002-2004, DbUnit.org
 *
 * 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.hsqldb;

import org.dbunit.database.DatabaseConfig;
import org.dbunit.database.DatabaseConnection;

import java.sql.Connection;

/**
 *
 * @author Klas Axell
 */
public class HsqldbConnection extends DatabaseConnection
{
    public HsqldbConnection(Connection connection, String schema)
    {
        super(connection, schema);
        getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY,
                new HsqldbDataTypeFactory());
    }
}

[dbunit-commit] dbunit/xdocs changes.xml,1.12,1.13

[<de...@us...>]

Update of /cvsroot/dbunit/dbunit/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2470/xdocs

Modified Files:
	changes.xml 
Log Message:
Patch for working w/ booleans and HsqlDB.  Thanks to Klas Axell.

Index: changes.xml
===================================================================
RCS file: /cvsroot/dbunit/dbunit/xdocs/changes.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** changes.xml	31 May 2004 02:51:40 -0000	1.12
--- changes.xml	30 Jul 2004 15:52:50 -0000	1.13
***************
*** 8,11 ****
--- 8,14 ----
  
    <body>
+     <release version="2.2-dev" date="IN CVS" description="">    
+      <action dev="dep4b" type="add" due-to="Klas Axell">new HsqldbDataTypeFactory for working with booleans in HsqlDB.</action>
+     </release>
      <release version="2.1" date="May 31, 2004" description="Multiple bugfixes and enhancements.">
       <action dev="" type="add">

[dbunit-commit] dbunit/src/test/org/dbunit/ext/hsqldb - New directory

[<de...@us...>]

Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/ext/hsqldb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2440/src/test/org/dbunit/ext/hsqldb

Log Message:
Directory /cvsroot/dbunit/dbunit/src/test/org/dbunit/ext/hsqldb added to the repository

[dbunit-commit] dbunit/src/java/org/dbunit/ext/hsqldb - New directory

[<de...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/ext/hsqldb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2440/src/java/org/dbunit/ext/hsqldb

Log Message:
Directory /cvsroot/dbunit/dbunit/src/java/org/dbunit/ext/hsqldb added to the repository

[dbunit-commit] dbunit/xdocs faq.fml,1.19,1.20

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25280/xdocs

Modified Files:
	faq.fml 
Log Message:
FAQ errata (BUG #979697)

Index: faq.fml
===================================================================
RCS file: /cvsroot/dbunit/dbunit/xdocs/faq.fml,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** faq.fml	30 May 2004 23:44:15 -0000	1.19
--- faq.fml	28 Jun 2004 12:07:00 -0000	1.20
***************
*** 359,366 ****
  IDatabaseConnection conn = new DatabaseConnection(jdbcConn);
  
! ITableFilter filter = new DatabaseTableFilter(conn);
  IDataSet dataset = new FilteredDataSet(filter, 
         conn.createDataSet());
! 
  FlatXmlDataSet.write(dataset, new File(fileName));
  </source>
--- 359,366 ----
  IDatabaseConnection conn = new DatabaseConnection(jdbcConn);
  
! ITableFilter filter = new DatabaseSequenceFilter(conn);
  IDataSet dataset = new FilteredDataSet(filter, 
         conn.createDataSet());
!        
  FlatXmlDataSet.write(dataset, new File(fileName));
  </source>

[dbunit-commit] dbunit/xdocs navigation.xml,1.9,1.10

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2841/xdocs

Modified Files:
	navigation.xml 
Log Message:
Updated DbUnit 2.1 download link.

Index: navigation.xml
===================================================================
RCS file: /cvsroot/dbunit/dbunit/xdocs/navigation.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** navigation.xml	31 Mar 2004 02:42:56 -0000	1.9
--- navigation.xml	1 Jun 2004 02:45:20 -0000	1.10
***************
*** 12,19 ****
      </links>    
      <menu name="Quick Links">
!       <item name="Download"        href="http://sourceforge.net/project/showfiles.php?group_id=47439&amp;release_id=211888"/>
        <item name="Changes"         href="/changes-report.html"/>
        <item name="FAQ"             href="/faq.html"/> 
!       <item name="Get Support"     href="https://sourceforge.net/support/getsupport.php?group_id=47439"/>          
        <item name="Wiki"       href="http://www.dbunit.org/wiki/"/>      
        <item name="Source"          href="/cvs-usage.html"/>          
--- 12,19 ----
      </links>    
      <menu name="Quick Links">
!       <item name="Download"        href="http://sourceforge.net/project/showfiles.php?group_id=47439&amp;release_id=242511"/>
        <item name="Changes"         href="/changes-report.html"/>
        <item name="FAQ"             href="/faq.html"/> 
!       <item name="Get Support"     href="http://sourceforge.net/support/getsupport.php?group_id=47439"/>          
        <item name="Wiki"       href="http://www.dbunit.org/wiki/"/>      
        <item name="Source"          href="/cvs-usage.html"/>          

[dbunit-commit] dbunit/xdocs changes.xml,1.11,1.12

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30753/xdocs

Modified Files:
	changes.xml 
Log Message:
Fixed XML tag escaping

Index: changes.xml
===================================================================
RCS file: /cvsroot/dbunit/dbunit/xdocs/changes.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** changes.xml	30 May 2004 23:44:03 -0000	1.11
--- changes.xml	31 May 2004 02:51:40 -0000	1.12
***************
*** 25,29 ****
       </action>         
       <action dev="" type="update">
!      	Do not omit NULL values anymore in INSERT statements. Now only XmlDataSet's <none/> tag are omitted. With FlatXmlDataSet you must use the ReplacementDataSet to achieve the same behavior.
       </action>         
       <action dev="" type="fix">
--- 25,29 ----
       </action>         
       <action dev="" type="update">
!      	Do not omit NULL values anymore in INSERT statements. Now only XmlDataSet's &lt;none/&gt; tag are omitted. With FlatXmlDataSet you must use the ReplacementDataSet to achieve the same behavior.
       </action>         
       <action dev="" type="fix">

[dbunit-commit] dbunit project.xml,1.18,1.19

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1948

Modified Files:
	project.xml 
Log Message:
Documentations update for release of DbUnit 2.1

Index: project.xml
===================================================================
RCS file: /cvsroot/dbunit/dbunit/project.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** project.xml	21 Apr 2004 23:37:40 -0000	1.18
--- project.xml	30 May 2004 23:45:34 -0000	1.19
***************
*** 13,17 ****
    <!-- The version of the project under development, e.g.
         1.1, 1.2, 2.0-dev -->
!   <currentVersion>2.0</currentVersion>
    
    <!-- details about the organization that 'owns' the project -->
--- 13,17 ----
    <!-- The version of the project under development, e.g.
         1.1, 1.2, 2.0-dev -->
!   <currentVersion>2.1</currentVersion>
    
    <!-- details about the organization that 'owns' the project -->

[dbunit-commit] dbunit/xdocs changes.xml,1.10,1.11 faq.fml,1.18,1.19 howto.xml,1.2,1.3 index.xml,1.9,1.10 properties.xml,1.6,1.7 resources.xml,1.5,1.6

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1583/xdocs

Modified Files:
	changes.xml faq.fml howto.xml index.xml properties.xml 
	resources.xml 
Log Message:
Documentations update for release of DbUnit 2.1

Index: changes.xml
===================================================================
RCS file: /cvsroot/dbunit/dbunit/xdocs/changes.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** changes.xml	23 Jan 2004 07:14:09 -0000	1.10
--- changes.xml	30 May 2004 23:44:03 -0000	1.11
***************
*** 8,11 ****
--- 8,88 ----
  
    <body>
+     <release version="2.1" date="May 31, 2004" description="Multiple bugfixes and enhancements.">
+      <action dev="" type="add">
+      	741394 - New database compare Ant tag. See Ant task documentation.
+      </action>         
+      <action dev="fspinazzi" type="add">
+      	New Comma Separated Values (CSV) dataset implementation.
+      </action>      	            
+      <action dev="" type="add">
+      	824328 &amp; 948479 - Ability to add DOCTYPE declaration when writing a flat Xml dataset. See FAQ.
+      </action>         
+      <action dev="" type="add">
+      	884422 - FlatDtdWriter has now the ability to generate DTDs with choice model instead of sequence model. 
+      </action>         
+      <action dev="" type="add">
+      	Ability to import external file for binary data types like BLOB; the value can be either a qualified URL or a file path name.
+      </action>         
+      <action dev="" type="update">
+      	Do not omit NULL values anymore in INSERT statements. Now only XmlDataSet's <none/> tag are omitted. With FlatXmlDataSet you must use the ReplacementDataSet to achieve the same behavior.
+      </action>         
+      <action dev="" type="fix">
+      	937732 - XlsDataSet now use UTF-16 encoding to support Asian characters. Patch submitted by Shuhei Kondo.
+      </action>         
+      <action dev="" type="fix">
+      	Applied XlsTable empty table detection patch submitted by Deepak Kaimal.
+      </action>         
+      <action dev="" type="fix">
+      	Added back FlatXmlDataSet constructors taking URL as argument missing in version 2.0.
+      </action>         
+      <action dev="" type="fix">
+      	918631 &amp; 925585 - Fixed FlatXmlDataSet constructors taking InputStream/Reader for loading DTD.
+      </action>         
+      <action dev="" type="fix">
+      	DELETE_ALL operation now deletes tables only *once* in reverse order they are encountered. Before, duplicate tables were resulting in multiple deletes. Patch submitted by John Hurst.
+      </action>         
+      <action dev="" type="update">
+      	DELETE_ALL operation now compatible with StreamingDataSet.
+      </action>         
+      <action dev="" type="fix">
+      	947330 - Now closing ResultSet before Statement to fix exceptions thrown by the Firebird JDBC driver and the OpenBase 8.0 JDBC driver.
+      </action>         
+      <action dev="" type="fix">
+      	921869 - Fixed ParameterIndexOutOfBoundsException with InterBase.
+      </action>         
+      <action dev="" type="update">
+      	947809 - Moved createMetaData() static method from AbstractResultSet to DatabaseTableMetaData and made it public. Can now be used to create ITable from a ResultSet.
+      </action>         
+      <action dev="" type="fix">
+      	Support for large Oracle BLOB. Must use OracleDataTypeFactory.
+      </action>         
+      <action dev="" type="add">
+      	Oracle LONG RAW data type support via OracleDataTypeFactory. Original patch submitted by Markus Muller.
+      </action>         
+      <action dev="" type="fix">
+      	Added back support for Oracle FLOAT missing in DbUnit 2.0. Must use OracleDataTypeFactory.
+      </action>         
+      <action dev="" type="add">
+      	Support for Oracle NCHAR2 as proposed by Deepak Kaimal. Must use OracleDataTypeFactory.
+      </action>         
+      <action dev="" type="update">
+      	Added DataType.isDateTime() method proposed by Ayman Mahfouz.
+      </action>         
+      <action dev="" type="add">
+      	726366 &amp; 884422 - Added IColumnFilter interface. Can be used to filter out some table columns. See FAQ.
+      </action>         
+      <action dev="" type="update">
+      	Renamed ITableFilter.isValidName() method to accept() to be consistent with the new IColumnFilter interface. 
+      </action>         
+      <action dev="" type="add">
+      	955354 - Ability to determine the primary keys with IColumnFilter interface instead of DatabaseMetaData.getPrimaryKeys(). Primary keys sequence is not predictable when using filter. See FAQ.
+      </action>         
+      <action dev="" type="add">
+      	Ability to plug custom IDENTITY column detection strategy for InsertIdentityOperation when using user defined types. See FAQ.
+      </action>         
+      <action dev="" type="add">
+      	Added DefaultTableFilter class, which combines capability of the Include/ExcludeTableFilter classes.
+      </action>         
+     </release>
      <release version="2.0" date="January 22, 2004" description="Major release.">
       <action dev="" type="update">

Index: faq.fml
===================================================================
RCS file: /cvsroot/dbunit/dbunit/xdocs/faq.fml,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** faq.fml	28 May 2004 22:14:03 -0000	1.18
--- faq.fml	30 May 2004 23:44:15 -0000	1.19
***************
*** 168,172 ****
        <p>
        Be aware that REFRESH, DELETE and UPDATE operations are not compatible with tables without 
!       primary keys, thus are not usable with views. CLEAN_INSERT, INSERT and DELETE_ALL 
        operations are compatible with views.
        </p>
--- 168,172 ----
        <p>
        Be aware that REFRESH, DELETE and UPDATE operations are not compatible with tables without 
!       primary keys. They are not usable with views without <a href="#customprimarykeys">overriding primary keys detection</a>. CLEAN_INSERT, INSERT and DELETE_ALL 
        operations are compatible with views.
        </p>
***************
*** 174,178 ****
      </faq>  
      
!     <faq id="views">
        <question>
        How to enable batched statement?
--- 174,178 ----
      </faq>  
      
!     <faq id="batchstatement">
        <question>
        How to enable batched statement?
***************
*** 367,372 ****
        </answer>
      </faq>    
!   </part>  
  
    <part id="use">
      <title>Errors</title>
--- 367,462 ----
        </answer>
      </faq>    
!     <faq id="doctypeexport">
!       <question>
! 	How to add the DOCTYPE declaration when writing a flat XML dataset?
!       </question>
!       <answer>
!       <p>
! 	Use the setDocType() method of the FlatXmlWriter class like this:
! <source>
!     FlatXmlWriter datasetWriter = new FlatXmlWriter( 
!             new FileOutputStream("dataset.xml")); 
!     datasetWriter.setDocType("dataset.dtd"); 
!     datasetWriter.write(connection.createDataSet());
! </source>
!     This can also be done with the <a href="anttask.html">DbUnit Ant task</a>.
! </p>    
!       </answer>
!     </faq> 
! 
!     <faq id="columnfilter">
!       <question>
!       How to exclude some table columns at runtime?
!       </question>
!       <answer>
! <p>
!       The FilteredTableMetaData class, introduced in DbUnit 2.1, can be used in combination with the IColumnFilter interface to decide the inclusion or exclusion of table columns at runtime.
! <source>
!     FilteredTableMetaData metaData = new FilteredTableMetaData(
!         originalTable.getTableMetaData(), new MyColumnFilter());
!     ITable filteredTable = new CompositeTable(metaData, originalTable);
! </source>
! </p>
! <p>
! You can use your own IColumnFilter implementation or use the DefaultColumnFilter class provided by DbUnit. DefaultColumnFilter supports wildcards. This class also offers some convenience methods, includedColumnsTable() and excludedColumnsTable(), to ease creation of column filtered table.
! <br/>
! The following sample demonstrates the usage of DefaultColumnFilter to exclude all columns prefixed with "PK" or suffixed by "TIME". 
! </p>
! <source>
!     DefaultColumnFilter columnFilter = new DefaultColumnFilter();
!     columnFilter.excludeColumn("PK*");
!     columnFilter.excludeColumn("*TIME");
! 
!     FilteredTableMetaData metaData = new FilteredTableMetaData(
!             originalTable.getTableMetaData(), columnFilter);
! </source>
! <p>
! Same than above but using the excludedColumnsTable() convenience method.
! <source>
!     ITable filteredTable = DefaultColumnFilter.excludedColumnsTable(
!             originalTable, new String[]{"PK*", "*TIME"});
! </source>
! </p>
! <p>
! See also <a href="howto.html#compareignorecolumns">Ignoring some columns in comparison</a>.
! </p>
!       </answer>
!     </faq> 
!         
!     <faq id="usertypeidentity">
!       <question>
!       How to use InsertIdentityOperation with user defined types?
!       </question>
!       <answer>
!       <p>
!       The IColumnFilter interface is now used by InsertIdentityOperation to detect identity columns. The default implementation assumes that type name of identity columns end with "identity". If you are using user defined types that does not follow this assumption you can now provide your own implementation via the <a href="properties.html#identitycolumnfilter">MS SQL identity column filter property</a>.
! <source>
!     IDatabaseConnection connection = new DatabaseConnection(jdbcConnection);
!     connection.getConfig().setProperty(
!         "http://www.dbunit.org/properties/mssql/identityColumnFilter",
!         new MyIndentityFilter());
! </source>
! </p>    
!       </answer>
!     </faq>  
!     
!     <faq id="customprimarykeys">
!       <question>
!       How to customize primary keys detection?
!       </question>
!       <answer>
!       <p>
!       The IColumnFilter interface can also be used to determine which columns are primary keys instead of using DatabaseMetaData.getPrimaryKeys().  This can be useful if your primary keys are not explicitly defined in your database model.
! <source>
!     IDatabaseConnection connection = new DatabaseConnection(jdbcConnection);
!     connection.getConfig().setProperty(
!         "http://www.dbunit.org/properties/primaryKeyFilter",
!         new MyPrimaryKeyFilter());
! </source>
! </p>    
!       </answer>
!     </faq>       
  
+   </part>  
    <part id="use">
      <title>Errors</title>

Index: howto.xml
===================================================================
RCS file: /cvsroot/dbunit/dbunit/xdocs/howto.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** howto.xml	15 Jan 2004 03:11:27 -0000	1.2
--- howto.xml	30 May 2004 23:44:15 -0000	1.3
***************
*** 162,170 ****
  
          // Load expected data from an XML dataset
!         IDataSet expectedDataSet = new FlatXmlDataSet("expectedDataSet.xml");
          ITable expectedTable = expectedDataSet.getTable("TABLE_NAME");
  
          // Assert actual database table match expected table
!         Assertion.assertEquals(expectedTable, databaseTable);
      }
  }</source>      </p>
--- 162,170 ----
  
          // Load expected data from an XML dataset
!         IDataSet expectedDataSet = new FlatXmlDataSet(new File("expectedDataSet.xml"));
          ITable expectedTable = expectedDataSet.getTable("TABLE_NAME");
  
          // Assert actual database table match expected table
!         Assertion.assertEquals(expectedTable, expectedTable);
      }
  }</source>      </p>
***************
*** 185,196 ****
                  "SELECT * FROM TABLE1, TABLE2 WHERE ..."); </source>
        </p>
!       <h4>Ignoring some columns </h4>
!       <p>The following code snippet shows you how to ignore some columns in the
!         comparison. To works, the actual table MUST contain at least ALL the columns
!         from the expected table. Extra columns can exist in the actual table but
!         not in the expected one.
!       <source>        Assertion.assertEquals(expected,
!                 new CompositeTable(expected.getTableMetaData(), actual)); </source>
!       </p>
        <a name="roworder"><h4>Row ordering</h4></a>
        <p>By default, database table snapshot taken by DbUnit are sorted by primary
--- 185,205 ----
                  "SELECT * FROM TABLE1, TABLE2 WHERE ..."); </source>
        </p>
!       <a name="compareignorecolumns"><h4>Ignoring some columns in comparison</h4></a>
!       <p>
! Sometimes this is desirable to ignore some columns to perform the comparison; particularly for primary keys, date or time columns having values generated by the code under test.
! One way to do this is to omit to declare unwanted columns in your expected table. You can then filter the actual database table to only expose the expected table columns. 
! <br/>
! The following code snippet shows you how to filter the actual table. To works, the actual table MUST contain at least ALL the columns from the expected table. Extra columns can exist in the actual table but not in the expected one.
! <source>        
!     ITable filteredTable = DefaultColumnFilter.includedColumnsTable(actual, 
!             expected.getTableMetaData().getColumns());
!     Assertion.assertEquals(expected, filteredTable); 
! </source>
! </p>
! <p>
! A major limitation of this technique is that you cannot use a DTD with your expected flat XML dataset. With a DTD you need to filter columns from both the expected and the actual table. See the FAQ about 
! <a href="faq.html#columnfilter">excluding some table columns at runtime</a>.
! </p>
!       
        <a name="roworder"><h4>Row ordering</h4></a>
        <p>By default, database table snapshot taken by DbUnit are sorted by primary

Index: index.xml
===================================================================
RCS file: /cvsroot/dbunit/dbunit/xdocs/index.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** index.xml	28 Apr 2004 19:02:35 -0000	1.9
--- index.xml	30 May 2004 23:44:15 -0000	1.10
***************
*** 26,29 ****
--- 26,33 ----
        <table border="1">
          <tr> 
+           <td>2004-05-31</td>
+           <td><b>Version 2.1 released.</b> Multiple bugfixes and enhancements. See <a href="changes-report.html#2.1">changes</a>.</td>
+         </tr>
+         <tr> 
            <td>2004-04-28</td>
            <td>DeveloperWorks article: <a href="http://www-106.ibm.com/developerworks/library/j-dbunit.html?ca=drs-j1604">Control your test-environement with DbUnit and Anthill</a>.</td>

Index: properties.xml
===================================================================
RCS file: /cvsroot/dbunit/dbunit/xdocs/properties.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** properties.xml	9 Feb 2004 18:13:22 -0000	1.6
--- properties.xml	30 May 2004 23:44:15 -0000	1.7
***************
*** 179,181 ****
--- 179,216 ----
        </table>
  
+       <a name="primarykeysfilter"></a>
+       <h4>Primary keys filter</h4>
+       <table border="1">
+         <tr> 
+           <td>Property ID</td>
+           <td>http://www.dbunit.org/properties/primaryKeyFilter</td>
+         </tr>
+         <tr> 
+           <td>Default</td>
+           <td><i>none</i></td>
+         </tr>
+         <tr> 
+           <td>Description</td>
+           <td>Use to override primary keys detection. The Object must implement 
+             org.dbunit.dataset.filter.IColumnFilter.</td>
+         </tr>
+       </table>
+ 
+       <a name="identitycolumnfilter"></a>
+       <h4>MS SQL Server IDENTITY column filter</h4>
+       <table border="1">
+         <tr> 
+           <td>Property ID</td>
+           <td>http://www.dbunit.org/properties/mssql/identityColumnFilter</td>
+         </tr>
+         <tr> 
+           <td>Default</td>
+           <td><i>none</i></td>
+         </tr>
+         <tr> 
+           <td>Description</td>
+           <td>Use to override IDENTITY column detection. The Object must implement 
+             org.dbunit.dataset.filter.IColumnFilter.</td>
+         </tr>
+       </table>
  </section></body></document>
\ No newline at end of file

Index: resources.xml
===================================================================
RCS file: /cvsroot/dbunit/dbunit/xdocs/resources.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** resources.xml	26 Jan 2004 16:48:03 -0000	1.5
--- resources.xml	30 May 2004 23:44:15 -0000	1.6
***************
*** 12,15 ****
--- 12,19 ----
          </tr>
          <tr> 
+           <td><a name="controltestenv" href="http://www-106.ibm.com/developerworks/java/library/j-dbunit.html">Control your test-environment with DbUnit and Anthill</a></td>
+           <td>Learn how DbUnit can ease your testing and build process.</td>
+         </tr>
+         <tr> 
            <td><a href="http://groups.yahoo.com/group/agileDatabases/">The Agile Database 
          Mailing List</a></td>

[dbunit-commit] dbunit/src/java/org/dbunit/dataset/filter DefaultColumnFilter.java,1.3,1.4

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/filter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1233/src/java/org/dbunit/dataset/filter

Modified Files:
	DefaultColumnFilter.java 
Log Message:
Use DefaultColumnsFilter in compare Ant task.

Index: DefaultColumnFilter.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/filter/DefaultColumnFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DefaultColumnFilter.java	18 May 2004 03:25:41 -0000	1.3
--- DefaultColumnFilter.java	30 May 2004 23:42:01 -0000	1.4
***************
*** 28,31 ****
--- 28,34 ----
  
  /**
+  * Implementation of the IColumnFilter interface that exposes columns matching
+  * include patterns and not matching exclude patterns.
+  *
   * @author Manuel Laflamme
   * @since Apr 17, 2004
***************
*** 82,89 ****
  
      /**
!      * Returns a table backed by the specified table that only includes specified
       * columns.
       */
!     public static ITable includeTableColumns(ITable table, String[] columnNames)
              throws DataSetException
      {
--- 85,92 ----
  
      /**
!      * Returns a table backed by the specified table that only exposes specified
       * columns.
       */
!     public static ITable includedColumnsTable(ITable table, String[] columnNames)
              throws DataSetException
      {
***************
*** 101,108 ****
  
      /**
!      * Returns a table backed by the specified table that excludes specified
       * columns.
       */
!     public static ITable excludeTableColumns(ITable table, String[] columnNames)
              throws DataSetException
      {
--- 104,126 ----
  
      /**
!      * Returns a table backed by the specified table that only exposes specified
       * columns.
       */
!     public static ITable includedColumnsTable(ITable table, Column[] columns)
!             throws DataSetException
!     {
!         DefaultColumnFilter columnFilter = new DefaultColumnFilter();
!         columnFilter.includeColumns(columns);
! 
!         FilteredTableMetaData metaData = new FilteredTableMetaData(
!                 table.getTableMetaData(), columnFilter);
!         return new CompositeTable(metaData, table);
!     }
! 
!     /**
!      * Returns a table backed by the specified table but with specified
!      * columns excluded.
!      */
!     public static ITable excludedColumnsTable(ITable table, String[] columnNames)
              throws DataSetException
      {
***************
*** 119,122 ****
--- 137,155 ----
      }
  
+     /**
+      * Returns a table backed by the specified table but with specified
+      * columns excluded.
+      */
+     public static ITable excludedColumnsTable(ITable table, Column[] columns)
+             throws DataSetException
+     {
+         DefaultColumnFilter columnFilter = new DefaultColumnFilter();
+         columnFilter.excludeColumns(columns);
+ 
+         FilteredTableMetaData metaData = new FilteredTableMetaData(
+                 table.getTableMetaData(), columnFilter);
+         return new CompositeTable(metaData, table);
+     }
+ 
      ////////////////////////////////////////////////////////////////////////////
      // IColumnFilter interface

[dbunit-commit] dbunit/src/java/org/dbunit/ant Compare.java,1.1,1.2

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1233/src/java/org/dbunit/ant

Modified Files:
	Compare.java 
Log Message:
Use DefaultColumnsFilter in compare Ant task.

Index: Compare.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ant/Compare.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Compare.java	4 Apr 2004 04:57:19 -0000	1.1
--- Compare.java	30 May 2004 23:42:00 -0000	1.2
***************
*** 29,32 ****
--- 29,35 ----
  import org.dbunit.dataset.ITable;
  import org.dbunit.dataset.SortedTable;
+ import org.dbunit.dataset.ITableMetaData;
+ import org.dbunit.dataset.FilteredTableMetaData;
+ import org.dbunit.dataset.filter.DefaultColumnFilter;
  
  import java.io.File;
***************
*** 108,118 ****
  
          String[] tableNames = null;
!         if (_tables.size() > 0)
          {
!             tableNames = actualDataset.getTableNames();
          }
          else
          {
!             tableNames = expectedDataset.getTableNames();
          }
  
--- 111,123 ----
  
          String[] tableNames = null;
!         if (_tables.size() == 0)
          {
!             // No tables specified, assume must compare all tables from
!             // expected dataset
!             tableNames = expectedDataset.getTableNames();
          }
          else
          {
!             tableNames = actualDataset.getTableNames();
          }
  
***************
*** 121,127 ****
              String tableName = tableNames[i];
              ITable expectedTable = expectedDataset.getTable(tableName);
              ITable actualTable = actualDataset.getTable(tableName);
!             actualTable = new CompositeTable(
!                     expectedTable.getTableMetaData(), actualTable);
  
              if (_sort)
--- 126,136 ----
              String tableName = tableNames[i];
              ITable expectedTable = expectedDataset.getTable(tableName);
+             ITableMetaData expectedMetaData = expectedTable.getTableMetaData();
+ 
+             // Only compare columns present in expected table. Extra columns
+             // are filtered out from actual database table.
              ITable actualTable = actualDataset.getTable(tableName);
!             actualTable = DefaultColumnFilter.includedColumnsTable(
!                     actualTable, expectedMetaData.getColumns());
  
              if (_sort)

[dbunit-commit] dbunit/src/java/org/dbunit/ext/oracle OracleConnection.java,1.4,1.5

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/ext/oracle
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19227/src/java/org/dbunit/ext/oracle

Modified Files:
	OracleConnection.java 
Log Message:
Make sure Oracle schema is always in uppercase

Index: OracleConnection.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ext/oracle/OracleConnection.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** OracleConnection.java	22 Jan 2004 02:54:19 -0000	1.4
--- OracleConnection.java	29 May 2004 00:13:42 -0000	1.5
***************
*** 36,40 ****
      public OracleConnection(Connection connection, String schema)
      {
!         super(connection, schema);
          getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY,
                  new OracleDataTypeFactory());
--- 36,40 ----
      public OracleConnection(Connection connection, String schema)
      {
!         super(connection, schema != null ? schema.toUpperCase() : null);
          getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY,
                  new OracleDataTypeFactory());

[dbunit-commit] dbunit/src/java/org/dbunit/operation AbstractBatchOperation.java,1.27,1.28 DeleteOperation.java,1.17,1.18 InsertOperation.java,1.16,1.17 RefreshOperation.java,1.34,1.35 UpdateOperation.java,1.13,1.14

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17517/src/java/org/dbunit/operation

Modified Files:
	AbstractBatchOperation.java DeleteOperation.java 
	InsertOperation.java RefreshOperation.java 
	UpdateOperation.java 
Log Message:
Use BitSet to store mapping of omited columns.

Index: AbstractBatchOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/AbstractBatchOperation.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** AbstractBatchOperation.java	29 Mar 2004 00:59:54 -0000	1.27
--- AbstractBatchOperation.java	29 May 2004 00:02:24 -0000	1.28
***************
*** 27,34 ****
  import org.dbunit.database.statement.IPreparedBatchStatement;
  import org.dbunit.database.statement.IStatementFactory;
! import org.dbunit.dataset.*;
  
- import java.math.BigInteger;
  import java.sql.SQLException;
  
  /**
--- 27,40 ----
  import org.dbunit.database.statement.IPreparedBatchStatement;
  import org.dbunit.database.statement.IStatementFactory;
! import org.dbunit.dataset.Column;
! import org.dbunit.dataset.DataSetException;
! import org.dbunit.dataset.IDataSet;
! import org.dbunit.dataset.ITable;
! import org.dbunit.dataset.ITableIterator;
! import org.dbunit.dataset.ITableMetaData;
! import org.dbunit.dataset.RowOutOfBoundsException;
  
  import java.sql.SQLException;
+ import java.util.BitSet;
  
  /**
***************
*** 41,45 ****
  public abstract class AbstractBatchOperation extends AbstractOperation
  {
!     private static final BigInteger EMPTY_IGNORE_MAPPING = new BigInteger("0");
      protected boolean _reverseRowOrder = false;
  
--- 47,51 ----
  public abstract class AbstractBatchOperation extends AbstractOperation
  {
!     private static final BitSet EMPTY_BITSET = new BitSet();
      protected boolean _reverseRowOrder = false;
  
***************
*** 80,87 ****
       * a column to ignore.
       */
!     BigInteger getIgnoreMapping(ITable table, int row)
              throws DataSetException
      {
!         return EMPTY_IGNORE_MAPPING;
      }
  
--- 86,93 ----
       * a column to ignore.
       */
!     BitSet getIgnoreMapping(ITable table, int row)
              throws DataSetException
      {
!         return EMPTY_BITSET;
      }
  
***************
*** 90,94 ****
       * than the specified mapping.
       */
!     boolean equalsIgnoreMapping(BigInteger ignoreMapping, ITable table,
              int row) throws DataSetException
      {
--- 96,100 ----
       * than the specified mapping.
       */
!     boolean equalsIgnoreMapping(BitSet ignoreMapping, ITable table,
              int row) throws DataSetException
      {
***************
*** 97,101 ****
  
      abstract OperationData getOperationData(ITableMetaData metaData,
!             BigInteger ignoreMapping, IDatabaseConnection connection) throws DataSetException;
  
      ////////////////////////////////////////////////////////////////////////////
--- 103,107 ----
  
      abstract OperationData getOperationData(ITableMetaData metaData,
!             BitSet ignoreMapping, IDatabaseConnection connection) throws DataSetException;
  
      ////////////////////////////////////////////////////////////////////////////
***************
*** 123,127 ****
              ITableMetaData metaData = getOperationMetaData(connection,
                      table.getTableMetaData());
!             BigInteger ignoreMapping = null;
              OperationData operationData = null;
              IPreparedBatchStatement statement = null;
--- 129,133 ----
              ITableMetaData metaData = getOperationMetaData(connection,
                      table.getTableMetaData());
!             BitSet ignoreMapping = null;
              OperationData operationData = null;
              IPreparedBatchStatement statement = null;
***************
*** 163,167 ****
                          {
                              // Bind value only if not in ignore mapping
!                             if (!ignoreMapping.testBit(j))
                              {
                                  Column column = columns[j];
--- 169,173 ----
                          {
                              // Bind value only if not in ignore mapping
!                             if (!ignoreMapping.get(j))
                              {
                                  Column column = columns[j];

Index: DeleteOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/DeleteOperation.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** DeleteOperation.java	15 Mar 2004 16:44:19 -0000	1.17
--- DeleteOperation.java	29 May 2004 00:02:25 -0000	1.18
***************
*** 27,30 ****
--- 27,31 ----
  
  import java.math.BigInteger;
+ import java.util.BitSet;
  
  /**
***************
*** 52,56 ****
      }
  
!     public OperationData getOperationData(ITableMetaData metaData, BigInteger ignoreMapping, IDatabaseConnection connection) throws DataSetException
      {
          // cannot construct where clause if no primary key
--- 53,57 ----
      }
  
!     public OperationData getOperationData(ITableMetaData metaData, BitSet ignoreMapping, IDatabaseConnection connection) throws DataSetException
      {
          // cannot construct where clause if no primary key

Index: InsertOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/InsertOperation.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** InsertOperation.java	29 Mar 2004 00:59:55 -0000	1.16
--- InsertOperation.java	29 May 2004 00:02:25 -0000	1.17
***************
*** 28,32 ****
  import org.dbunit.dataset.ITableMetaData;
  
! import java.math.BigInteger;
  
  /**
--- 28,32 ----
  import org.dbunit.dataset.ITableMetaData;
  
! import java.util.BitSet;
  
  /**
***************
*** 50,54 ****
  
      public OperationData getOperationData(ITableMetaData metaData,
!             BigInteger ignoreMapping, IDatabaseConnection connection) throws DataSetException
      {
          Column[] columns = metaData.getColumns();
--- 50,54 ----
  
      public OperationData getOperationData(ITableMetaData metaData,
!             BitSet ignoreMapping, IDatabaseConnection connection) throws DataSetException
      {
          Column[] columns = metaData.getColumns();
***************
*** 65,69 ****
          for (int i = 0; i < columns.length; i++)
          {
!             if (!ignoreMapping.testBit(i))
              {
                  // escape column name
--- 65,69 ----
          for (int i = 0; i < columns.length; i++)
          {
!             if (!ignoreMapping.get(i))
              {
                  // escape column name
***************
*** 81,85 ****
          for (int i = 0; i < columns.length; i++)
          {
!             if (!ignoreMapping.testBit(i))
              {
                  sqlBuffer.append(valueSeparator);
--- 81,85 ----
          for (int i = 0; i < columns.length; i++)
          {
!             if (!ignoreMapping.get(i))
              {
                  sqlBuffer.append(valueSeparator);
***************
*** 93,115 ****
      }
  
!     protected BigInteger getIgnoreMapping(ITable table, int row) throws DataSetException
      {
          Column[] columns = table.getTableMetaData().getColumns();
-         int n = columns.length;
-         int byteNum = n / 8;
-         byte[] result = new byte[byteNum + 2];
  
!         for (int i = 0; i < n; i++)
          {
              Object value = table.getValue(row, columns[i].getColumnName());
              if (value == ITable.NO_VALUE)
              {
!                 result[result.length - (i / 8) - 1] |= (1 << (i % 8));
              }
          }
!         return new BigInteger(result);
      }
  
!     protected boolean equalsIgnoreMapping(BigInteger ignoreMapping, ITable table,
              int row) throws DataSetException
      {
--- 93,113 ----
      }
  
!     protected BitSet getIgnoreMapping(ITable table, int row) throws DataSetException
      {
          Column[] columns = table.getTableMetaData().getColumns();
  
!         BitSet ignoreMapping = new BitSet();
!         for (int i = 0; i < columns.length; i++)
          {
              Object value = table.getValue(row, columns[i].getColumnName());
              if (value == ITable.NO_VALUE)
              {
!                 ignoreMapping.set(i);
              }
          }
!         return ignoreMapping;
      }
  
!     protected boolean equalsIgnoreMapping(BitSet ignoreMapping, ITable table,
              int row) throws DataSetException
      {
***************
*** 118,122 ****
          for (int i = 0; i < columns.length; i++)
          {
!             boolean bit = ignoreMapping.testBit(i);
              Object value = table.getValue(row, columns[i].getColumnName());
              if ((bit && value != ITable.NO_VALUE) || (!bit && value == ITable.NO_VALUE))
--- 116,120 ----
          for (int i = 0; i < columns.length; i++)
          {
!             boolean bit = ignoreMapping.get(i);
              Object value = table.getValue(row, columns[i].getColumnName());
              if ((bit && value != ITable.NO_VALUE) || (!bit && value == ITable.NO_VALUE))

Index: RefreshOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/RefreshOperation.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** RefreshOperation.java	29 Mar 2004 01:00:05 -0000	1.34
--- RefreshOperation.java	29 May 2004 00:02:25 -0000	1.35
***************
*** 26,36 ****
  import org.dbunit.database.statement.IPreparedBatchStatement;
  import org.dbunit.database.statement.SimplePreparedStatement;
! import org.dbunit.dataset.*;
  import org.dbunit.dataset.datatype.DataType;
  
- import java.math.BigInteger;
  import java.sql.PreparedStatement;
  import java.sql.ResultSet;
  import java.sql.SQLException;
  
  /**
--- 26,43 ----
  import org.dbunit.database.statement.IPreparedBatchStatement;
  import org.dbunit.database.statement.SimplePreparedStatement;
! import org.dbunit.dataset.Column;
! import org.dbunit.dataset.DataSetException;
! import org.dbunit.dataset.IDataSet;
! import org.dbunit.dataset.ITable;
! import org.dbunit.dataset.ITableIterator;
! import org.dbunit.dataset.ITableMetaData;
! import org.dbunit.dataset.NoPrimaryKeyException;
! import org.dbunit.dataset.RowOutOfBoundsException;
  import org.dbunit.dataset.datatype.DataType;
  
  import java.sql.PreparedStatement;
  import java.sql.ResultSet;
  import java.sql.SQLException;
+ import java.util.BitSet;
  
  /**
***************
*** 132,136 ****
          protected IPreparedBatchStatement _statement;
          protected OperationData _operationData;
!         protected BigInteger _ignoreMapping;
  
          /**
--- 139,143 ----
          protected IPreparedBatchStatement _statement;
          protected OperationData _operationData;
!         protected BitSet _ignoreMapping;
  
          /**
***************
*** 145,149 ****
              {
                  // Bind value only if not in ignore mapping
!                 if (_ignoreMapping == null || !_ignoreMapping.testBit(i))
                  {
                      Object value = table.getValue(row, columns[i].getColumnName());
--- 152,156 ----
              {
                  // Bind value only if not in ignore mapping
!                 if (_ignoreMapping == null || !_ignoreMapping.get(i))
                  {
                      Object value = table.getValue(row, columns[i].getColumnName());

Index: UpdateOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/UpdateOperation.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** UpdateOperation.java	15 Mar 2004 16:44:19 -0000	1.13
--- UpdateOperation.java	29 May 2004 00:02:25 -0000	1.14
***************
*** 28,31 ****
--- 28,32 ----
  import java.util.ArrayList;
  import java.util.List;
+ import java.util.BitSet;
  
  /**
***************
*** 46,50 ****
      // AbstractBatchOperation class
  
!     public OperationData getOperationData(ITableMetaData metaData, BigInteger ignoreMapping, IDatabaseConnection connection) throws DataSetException
      {
          Column[] columns = metaData.getColumns();
--- 47,51 ----
      // AbstractBatchOperation class
  
!     public OperationData getOperationData(ITableMetaData metaData, BitSet ignoreMapping, IDatabaseConnection connection) throws DataSetException
      {
          Column[] columns = metaData.getColumns();

[dbunit-commit] dbunit/xdocs faq.fml,1.17,1.18

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25633/xdocs

Modified Files:
	faq.fml 
Log Message:
Updated INDENTITY/auto-increment columns FAQ

Index: faq.fml
===================================================================
RCS file: /cvsroot/dbunit/dbunit/xdocs/faq.fml,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** faq.fml	8 May 2004 03:43:51 -0000	1.17
--- faq.fml	28 May 2004 22:14:03 -0000	1.18
***************
*** 138,147 ****
        </question>
        <answer>
!          <p>Auto-increment columns must be disabled in order to insert the dataset 
!         values into the database. The way to disable this feature is database 
!         specific. If your database does not provide a way to disable this feature 
!         then you are out of luck and DbUnit cannot be used with it. </p>
!       <p>DbUnit support IDENTITY columns for MS SQL Server 
!         with the class <a href="components.html#IdentityInsertOperation">IdentityInsertOperation</a>. 
        </p>
        </answer>
--- 138,146 ----
        </question>
        <answer>
!          <p>
!          Many RDBMS allow IDENTITY and auto-increment columns to be overwritten with client values implicitly. DbUnit can be used with these RDBMS natively.
! Some databases, like MS SQL Server and Sybase, need to explicitly activate client values writing. The way to activate this feature is vendor specific. 
!          <br/>
! DbUnit provides this functionality for MS SQL Server with the <a href="components.html#IdentityInsertOperation">IdentityInsertOperation</a> class. 
        </p>
        </answer>

[dbunit-commit] dbunit/src/test/org/dbunit/ext/oracle OracleDataTypeFactoryTest.java,1.8,1.9

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/ext/oracle
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22701/src/test/org/dbunit/ext/oracle

Modified Files:
	OracleDataTypeFactoryTest.java 
Log Message:
Support for Oracle FLOAT.

Index: OracleDataTypeFactoryTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/ext/oracle/OracleDataTypeFactoryTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** OracleDataTypeFactoryTest.java	12 May 2004 10:47:24 -0000	1.8
--- OracleDataTypeFactoryTest.java	28 May 2004 00:19:54 -0000	1.9
***************
*** 104,108 ****
      }
  
!     public void testCreateNChar2Type() throws Exception
      {
          int sqlType = Types.OTHER;
--- 104,108 ----
      }
  
!     public void testCreateNChar2DataType() throws Exception
      {
          int sqlType = Types.OTHER;
***************
*** 114,118 ****
      }
  
!     public void testCreateNVarChar2Type() throws Exception
      {
          int sqlType = Types.OTHER;
--- 114,118 ----
      }
  
!     public void testCreateNVarChar2DataType() throws Exception
      {
          int sqlType = Types.OTHER;
***************
*** 124,126 ****
--- 124,136 ----
      }
  
+     public void testCreateFloatDataType() throws Exception
+     {
+         int sqlType = Types.OTHER;
+         String sqlTypeName = "FLOAT";
+ 
+         DataType expected = DataType.FLOAT;
+         DataType actual = createFactory().createDataType(sqlType, sqlTypeName);
+         assertSame("type", expected, actual);
+     }
+ 
  }

[dbunit-commit] dbunit/src/java/org/dbunit/ext/oracle OracleDataTypeFactory.java,1.11,1.12

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/ext/oracle
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22701/src/java/org/dbunit/ext/oracle

Modified Files:
	OracleDataTypeFactory.java 
Log Message:
Support for Oracle FLOAT.

Index: OracleDataTypeFactory.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ext/oracle/OracleDataTypeFactory.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** OracleDataTypeFactory.java	12 May 2004 10:47:23 -0000	1.11
--- OracleDataTypeFactory.java	28 May 2004 00:19:53 -0000	1.12
***************
*** 80,83 ****
--- 80,89 ----
          }
  
+         // FLOAT
+         if ("FLOAT".equals(sqlTypeName))
+         {
+             return DataType.FLOAT;
+         }
+ 
          // LONG RAW
          if (LONG_RAW.toString().equals(sqlTypeName))

[dbunit-commit] dbunit/src/java/org/dbunit/dataset/datatype AbstractDataType.java,1.10,1.11 DataType.java,1.23,1.24 DateDataType.java,1.15,1.16 TimeDataType.java,1.15,1.16 TimestampDataType.java,1.16,1.17

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18432/src/java/org/dbunit/dataset/datatype

Modified Files:
	AbstractDataType.java DataType.java DateDataType.java 
	TimeDataType.java TimestampDataType.java 
Log Message:
Added isDateTime() method to DataType class.

Index: AbstractDataType.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/AbstractDataType.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** AbstractDataType.java	3 Apr 2004 18:16:33 -0000	1.10
--- AbstractDataType.java	27 May 2004 02:35:02 -0000	1.11
***************
*** 95,98 ****
--- 95,103 ----
      }
  
+     public boolean isDateTime()
+     {
+         return false;
+     }
+ 
      public Object getSqlValue(int column, ResultSet resultSet)
              throws SQLException, TypeCastException

Index: DataType.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/DataType.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** DataType.java	22 Jan 2004 02:54:18 -0000	1.23
--- DataType.java	27 May 2004 02:35:03 -0000	1.24
***************
*** 118,121 ****
--- 118,127 ----
  
      /**
+      * Returns <code>true</code> if this <code>DataType</code> represents a
+      * date and/or time.
+      */
+     public abstract boolean isDateTime();
+ 
+     /**
       * Returns the specified column value from the specified resultset object.
       */

Index: DateDataType.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/DateDataType.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DateDataType.java	28 Apr 2004 19:49:34 -0000	1.15
--- DateDataType.java	27 May 2004 02:35:03 -0000	1.16
***************
*** 100,103 ****
--- 100,108 ----
      }
  
+     public boolean isDateTime()
+     {
+         return true;
+     }
+ 
      public Object getSqlValue(int column, ResultSet resultSet)
              throws SQLException, TypeCastException

Index: TimeDataType.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/TimeDataType.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** TimeDataType.java	28 Apr 2004 19:49:34 -0000	1.15
--- TimeDataType.java	27 May 2004 02:35:03 -0000	1.16
***************
*** 80,83 ****
--- 80,88 ----
      }
  
+     public boolean isDateTime()
+     {
+         return true;
+     }
+ 
      public Object getSqlValue(int column, ResultSet resultSet)
              throws SQLException, TypeCastException

Index: TimestampDataType.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/TimestampDataType.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** TimestampDataType.java	28 Apr 2004 19:49:34 -0000	1.16
--- TimestampDataType.java	27 May 2004 02:35:03 -0000	1.17
***************
*** 96,99 ****
--- 96,104 ----
      }
  
+     public boolean isDateTime()
+     {
+         return true;
+     }
+ 
      public Object getSqlValue(int column, ResultSet resultSet)
              throws SQLException, TypeCastException

[dbunit-commit] dbunit/src/test/org/dbunit/dataset/datatype AbstractDataTypeTest.java,1.11,1.12 BooleanDataTypeTest.java,1.11,1.12 BytesDataTypeTest.java,1.12,1.13 DateDataTypeTest.java,1.12,1.13 DoubleDataTypeTest.java,1.12,1.13 FloatDataTypeTest.java,1.11,1.12 IntegerDataTypeTest.java,1.11,1.12 LongDataTypeTest.java,1.11,1.12 NumberDataTypeTest.java,1.13,1.14 StringDataTypeTest.java,1.13,1.14 TimeDataTypeTest.java,1.11,1.12 TimestampDataTypeTest.java,1.12,1.13

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/datatype
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18432/src/test/org/dbunit/dataset/datatype

Modified Files:
	AbstractDataTypeTest.java BooleanDataTypeTest.java 
	BytesDataTypeTest.java DateDataTypeTest.java 
	DoubleDataTypeTest.java FloatDataTypeTest.java 
	IntegerDataTypeTest.java LongDataTypeTest.java 
	NumberDataTypeTest.java StringDataTypeTest.java 
	TimeDataTypeTest.java TimestampDataTypeTest.java 
Log Message:
Added isDateTime() method to DataType class.

Index: AbstractDataTypeTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/datatype/AbstractDataTypeTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** AbstractDataTypeTest.java	22 Feb 2004 23:27:20 -0000	1.11
--- AbstractDataTypeTest.java	27 May 2004 02:35:04 -0000	1.12
***************
*** 43,46 ****
--- 43,48 ----
      public abstract void testIsNumber() throws Exception;
  
+     public abstract void testIsDateTime() throws Exception;
+ 
      public abstract void testTypeCast() throws Exception;
  

Index: BooleanDataTypeTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/datatype/BooleanDataTypeTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** BooleanDataTypeTest.java	22 Feb 2004 23:27:20 -0000	1.11
--- BooleanDataTypeTest.java	27 May 2004 02:35:04 -0000	1.12
***************
*** 65,68 ****
--- 65,73 ----
      }
  
+     public void testIsDateTime() throws Exception
+     {
+         assertEquals("is date/time", false, THIS_TYPE.isDateTime());
+     }
+ 
      public void testTypeCast() throws Exception
      {

Index: BytesDataTypeTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/datatype/BytesDataTypeTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** BytesDataTypeTest.java	15 Mar 2004 16:44:20 -0000	1.12
--- BytesDataTypeTest.java	27 May 2004 02:35:04 -0000	1.13
***************
*** 82,85 ****
--- 82,93 ----
      }
  
+     public void testIsDateTime() throws Exception
+     {
+         for (int i = 0; i < TYPES.length; i++)
+         {
+             assertEquals("is date/time", false, TYPES[i].isDateTime());
+         }
+     }
+ 
      public void testTypeCast() throws Exception
      {

Index: DateDataTypeTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/datatype/DateDataTypeTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DateDataTypeTest.java	22 Feb 2004 23:27:20 -0000	1.12
--- DateDataTypeTest.java	27 May 2004 02:35:04 -0000	1.13
***************
*** 67,70 ****
--- 67,75 ----
      }
  
+     public void testIsDateTime() throws Exception
+     {
+         assertEquals("is date/time", true, THIS_TYPE.isDateTime());
+     }
+ 
      public void testTypeCast() throws Exception
      {

Index: DoubleDataTypeTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/datatype/DoubleDataTypeTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DoubleDataTypeTest.java	7 May 2004 02:51:47 -0000	1.12
--- DoubleDataTypeTest.java	27 May 2004 02:35:04 -0000	1.13
***************
*** 69,72 ****
--- 69,80 ----
      }
  
+     public void testIsDateTime() throws Exception
+     {
+         for (int i = 0; i < TYPES.length; i++)
+         {
+             assertEquals("is date/time", false, TYPES[i].isDateTime());
+         }
+     }
+ 
      public void testTypeCast() throws Exception
      {

Index: FloatDataTypeTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/datatype/FloatDataTypeTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FloatDataTypeTest.java	22 Feb 2004 23:27:20 -0000	1.11
--- FloatDataTypeTest.java	27 May 2004 02:35:04 -0000	1.12
***************
*** 57,60 ****
--- 57,65 ----
      }
  
+     public void testIsDateTime() throws Exception
+     {
+         assertEquals("is date/time", false, THIS_TYPE.isDateTime());
+     }
+ 
      public void testTypeCast() throws Exception
      {

Index: IntegerDataTypeTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/datatype/IntegerDataTypeTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** IntegerDataTypeTest.java	22 Feb 2004 23:27:20 -0000	1.11
--- IntegerDataTypeTest.java	27 May 2004 02:35:04 -0000	1.12
***************
*** 80,83 ****
--- 80,91 ----
      }
  
+     public void testIsDateTime() throws Exception
+     {
+         for (int i = 0; i < TYPES.length; i++)
+         {
+             assertEquals("is date/time", false, TYPES[i].isDateTime());
+         }
+     }
+ 
      public void testTypeCast() throws Exception
      {

Index: LongDataTypeTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/datatype/LongDataTypeTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** LongDataTypeTest.java	22 Feb 2004 23:27:20 -0000	1.11
--- LongDataTypeTest.java	27 May 2004 02:35:04 -0000	1.12
***************
*** 66,69 ****
--- 66,74 ----
      }
  
+     public void testIsDateTime() throws Exception
+     {
+         assertEquals("is date/time", false, THIS_TYPE.isDateTime());
+     }
+ 
      public void testTypeCast() throws Exception
      {

Index: NumberDataTypeTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/datatype/NumberDataTypeTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** NumberDataTypeTest.java	7 May 2004 02:51:47 -0000	1.13
--- NumberDataTypeTest.java	27 May 2004 02:35:04 -0000	1.14
***************
*** 70,73 ****
--- 70,81 ----
      }
  
+     public void testIsDateTime() throws Exception
+     {
+         for (int i = 0; i < TYPES.length; i++)
+         {
+             assertEquals("is date/time", false, TYPES[i].isDateTime());
+         }
+     }
+ 
      public void testTypeCast() throws Exception
      {

Index: StringDataTypeTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/datatype/StringDataTypeTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** StringDataTypeTest.java	22 Feb 2004 23:27:20 -0000	1.13
--- StringDataTypeTest.java	27 May 2004 02:35:04 -0000	1.14
***************
*** 78,81 ****
--- 78,89 ----
      }
  
+     public void testIsDateTime() throws Exception
+     {
+         for (int i = 0; i < TYPES.length; i++)
+         {
+             assertEquals("is date/time", false, TYPES[i].isDateTime());
+         }
+     }
+ 
      public void testTypeCast() throws Exception
      {

Index: TimeDataTypeTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/datatype/TimeDataTypeTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** TimeDataTypeTest.java	22 Feb 2004 23:27:20 -0000	1.11
--- TimeDataTypeTest.java	27 May 2004 02:35:04 -0000	1.12
***************
*** 58,61 ****
--- 58,66 ----
      }
  
+     public void testIsDateTime() throws Exception
+     {
+         assertEquals("is date/time", true, THIS_TYPE.isDateTime());
+     }
+ 
      public void testTypeCast() throws Exception
      {

Index: TimestampDataTypeTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/datatype/TimestampDataTypeTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** TimestampDataTypeTest.java	22 Feb 2004 23:27:20 -0000	1.12
--- TimestampDataTypeTest.java	27 May 2004 02:35:04 -0000	1.13
***************
*** 65,68 ****
--- 65,73 ----
      }
  
+     public void testIsDateTime() throws Exception
+     {
+         assertEquals("is date/time", true, THIS_TYPE.isDateTime());
+     }
+ 
      public void testTypeCast() throws Exception
      {

[dbunit-commit] dbunit/src/java/org/dbunit/dataset/filter DefaultColumnFilter.java,1.2,1.3

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/filter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11020/src/java/org/dbunit/dataset/filter

Modified Files:
	DefaultColumnFilter.java 
Log Message:
Added two convenience methods in DefaultColumnFilter, includeTableColumns() and includeTableColumns(), to ease creation of table with filtered columns.

Index: DefaultColumnFilter.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/filter/DefaultColumnFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DefaultColumnFilter.java	12 May 2004 01:10:54 -0000	1.2
--- DefaultColumnFilter.java	18 May 2004 03:25:41 -0000	1.3
***************
*** 22,25 ****
--- 22,29 ----
  
  import org.dbunit.dataset.Column;
+ import org.dbunit.dataset.ITable;
+ import org.dbunit.dataset.CompositeTable;
+ import org.dbunit.dataset.FilteredTableMetaData;
+ import org.dbunit.dataset.DataSetException;
  
  /**
***************
*** 77,80 ****
--- 81,122 ----
      }
  
+     /**
+      * Returns a table backed by the specified table that only includes specified
+      * columns.
+      */
+     public static ITable includeTableColumns(ITable table, String[] columnNames)
+             throws DataSetException
+     {
+         DefaultColumnFilter columnFilter = new DefaultColumnFilter();
+         for (int i = 0; i < columnNames.length; i++)
+         {
+             String columnName = columnNames[i];
+             columnFilter.includeColumn(columnName);
+         }
+ 
+         FilteredTableMetaData metaData = new FilteredTableMetaData(
+                 table.getTableMetaData(), columnFilter);
+         return new CompositeTable(metaData, table);
+     }
+ 
+     /**
+      * Returns a table backed by the specified table that excludes specified
+      * columns.
+      */
+     public static ITable excludeTableColumns(ITable table, String[] columnNames)
+             throws DataSetException
+     {
+         DefaultColumnFilter columnFilter = new DefaultColumnFilter();
+         for (int i = 0; i < columnNames.length; i++)
+         {
+             String columnName = columnNames[i];
+             columnFilter.excludeColumn(columnName);
+         }
+ 
+         FilteredTableMetaData metaData = new FilteredTableMetaData(
+                 table.getTableMetaData(), columnFilter);
+         return new CompositeTable(metaData, table);
+     }
+ 
      ////////////////////////////////////////////////////////////////////////////
      // IColumnFilter interface

[dbunit-commit] dbunit/src/java/org/dbunit/dataset/excel XlsTable.java,1.4,1.5

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/excel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31696/src/java/org/dbunit/dataset/excel

Modified Files:
	XlsTable.java 
Log Message:
Fixed XlsTable empty table detection. Patch submitted by Deepak Kaimal.

Index: XlsTable.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/excel/XlsTable.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** XlsTable.java	15 Mar 2004 16:44:17 -0000	1.4
--- XlsTable.java	18 May 2004 02:15:44 -0000	1.5
***************
*** 46,50 ****
      {
          int rowCount = sheet.getLastRowNum();
!         if (rowCount > 0)
          {
              _metaData = createMetaData(sheetName, sheet.getRow(0));
--- 46,50 ----
      {
          int rowCount = sheet.getLastRowNum();
!         if (rowCount > 0 && sheet.getRow(0) != null)
          {
              _metaData = createMetaData(sheetName, sheet.getRow(0));
***************
*** 134,135 ****
--- 134,136 ----
      }
  }
+