DRILL-2423: Show proper message when trying to drop an unknown view.

2 files changed, 40 insertions, 1 deletions

diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestBaseViewSupport.java b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestBaseViewSupport.java
index bfe113bb3..a8f5bbb2f 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestBaseViewSupport.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestBaseViewSupport.java
@@ -100,7 +100,7 @@ public class TestBaseViewSupport extends BaseTestQuery {
         .sqlQuery(String.format("DROP VIEW %s", viewFullName))
         .unOrdered()
         .baselineColumns("ok", "summary")
-        .baselineValues(true, String.format("View '%s' deleted successfully from '%s' schema", viewName, finalSchema))
+        .baselineValues(true, String.format("View [%s] deleted successfully from schema [%s].", viewName, finalSchema))
         .go();
   }
 
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestViewSupport.java b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestViewSupport.java
index 5c2dc9070..0fc1f32ba 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestViewSupport.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestViewSupport.java
@@ -590,4 +590,43 @@ public class TestViewSupport extends TestBaseViewSupport {
         .baselineValues(false, errorMsg)
         .go();
   }
+
+  @Test // DRILL-2423
+  public void showProperMsgWhenDroppingNonExistentView() throws Exception{
+    testBuilder()
+        .sqlQuery("DROP VIEW dfs_test.tmp.nonExistentView")
+        .unOrdered()
+        .baselineColumns("ok", "summary")
+        .baselineValues(false, "Unknown view [nonExistentView] in schema [dfs_test.tmp].")
+        .go();
+  }
+
+  @Test // DRILL-2423
+  public void showProperMsgWhenTryingToDropAViewInImmutableSchema() throws Exception{
+    testBuilder()
+        .sqlQuery("DROP VIEW cp.nonExistentView")
+        .unOrdered()
+        .baselineColumns("ok", "summary")
+        .baselineValues(false, "Schema [cp.default] is immutable.")
+        .go();
+  }
+
+  @Test // DRILL-2423
+  public void showProperMsgWhenTryingToDropANonViewTable() throws Exception{
+    final String testTableName = "testTableShowErrorMsg";
+    try {
+      test(String.format("CREATE TABLE %s.%s AS SELECT c_custkey, c_nationkey from cp.`tpch/customer.parquet`",
+          TEMP_SCHEMA, testTableName));
+
+      testBuilder()
+          .sqlQuery(String.format("DROP VIEW %s.%s", TEMP_SCHEMA, testTableName))
+          .unOrdered()
+          .baselineColumns("ok", "summary")
+          .baselineValues(false, "[testTableShowErrorMsg] is not a VIEW in schema [dfs_test.tmp]")
+          .go();
+    } finally {
+      File tblPath = new File(getDfsTestTmpSchemaLocation(), testTableName);
+      FileUtils.deleteQuietly(tblPath);
+    }
+  }
 }