[Maven-plugins-cvs] cvs commit: maven-plugins/dbunit/xdocs changes.xml

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

dep4b       05/05/09 05:26:45

  Modified:    dbunit/src/main/net/sourceforge/mavenplugins/dbunit
                        DataSetTool.java
               dbunit/xdocs changes.xml
  Log:
  Support mssql operations and warning for invalid values
  
  Revision  Changes    Path
  1.5       +18 -13    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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DataSetTool.java	5 Aug 2004 00:48:44 -0000	1.4
  +++ DataSetTool.java	9 May 2005 12:26:44 -0000	1.5
  @@ -61,6 +61,7 @@
   import org.dbunit.database.IDatabaseConnection;
   import org.dbunit.dataset.DataSetException;
   import org.dbunit.dataset.IDataSet;
  +import org.dbunit.ext.mssql.InsertIdentityOperation;
   import org.dbunit.operation.DatabaseOperation;
   
   import java.io.IOException;
  @@ -80,7 +81,7 @@
       private static final String EXPORT = "EXPORT";
       /** format for excel files */
       private static final String EXCEL = "EXCEL";
  -    
  +
       /**
        * @return the format of the data set.
        */
  @@ -88,9 +89,9 @@
       {
           return dataSetFormat;
       }
  -    
  +
       /**
  -     * TODO better document this 
  +     * TODO better document this
        * Set the format of the dataset, e.g. EXCEL
        * @param name the dbunit dataset format
        */
  @@ -108,7 +109,7 @@
       {
           return operation;
       }
  -    
  +
       /**
        * @return the operation to perform on a dataset
        * @see #getOperation()
  @@ -120,20 +121,21 @@
           if (operation.equalsIgnoreCase("CLEAN_INSERT")) dbOperation = DatabaseOperation.CLEAN_INSERT;
           if (operation.equalsIgnoreCase("DELETE")) dbOperation = DatabaseOperation.DELETE;
           if (operation.equalsIgnoreCase("INSERT")) dbOperation = DatabaseOperation.INSERT;
  +        if (operation.equalsIgnoreCase("MSSQL_CLEAN_INSERT")) dbOperation = InsertIdentityOperation.CLEAN_INSERT;
       }
  -    
  +
       /**
        * @return a comma separated list of table names
  -     */   
  +     */
       public String getExportTables()
       {
           return exportTables;
       }
  -    
  +
       /**
        * set the list of tables to be exported
        * @param tables a comma separated list of table names
  -     */   
  +     */
       public void setExportTables(String tables)
       {
           exportTables = tables;
  @@ -145,9 +147,9 @@
       private IDataSet getDataSet(IDatabaseConnection connection) throws SQLException
       {
           if (getExportTables() == null) return connection.createDataSet();
  -        else return connection.createDataSet(StringUtils.split(getExportTables(), ","));
  +        return connection.createDataSet(StringUtils.split(getExportTables(), ","));
       }
  -    
  +
       /**
        * Process a dataset using a DbUnit operation
        */
  @@ -155,10 +157,9 @@
       {
           if (getOperation().equalsIgnoreCase(EXPORT))
           {
  -            // database connection - close?
  -            IDatabaseConnection connection = getConnection();    
  -            // write file
  +            IDatabaseConnection connection= getConnection();
               writeDataSetToFile(getFileName(), getDataSetFormat(), getDataSet(connection));
  +            connection.close();
           }
           else if (dbOperation != null)
           {
  @@ -166,6 +167,10 @@
               IDataSet dataset = getDataSetFromFile(getFileName(), getDataSetFormat());
               dbOperation.execute(getConnection(), dataset);
           }
  +        else
  +        {
  +            throw new IllegalArgumentException("Invalid value for maven.dbunit.importType");
  +        	}
       }
       
   }
  \ No newline at end of file
  
  
  
  1.18      +3 -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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- changes.xml	26 Aug 2004 23:38:06 -0000	1.17
  +++ changes.xml	9 May 2005 12:26:45 -0000	1.18
  @@ -6,6 +6,9 @@
       <author email="dio...@so...">dIon Gillard</author>
     </properties>
     <body>
  +    <release version="1.6" data="in cvs">
  +      <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">
         <action dev="diongillard" type="fix">Use version of POI used with dbunit 2.1</action>
         <action dev="diongillard" type="add">Add xml2xls dataset conversion goal</action>