[dbunit-commit] dbunit/src/java/org/dbunit/operation AbstractBatchOperation.java,1.22,1.23 AbstractOperation.java,1.2,1.3 RefreshOperation.java,1.31,1.32

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

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

Modified Files:
	AbstractBatchOperation.java AbstractOperation.java 
	RefreshOperation.java 
Log Message:
* Added test to verify misnamed column when executing some operations.
* Minor operations cleanup.


Index: AbstractBatchOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/AbstractBatchOperation.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** AbstractBatchOperation.java	22 Jan 2004 02:54:19 -0000	1.22
--- AbstractBatchOperation.java	3 Feb 2004 01:27:11 -0000	1.23
***************
*** 27,36 ****
  import org.dbunit.database.statement.IPreparedBatchStatement;
  import org.dbunit.database.statement.IStatementFactory;
! import org.dbunit.dataset.*;
  
  import java.math.BigInteger;
  import java.sql.SQLException;
- import java.util.ArrayList;
- import java.util.List;
  
  /**
--- 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.math.BigInteger;
  import java.sql.SQLException;
  
  /**
***************
*** 46,83 ****
      protected boolean _reverseRowOrder = false;
  
-     /**
-      * Returns the metadata to use in this operation.
-      *
-      * @param connection the database connection
-      * @param metaData the xml table metadata
-      */
-     static ITableMetaData getOperationMetaData(IDatabaseConnection connection,
-             ITableMetaData metaData) throws DatabaseUnitException, SQLException
-     {
-         IDataSet databaseDataSet = connection.createDataSet();
-         String tableName = metaData.getTableName();
- 
-         ITableMetaData databaseMetaData = databaseDataSet.getTableMetaData(tableName);
-         Column[] databaseColumns = databaseMetaData.getColumns();
-         Column[] columns = metaData.getColumns();
- 
-         List columnList = new ArrayList();
-         for (int j = 0; j < columns.length; j++)
-         {
-             String columnName = columns[j].getColumnName();
-             Column column = DataSetUtils.getColumn(
-                     columnName, databaseColumns);
-             if (column == null)
-             {
-                 throw new NoSuchColumnException(tableName + "." + columnName);
-             }
-             columnList.add(column);
-         }
- 
-         return new DefaultTableMetaData(databaseMetaData.getTableName(),
-                 (Column[])columnList.toArray(new Column[0]),
-                 databaseMetaData.getPrimaryKeys());
-     }
- 
      static boolean isEmpty(ITable table) throws DataSetException
      {
--- 50,53 ----

Index: AbstractOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/AbstractOperation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AbstractOperation.java	22 Jan 2004 02:54:19 -0000	1.2
--- AbstractOperation.java	3 Feb 2004 01:27:11 -0000	1.3
***************
*** 24,27 ****
--- 24,37 ----
  import org.dbunit.database.IDatabaseConnection;
  import org.dbunit.dataset.DataSetUtils;
+ import org.dbunit.dataset.ITableMetaData;
+ import org.dbunit.dataset.IDataSet;
+ import org.dbunit.dataset.Column;
+ import org.dbunit.dataset.NoSuchColumnException;
+ import org.dbunit.dataset.DefaultTableMetaData;
+ import org.dbunit.DatabaseUnitException;
+ 
+ import java.sql.SQLException;
+ import java.util.List;
+ import java.util.ArrayList;
  
  /**
***************
*** 40,43 ****
--- 50,85 ----
      }
  
+     /**
+      * Returns the metadata to use in this operation.
+      *
+      * @param connection the database connection
+      * @param metaData the xml table metadata
+      */
+     static ITableMetaData getOperationMetaData(IDatabaseConnection connection,
+             ITableMetaData metaData) throws DatabaseUnitException, SQLException
+     {
+         IDataSet databaseDataSet = connection.createDataSet();
+         String tableName = metaData.getTableName();
+ 
+         ITableMetaData databaseMetaData = databaseDataSet.getTableMetaData(tableName);
+         Column[] databaseColumns = databaseMetaData.getColumns();
+         Column[] columns = metaData.getColumns();
  
+         List columnList = new ArrayList();
+         for (int j = 0; j < columns.length; j++)
+         {
+             String columnName = columns[j].getColumnName();
+             Column column = DataSetUtils.getColumn(
+                     columnName, databaseColumns);
+             if (column == null)
+             {
+                 throw new NoSuchColumnException(tableName + "." + columnName);
+             }
+             columnList.add(column);
+         }
+ 
+         return new DefaultTableMetaData(databaseMetaData.getTableName(),
+                 (Column[])columnList.toArray(new Column[0]),
+                 databaseMetaData.getPrimaryKeys());
+     }
  }

Index: RefreshOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/RefreshOperation.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** RefreshOperation.java	22 Jan 2004 02:54:19 -0000	1.31
--- RefreshOperation.java	3 Feb 2004 01:27:11 -0000	1.32
***************
*** 67,77 ****
      }
  
-     private ITableMetaData getOperationMetaData(IDatabaseConnection connection,
-             ITableMetaData metaData) throws DatabaseUnitException, SQLException
-     {
-         return AbstractBatchOperation.getOperationMetaData(
-                             connection, metaData);
-     }
- 
      ////////////////////////////////////////////////////////////////////////////
      // DatabaseOperation class
--- 67,70 ----
***************
*** 140,144 ****
  
      /**
!      * This class represents a operation executable on a single table row.
       */
      class RowOperation
--- 133,137 ----
  
      /**
!      * This class represents a operation executed on a single table row.
       */
      class RowOperation
***************
*** 149,153 ****
  
          /**
!          * Execute this operation on the sepcfied table row.
           * @return <code>true</code> if operation have been executed on the row.
           */
--- 142,146 ----
  
          /**
!          * Execute this operation on the sepcified table row.
           * @return <code>true</code> if operation have been executed on the row.
           */