Referential integrity: when adding a referential integrity constraint failed,…

Referential integrity: when adding a referential integrity constraint failed, and if creating the constraint automatically created an index, this index was not removed.

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,9 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>The auto-analyze feature now only reads 1000 rows per table instead of 10000.
+<ul><li>Referential integrity: when adding a referential integrity constraint failed,
+    and if creating the constraint automatically created an index, this index was not removed.
+</li><li>The auto-analyze feature now only reads 1000 rows per table instead of 10000.
 </li><li>The optimization for IN(...) queries combined with OR could result
     in a strange exception of the type "column x must be included in the group by list".
 </li><li>Issue 454: Use Charset for type-safety.

h2/src/main/org/h2/command/ddl/AlterTableAddConstraint.java

@@ -50,6 +50,7 @@ public class AlterTableAddConstraint extends SchemaCommand {
     private boolean checkExisting;
     private boolean primaryKeyHash;
     private final boolean ifNotExists;
+    private ArrayList<Index> createdIndexes = New.arrayList();
 
     public AlterTableAddConstraint(Session session, Schema schema, boolean ifNotExists) {
         super(session, schema);
@@ -67,6 +68,11 @@ public class AlterTableAddConstraint extends SchemaCommand {
     public int update() {
         try {
             return tryUpdate();
+        } catch (DbException e) {
+            for (Index index : createdIndexes) {
+                session.getDatabase().removeSchemaObject(session, index);
+            }
+            throw e;
         } finally {
             getSchema().freeUniqueName(constraintName);
         }
@@ -259,7 +265,9 @@ public class AlterTableAddConstraint extends SchemaCommand {
         String prefix = constraintName == null ? "CONSTRAINT" : constraintName;
         String indexName = t.getSchema().getUniqueIndexName(session, t, prefix + "_INDEX_");
         try {
-            return t.addIndex(session, indexName, indexId, cols, indexType, true, null);
+            Index index = t.addIndex(session, indexName, indexId, cols, indexType, true, null);
+            createdIndexes.add(index);
+            return index;
         } finally {
             getSchema().freeUniqueName(indexName);
         }

h2/src/test/org/h2/test/TestAll.java

@@ -493,7 +493,7 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1`
     private void runTests() throws SQLException {
 
         int test;
-        mvStore = true;
+        mvStore = false;
 
         smallLog = big = networked = memory = ssl = false;
         diskResult = traceSystemOut = diskUndo = false;
@@ -565,123 +565,111 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1`
         beforeTest();
 
         // db
-////        new TestScriptSimple().runTest(this);
+        new TestScriptSimple().runTest(this);
         new TestScript().runTest(this);
-        if(true)System.exit(0);
-
-//        new TestAlter().runTest(this);
-//        new TestAlterSchemaRename().runTest(this);
-//        new TestAutoRecompile().runTest(this);
-//        new TestBitField().runTest(this);
-////        new TestBackup().runTest(this);
-//        new TestBigDb().runTest(this);
-//        new TestBigResult().runTest(this);
-//        new TestCases().runTest(this);
-//        new TestCheckpoint().runTest(this);
-////        new TestCluster().runTest(this);
-//        new TestCompatibility().runTest(this);
-//        new TestCsv().runTest(this);
-//        new TestDateStorage().runTest(this);
-//        new TestDeadlock().runTest(this);
-//        new TestEncryptedDb().runTest(this);
-//        new TestExclusive().runTest(this);
-
-        // unique index on update?
-////        new TestFullText().runTest(this);
-
-//        new TestFunctionOverload().runTest(this);
-//        new TestFunctions().runTest(this);
-//        new TestInit().runTest(this);
-
-        // unique index on update?
-////        new TestIndex().runTest(this);
-//        new TestLargeBlob().runTest(this);
-//        new TestLinkedTable().runTest(this);
-//        new TestListener().runTest(this);
-
-        // index on lob for in-memory indexes?
-////        new TestLob().runTest(this);
-//        new TestMemoryUsage().runTest(this);
-//        new TestMultiConn().runTest(this);
-//        new TestMultiDimension().runTest(this);
-//        new TestMultiThread().runTest(this);
-////        new TestMultiThreadedKernel().runTest(this);
-//        new TestOpenClose().runTest(this);
-//        new TestOptimizations().runTest(this);
-////        new TestOutOfMemory().runTest(this);
-////        new TestPowerOff().runTest(this);
-//        new TestQueryCache().runTest(this);
-////        new TestReadOnly().runTest(this);
-//        new TestRecursiveQueries().runTest(this);
-//        new TestRights().runTest(this);
-
-        // wrong script?
-////        new TestRunscript().runTest(this);
-
-//        new TestSQLInjection().runTest(this);
-//        new TestSessionsLocks().runTest(this);
-//        new TestSelectCountNonNullColumn().runTest(this);
-//        new TestSequence().runTest(this);
-//        new TestSpaceReuse().runTest(this);
-//        new TestSpeed().runTest(this);
-//        new TestTableEngines().runTest(this);
-//        new TestTempTables().runTest(this);
-////        new TestTransaction().runTest(this);
-////        new TestTriggersConstraints().runTest(this);
-////        new TestTwoPhaseCommit().runTest(this);
-//        new TestView().runTest(this);
-//        new TestViewAlterTable().runTest(this);
-//        new TestViewDropView().runTest(this);
-//
-//        // jaqu
-//        new AliasMapTest().runTest(this);
-//        new AnnotationsTest().runTest(this);
-//        new ClobTest().runTest(this);
-//        new ModelsTest().runTest(this);
-//        new SamplesTest().runTest(this);
-//        new UpdateTest().runTest(this);
-//
-//        // jdbc
-//        new TestBatchUpdates().runTest(this);
-//        new TestCallableStatement().runTest(this);
-//        new TestCancel().runTest(this);
-//        new TestDatabaseEventListener().runTest(this);
-//        new TestDriver().runTest(this);
-//        new TestJavaObject().runTest(this);
-//        new TestLimitUpdates().runTest(this);
-//        new TestLobApi().runTest(this);
-//        new TestManyJdbcObjects().runTest(this);
-//        new TestMetaData().runTest(this);
-//        new TestNativeSQL().runTest(this);
-//        new TestPreparedStatement().runTest(this);
-//        new TestResultSet().runTest(this);
-//        new TestStatement().runTest(this);
-//        new TestTransactionIsolation().runTest(this);
-//        new TestUpdatableResultSet().runTest(this);
-//        new TestZloty().runTest(this);
-//
-//        // jdbcx
-//        new TestConnectionPool().runTest(this);
-//        new TestDataSource().runTest(this);
-//        new TestXA().runTest(this);
-////        new TestXASimple().runTest(this);
-//
-//        // server
-//        new TestAutoServer().runTest(this);
-//        new TestNestedLoop().runTest(this);
-//        new TestWeb().runTest(this);
-//
-//        // mvcc & row level locking
-//        new TestMvcc1().runTest(this);
-//        new TestMvcc2().runTest(this);
-//        new TestMvcc3().runTest(this);
-////        new TestMvccMultiThreaded().runTest(this);
-////        new TestRowLocks().runTest(this);
-//
-//        // synth
-//        new TestBtreeIndex().runTest(this);
-//        new TestDiskFull().runTest(this);
-////        new TestCrashAPI().runTest(this);
+        new TestAlter().runTest(this);
+        new TestAlterSchemaRename().runTest(this);
+        new TestAutoRecompile().runTest(this);
+        new TestBitField().runTest(this);
+        new TestBackup().runTest(this);
+        new TestBigDb().runTest(this);
+        new TestBigResult().runTest(this);
+        new TestCases().runTest(this);
+        new TestCheckpoint().runTest(this);
+        new TestCluster().runTest(this);
+        new TestCompatibility().runTest(this);
+        new TestCsv().runTest(this);
+        new TestDateStorage().runTest(this);
+        new TestDeadlock().runTest(this);
+        new TestEncryptedDb().runTest(this);
+        new TestExclusive().runTest(this);
+        new TestFullText().runTest(this);
+        new TestFunctionOverload().runTest(this);
+        new TestFunctions().runTest(this);
+        new TestInit().runTest(this);
+        new TestIndex().runTest(this);
+        new TestLargeBlob().runTest(this);
+        new TestLinkedTable().runTest(this);
+        new TestListener().runTest(this);
+        new TestLob().runTest(this);
+        new TestMemoryUsage().runTest(this);
+        new TestMultiConn().runTest(this);
+        new TestMultiDimension().runTest(this);
+        new TestMultiThread().runTest(this);
+        new TestMultiThreadedKernel().runTest(this);
+        new TestOpenClose().runTest(this);
+        new TestOptimizations().runTest(this);
+        new TestOutOfMemory().runTest(this);
+        new TestPowerOff().runTest(this);
+        new TestQueryCache().runTest(this);
+        new TestReadOnly().runTest(this);
+        new TestRecursiveQueries().runTest(this);
+        new TestRights().runTest(this);
+        new TestRunscript().runTest(this);
+        new TestSQLInjection().runTest(this);
+        new TestSessionsLocks().runTest(this);
+        new TestSelectCountNonNullColumn().runTest(this);
+        new TestSequence().runTest(this);
+        new TestSpaceReuse().runTest(this);
+        new TestSpeed().runTest(this);
+        new TestTableEngines().runTest(this);
+        new TestTempTables().runTest(this);
+        new TestTransaction().runTest(this);
+        new TestTriggersConstraints().runTest(this);
+        new TestTwoPhaseCommit().runTest(this);
+        new TestView().runTest(this);
+        new TestViewAlterTable().runTest(this);
+        new TestViewDropView().runTest(this);
+
+        // jaqu
+        new AliasMapTest().runTest(this);
+        new AnnotationsTest().runTest(this);
+        new ClobTest().runTest(this);
+        new ModelsTest().runTest(this);
+        new SamplesTest().runTest(this);
+        new UpdateTest().runTest(this);
+
+        // jdbc
+        new TestBatchUpdates().runTest(this);
+        new TestCallableStatement().runTest(this);
+        new TestCancel().runTest(this);
+        new TestDatabaseEventListener().runTest(this);
+        new TestDriver().runTest(this);
+        new TestJavaObject().runTest(this);
+        new TestLimitUpdates().runTest(this);
+        new TestLobApi().runTest(this);
+        new TestManyJdbcObjects().runTest(this);
+        new TestMetaData().runTest(this);
+        new TestNativeSQL().runTest(this);
+        new TestPreparedStatement().runTest(this);
+        new TestResultSet().runTest(this);
+        new TestStatement().runTest(this);
+        new TestTransactionIsolation().runTest(this);
+        new TestUpdatableResultSet().runTest(this);
+        new TestZloty().runTest(this);
+
+        // jdbcx
+        new TestConnectionPool().runTest(this);
+        new TestDataSource().runTest(this);
+        new TestXA().runTest(this);
+        new TestXASimple().runTest(this);
+
+        // server
+        new TestAutoServer().runTest(this);
+        new TestNestedLoop().runTest(this);
+        new TestWeb().runTest(this);
+
+        // mvcc & row level locking
+        new TestMvcc1().runTest(this);
+        new TestMvcc2().runTest(this);
+        new TestMvcc3().runTest(this);
+        new TestMvccMultiThreaded().runTest(this);
+        new TestRowLocks().runTest(this);
+
+        // synth
+        new TestBtreeIndex().runTest(this);
+        new TestDiskFull().runTest(this);
+        new TestCrashAPI().runTest(this);
         new TestFuzzOptimizations().runTest(this);
         new TestLimit().runTest(this);
         new TestRandomSQL().runTest(this);

h2/src/test/org/h2/test/db/TestTransaction.java

@@ -36,6 +36,7 @@ public class TestTransaction extends TestBase {
 
     @Override
     public void test() throws SQLException {
+        testContraintCreationRollback();
         testCommitOnAutoCommitChange();
         testConcurrentSelectForUpdate();
         testLogMode();
@@ -49,6 +50,24 @@ public class TestTransaction extends TestBase {
         deleteDb("transaction");
     }
     
+    private void testContraintCreationRollback() throws SQLException {
+        deleteDb("transaction");
+        Connection conn = getConnection("transaction");
+        Statement stat = conn.createStatement();
+        stat.execute("create table test(id int, p int)");
+        stat.execute("insert into test values(1, 2)");
+        try {
+            stat.execute("alter table test add constraint fail " +
+                    "foreign key(p) references test(id)");
+            fail();
+        } catch (SQLException e) {
+            // expected
+        }
+        stat.execute("insert into test values(1, 2)");
+        stat.execute("drop table test");
+        conn.close();
+    }
+
     private void testCommitOnAutoCommitChange() throws SQLException {
         deleteDb("transaction");
         Connection conn = getConnection("transaction");

h2/src/test/org/h2/test/store/TestMVTableEngine.java

@@ -128,8 +128,7 @@ int test;
         } catch (SQLException e) {
             // expected
         }
-        int todo;
-        // stat.execute("update child set pid=1");
+        stat.execute("update child set pid=1");
         stat.execute("drop table child, parent");
 
         stat.execute("create table parent(id int)");