switched back to using cascade

uwescience · Jun 10, 2015 · 04e6cfb · 04e6cfb · senderista · Jun 11, 2015
1 parent 58e5ab9
commit 04e6cfb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/edu/washington/escience/myria/accessmethod/JdbcAccessMethod.java b/src/edu/washington/escience/myria/accessmethod/JdbcAccessMethod.java
@@ -428,7 +428,9 @@ public void dropAndRenameTables(final RelationKey oldRelation, final RelationKey
   public void dropTableIfExistsCascade(final RelationKey relationKey) throws DbException {
     switch (jdbcInfo.getDbms()) {
       case MyriaConstants.STORAGE_SYSTEM_MYSQL:
-        throw new UnsupportedOperationException("MySQL does not support DROP IF EXISTS...CASCADE operations");
+        LOGGER.warn("MySQL does not implement DROP TABLE...CASCADE, attempting DROP TABLE instead");
+        execute("DROP TABLE IF EXISTS " + quote(relationKey));
+        break;
       case MyriaConstants.STORAGE_SYSTEM_POSTGRESQL:
         execute("DROP TABLE IF EXISTS " + quote(relationKey) + " CASCADE");
         break;

diff --git a/src/edu/washington/escience/myria/accessmethod/SQLiteAccessMethod.java b/src/edu/washington/escience/myria/accessmethod/SQLiteAccessMethod.java
@@ -402,7 +402,8 @@ public void dropTableIfExists(final RelationKey relationKey) throws DbException
 
   @Override
   public void dropTableIfExistsCascade(final RelationKey relationKey) throws DbException {
-    throw new UnsupportedOperationException("SQLite does not support DROP IF EXISTS...CASCADE operations");
+    LOGGER.warn("SQLite does not implement DROP TABLE...CASCADE, attempting DROP TABLE instead");
+    execute("DROP TABLE IF EXISTS " + relationKey.toString(MyriaConstants.STORAGE_SYSTEM_SQLITE));
   }
 
   @Override

diff --git a/src/edu/washington/escience/myria/operator/DbDelete.java b/src/edu/washington/escience/myria/operator/DbDelete.java
@@ -45,7 +45,7 @@ protected void init(final ImmutableMap<String, Object> execEnvVars) throws DbExc
     accessMethod = AccessMethod.of(connectionInfo.getDbms(), connectionInfo, false);
 
     /* Drop the table */
-    accessMethod.dropTableIfExists(relationKey);
+    accessMethod.dropTableIfExistsCascade(relationKey);
   }
 
   @Override