added STANDARD_DROP_TABLE_RESTRICT setting

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

@@ -84,12 +84,15 @@ public class DropTable extends SchemaCommand {
                         buff.append(v.getName());
                     }
                 }
-                final List<Constraint> constraints = table.getConstraints();
-                if (constraints != null && constraints.size() > 0) {
-                    for (Constraint c : constraints) {
-                        if (c.getTable() != table) {
-                            buff.appendExceptFirst(", ");
-                            buff.append(c.getName());
+                if (session.getDatabase()
+                        .getSettings().standardDropTableRestrict) {
+                    final List<Constraint> constraints = table.getConstraints();
+                    if (constraints != null && constraints.size() > 0) {
+                        for (Constraint c : constraints) {
+                            if (c.getTable() != table) {
+                                buff.appendExceptFirst(", ");
+                                buff.append(c.getName());
+                            }
                         }
                     }
                 }

h2/src/main/org/h2/engine/DbSettings.java

@@ -350,6 +350,17 @@ public class DbSettings extends SettingsBase {
      */
     public final boolean multiThreaded = get("MULTI_THREADED", false);
 
+    /**
+     * Database setting <code>STANDARD_DROP_TABLE_RESTRICT</code> (default:
+     * false).<br />
+     * <code>true</code> if DROP TABLE RESTRICT should fail if there's any
+     * foreign key referencing the table to be dropped. <code>false</code> if
+     * foreign keys referencing the table to be dropped should be silently
+     * dropped as well.
+     */
+    public final boolean standardDropTableRestrict = get(
+            "STANDARD_DROP_TABLE_RESTRICT", false);
+
     private DbSettings(HashMap<String, String> s) {
         super(s);
     }

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

@@ -11,6 +11,7 @@ import java.util.ArrayList;
 import java.util.Properties;
 import java.util.TimerTask;
 import java.util.concurrent.TimeUnit;
+
 import org.h2.Driver;
 import org.h2.engine.Constants;
 import org.h2.store.fs.FilePathRec;
@@ -431,6 +432,7 @@ java org.h2.test.TestAll timer
     /** If not null the database should be opened with the collation parameter */
     public String collation;
 
+    public boolean stdDropTableRestrict;
 
     /**
      * The AB-BA locking detector.
@@ -618,6 +620,7 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1`
         defrag = false;
         traceLevelFile = throttle = 0;
         cipher = null;
+        stdDropTableRestrict = false;
 
         // memory is a good match for multi-threaded, makes things happen
         // faster, more chance of exposing race conditions
@@ -1127,6 +1130,7 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1`
         appendIf(buff, defrag, "defrag");
         appendIf(buff, splitFileSystem, "split");
         appendIf(buff, collation != null, collation);
+        appendIf(buff, stdDropTableRestrict, "stdDropTableRestrict");
         return buff.toString();
     }
 

h2/src/test/org/h2/test/TestBase.java

@@ -34,6 +34,7 @@ import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.SimpleTimeZone;
 import java.util.concurrent.TimeUnit;
+
 import org.h2.jdbc.JdbcConnection;
 import org.h2.message.DbException;
 import org.h2.store.fs.FilePath;
@@ -333,6 +334,9 @@ public abstract class TestBase {
         if (config.collation != null) {
             url = addOption(url, "COLLATION", config.collation);
         }
+        if (config.stdDropTableRestrict) {
+            url = addOption(url, "STANDARD_DROP_TABLE_RESTRICT", "TRUE");
+        }
         return "jdbc:h2:" + url;
     }
 

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

@@ -279,11 +279,23 @@ public class TestCases extends TestBase {
         conn.close();
     }
 
+    private void testDropTable() throws SQLException {
+        final boolean prevVal = config.stdDropTableRestrict;
+        try {
+            for (final boolean newVal : new boolean[] { true, false }) {
+                config.stdDropTableRestrict = newVal;
+                _testDropTable();
+            }
+        } finally {
+            config.stdDropTableRestrict = prevVal;
+        }
+    }
+
     private static enum DropDependent {
         NONE, VIEW, FOREIGN_KEY;
     }
 
-    private void testDropTable() throws SQLException {
+    private void _testDropTable() throws SQLException {
         trace("testDrop");
 
         for (final boolean restrict : new boolean[] { true, false }) {
@@ -301,7 +313,10 @@ public class TestCases extends TestBase {
                 }
 
                 // drop allowed if no references or cascade
-                final boolean expectedDropSuccess = dropDep == DropDependent.NONE || !restrict;
+                final boolean expectedDropSuccess = dropDep == DropDependent.NONE
+                        || (!config.stdDropTableRestrict
+                                && dropDep == DropDependent.FOREIGN_KEY)
+                        || !restrict;
                 assertThrows(expectedDropSuccess ? 0 : ErrorCode.CANNOT_DROP_2, stat).execute("drop table test " + (restrict ? "restrict" : "cascade"));
                 assertThrows(expectedDropSuccess ? ErrorCode.TABLE_OR_VIEW_NOT_FOUND_1 : 0, stat).execute("select * from test");