[ARQ-1167] Fixed ExclusiveTransactionException by removing usage of DBUnit TransactionOperation which was wrapping standard operations such as DELETE or DELETE_ALL.

Author: bartoszmajsak

impl/src/main/java/org/jboss/arquillian/persistence/dbunit/DBUnitDataHandler.java

@@ -25,7 +25,6 @@
 import org.dbunit.dataset.IDataSet;
 import org.dbunit.dataset.filter.ExcludeTableFilter;
 import org.dbunit.operation.DatabaseOperation;
-import org.dbunit.operation.TransactionOperation;
 import org.jboss.arquillian.core.api.Instance;
 import org.jboss.arquillian.core.api.annotation.Inject;
 import org.jboss.arquillian.core.api.annotation.Observes;
@@ -155,8 +154,7 @@ private void fillDatabase() throws Exception
       final DatabaseConnection connection = databaseConnection.get();
       IDataSet initialDataSet = DataSetUtils.mergeDataSets(dataSetRegister.get().getInitial());
       initialDataSet = new FilteredDataSet(new DatabaseSequenceFilter(connection), initialDataSet);
-      final DatabaseOperation selectedSeedingStrategy = getSelectedSeedingStrategy();
-      new TransactionOperation(selectedSeedingStrategy).execute(connection, initialDataSet);
+      getSelectedSeedingStrategy().execute(connection, initialDataSet);
    }
 
    private DatabaseOperation getSelectedSeedingStrategy()

impl/src/main/java/org/jboss/arquillian/persistence/dbunit/cleanup/SeededDataOnlyCleanupStrategyExecutor.java

@@ -22,7 +22,6 @@
 import org.dbunit.dataset.FilteredDataSet;
 import org.dbunit.dataset.IDataSet;
 import org.dbunit.operation.DatabaseOperation;
-import org.dbunit.operation.TransactionOperation;
 import org.jboss.arquillian.persistence.dbunit.DataSetUtils;
 import org.jboss.arquillian.persistence.dbunit.dataset.DataSetRegister;
 import org.jboss.arquillian.persistence.dbunit.exception.DBUnitDataSetHandlingException;
@@ -48,7 +47,7 @@ public void cleanupDatabase(String ... tablesToExclude)
          final IDataSet mergeDataSets = DataSetUtils.mergeDataSets(dataSetRegister.getInitial());
          IDataSet dataSet = DataSetUtils.excludeTables(mergeDataSets, tablesToExclude);
          dataSet = new FilteredDataSet(new DatabaseSequenceFilter(connection), dataSet);
-         new TransactionOperation(DatabaseOperation.DELETE).execute(connection, dataSet);
+         DatabaseOperation.DELETE.execute(connection, dataSet);
       }
       catch (Exception e)
       {

impl/src/main/java/org/jboss/arquillian/persistence/dbunit/cleanup/StrictCleanupStrategyExecutor.java

@@ -22,7 +22,6 @@
 import org.dbunit.dataset.FilteredDataSet;
 import org.dbunit.dataset.IDataSet;
 import org.dbunit.operation.DatabaseOperation;
-import org.dbunit.operation.TransactionOperation;
 import org.jboss.arquillian.persistence.dbunit.DataSetUtils;
 import org.jboss.arquillian.persistence.dbunit.exception.DBUnitDataSetHandlingException;
 
@@ -43,7 +42,7 @@ public void cleanupDatabase(String ... tablesToExclude)
       {
          IDataSet dataSet = DataSetUtils.excludeTables(connection.createDataSet(), tablesToExclude);
          dataSet = new FilteredDataSet(new DatabaseSequenceFilter(connection), dataSet);
-         new TransactionOperation(DatabaseOperation.DELETE_ALL).execute(connection, dataSet);
+         DatabaseOperation.DELETE_ALL.execute(connection, dataSet);
       }
       catch (Exception e)
       {

impl/src/main/java/org/jboss/arquillian/persistence/dbunit/cleanup/UsedTablesOnlyCleanupStrategyExecutor.java

@@ -22,7 +22,6 @@
 import org.dbunit.dataset.FilteredDataSet;
 import org.dbunit.dataset.IDataSet;
 import org.dbunit.operation.DatabaseOperation;
-import org.dbunit.operation.TransactionOperation;
 import org.jboss.arquillian.persistence.dbunit.DataSetUtils;
 import org.jboss.arquillian.persistence.dbunit.dataset.DataSetRegister;
 import org.jboss.arquillian.persistence.dbunit.exception.DBUnitDataSetHandlingException;
@@ -48,7 +47,7 @@ public void cleanupDatabase(String ... tablesToExclude)
          final IDataSet mergeDataSets = DataSetUtils.mergeDataSets(dataSetRegister.getInitial());
          IDataSet dataSet = DataSetUtils.excludeTables(mergeDataSets, tablesToExclude);
          dataSet = new FilteredDataSet(new DatabaseSequenceFilter(connection), dataSet);
-         new TransactionOperation(DatabaseOperation.DELETE_ALL).execute(connection, dataSet);
+         DatabaseOperation.DELETE_ALL.execute(connection, dataSet);
       }
       catch (Exception e)
       {

int-tests-testng/src/test/java/org/jboss/arquillian/integration/persistence/datasource/mysql/MySqlDataSource.java

@@ -24,7 +24,7 @@
 @DataSourceDefinition(name = "java:app/datasources/mysql_ds",
    className = "com.mysql.jdbc.jdbc2.optional.MysqlDataSource",
    url = "jdbc:mysql://localhost:3306/ape",
-   user = "root",
+   user = "ape",
    password = "letmein")
 @Singleton
 @Startup

int-tests/src/test/java/org/jboss/arquillian/integration/persistence/datasource/mysql/MySqlDataSource.java

@@ -24,7 +24,7 @@
 @DataSourceDefinition(name = "java:app/datasources/mysql_ds",
    className = "com.mysql.jdbc.jdbc2.optional.MysqlDataSource",
    url = "jdbc:mysql://localhost:3306/ape",
-   user = "root",
+   user = "ape",
    password = "letmein")
 @Singleton
 @Startup

int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/UsedRowsOnlyCleanupStrategyTest.java

@@ -59,7 +59,7 @@ public static Archive<?> createDeploymentPackage()
    EntityManager em;
 
    @Test @InSequence(1)
-   @ApplyScriptBefore({ "clark-kent-with-nickname.sql", "john-smith.sql" })
+   @ApplyScriptBefore({ "clark-kent-without-nickname.sql", "john-smith.sql" })
    @Cleanup(phase = TestExecutionPhase.NONE)
    public void insert_data_for_test()
    {

int-tests/src/test/resources/scripts/clark-kent-without-nickname.sql

@@ -0,0 +1 @@
+INSERT INTO useraccount (id, firstname, lastname, username, password) VALUES (2, 'Clark', 'Kent', 'ckent', 'LexLuthor123')