X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=test%2Fenterprise%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsupport%2Fpersistence%2FDatabaseUtils.java;h=23938768223259fe70ae76d100388cad789cb0ad;hb=f9ccadb956bac942258d9892c66e481ac2aec446;hp=cd7b3e26dd0bd56cc1d943e37ef8262b478ce8ab;hpb=185601ca79008d99e5c2293bc3686fc501720484;p=utils

diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseUtils.java b/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseUtils.java
index cd7b3e26..23938768 100644
--- a/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseUtils.java
+++ b/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseUtils.java
@@ -108,6 +108,7 @@ public class DatabaseUtils {
                 LOG.log(Level.WARNING, "Could not close connection", e);
             }
         }
+        connections.clear();
     }
 
     public IDatabaseTester createDbTester() throws Exception {
@@ -127,11 +128,11 @@ public class DatabaseUtils {
 
     public void executeOnTables(ITableFilterSimple aTables,
         final TableSetOperation aOperation) throws Exception {
-        final String[] tables = getTableNames(aTables);
+        final String[] tableNames = getTableNames(aTables);
         executeInTransaction(new JdbcUnitOfWork<Void>() {
             public Void execute(Connection aConnection) throws Exception {
-                for (int i = tables.length - 1; i >= 0; i--) {
-                    aOperation.execute(tables[i]);
+                for (int i = tableNames.length - 1; i >= 0; i--) {
+                    aOperation.execute(tableNames[i]);
                 }
                 return null;
             }
@@ -140,16 +141,16 @@ public class DatabaseUtils {
 
     public void cleanDatabase(ITableFilterSimple aSelection) throws Exception {
 
-        final String[] tables = getTableNames(aSelection);
+        final String[] tableNames = getTableNames(aSelection);
         executeInTransaction(new JdbcUnitOfWork<Void>() {
 
             public Void execute(Connection aConnection) throws Exception {
                 IDatabaseConnection connection = new DatabaseConnection(
                     aConnection);
                 ITableFilter filter = new DatabaseSequenceFilter(connection,
-                    tables);
+                    tableNames);
                 IDataSet dataset = new FilteredDataSet(filter, connection
-                    .createDataSet(tables));
+                    .createDataSet(tableNames));
                 DatabaseOperation.DELETE_ALL.execute(connection, dataset);
                 return null;
             }
@@ -186,10 +187,10 @@ public class DatabaseUtils {
 
         Connection connection = dataSource.getConnection();
         try {
-            ResultSet tables = connection.getMetaData().getTables(null,
+            ResultSet tableNames = connection.getMetaData().getTables(null,
                 SCHEMA_PATTERN, "%", new String[] { "TABLE" });
-            while (tables.next()) {
-                String table = tables.getString("TABLE_NAME");
+            while (tableNames.next()) {
+                String table = tableNames.getString("TABLE_NAME");
                 if (aSelection.accept(table)) {
                     result.add(table);
                 }
@@ -234,16 +235,16 @@ public class DatabaseUtils {
     }
 
     public void dropTables(ITableFilterSimple aTables) throws Exception {
-        final String[] tables = getTableNames(aTables);
+        final String[] tableNames = getTableNames(aTables);
         String[] sortedTables = executeInTransaction(new JdbcUnitOfWork<String[]>() {
 
             public String[] execute(Connection aConnection) throws Exception {
                 IDatabaseConnection connection = new DatabaseConnection(
                     aConnection);
                 ITableFilter filter = new DatabaseSequenceFilter(connection,
-                    tables);
+                    tableNames);
                 IDataSet dataset = new FilteredDataSet(filter, connection
-                    .createDataSet(tables));
+                    .createDataSet(tableNames));
                 return dataset.getTableNames();
             }
         });