more tests

Author: yaooqinn

sql/core/src/test/scala/org/apache/spark/sql/SQLContextSuite.scala

@@ -88,11 +88,11 @@ class SQLContextSuite extends SparkFunSuite with SharedSparkContext {
     df.createOrReplaceTempView("listtablessuitetable")
     assert(
       sqlContext.tables().filter("tableName = 'listtablessuitetable'").collect().toSeq ==
-      Row("", "listtablessuitetable", true) :: Nil)
+      Row("", "listtablessuitetable", true, "VIEW") :: Nil)
 
     assert(
       sqlContext.sql("SHOW tables").filter("tableName = 'listtablessuitetable'").collect().toSeq ==
-      Row("", "listtablessuitetable", true) :: Nil)
+      Row("", "listtablessuitetable", true, "VIEW") :: Nil)
 
     sqlContext.sessionState.catalog.dropTable(
       TableIdentifier("listtablessuitetable"), ignoreIfNotExists = true, purge = false)
@@ -105,11 +105,11 @@ class SQLContextSuite extends SparkFunSuite with SharedSparkContext {
     df.createOrReplaceTempView("listtablessuitetable")
     assert(
       sqlContext.tables("default").filter("tableName = 'listtablessuitetable'").collect().toSeq ==
-      Row("", "listtablessuitetable", true) :: Nil)
+      Row("", "listtablessuitetable", true, "VIEW") :: Nil)
 
     assert(
       sqlContext.sql("show TABLES in default").filter("tableName = 'listtablessuitetable'")
-        .collect().toSeq == Row("", "listtablessuitetable", true) :: Nil)
+        .collect().toSeq == Row("", "listtablessuitetable", true, "VIEW") :: Nil)
 
     sqlContext.sessionState.catalog.dropTable(
       TableIdentifier("listtablessuitetable"), ignoreIfNotExists = true, purge = false)
@@ -124,7 +124,8 @@ class SQLContextSuite extends SparkFunSuite with SharedSparkContext {
     val expectedSchema = StructType(
       StructField("namespace", StringType, false) ::
         StructField("tableName", StringType, false) ::
-        StructField("isTemporary", BooleanType, false) :: Nil)
+        StructField("isTemporary", BooleanType, false) ::
+        StructField("tableType", StringType, false) :: Nil)
 
     Seq(sqlContext.tables(), sqlContext.sql("SHOW TABLes")).foreach {
       case tableDF =>

sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2SQLSuite.scala

@@ -1879,7 +1879,8 @@ class DataSourceV2SQLSuite
   test("rename table by ALTER VIEW") {
     withTable("testcat.ns1.new") {
       sql("CREATE TABLE testcat.ns1.ns2.old USING foo AS SELECT id, data FROM source")
-      checkAnswer(sql("SHOW TABLES FROM testcat.ns1.ns2"), Seq(Row("ns1.ns2", "old", false)))
+      checkAnswer(sql("SHOW TABLES FROM testcat.ns1.ns2"),
+        Seq(Row("ns1.ns2", "old", false, "TABLE")))
 
       val e = intercept[AnalysisException] {
         sql("ALTER VIEW testcat.ns1.ns2.old RENAME TO ns1.new")
@@ -2602,7 +2603,7 @@ class DataSourceV2SQLSuite
       sql(s"ALTER TABLE $tbl RENAME TO new_tbl")
       checkAnswer(
         sql(s"SHOW TABLES FROM testcat.ns1.ns2 LIKE 'new_tbl'"),
-        Row("ns1.ns2", "new_tbl", false))
+        Row("ns1.ns2", "new_tbl", false, "TABLE"))
       checkAnswer(sql(s"SELECT c0 FROM ${catalogAndNamespace}new_tbl"), Row(0))
     }
   }

sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/v2/jdbc/JDBCTableCatalogSuite.scala

@@ -68,7 +68,7 @@ class JDBCTableCatalogSuite extends QueryTest with SharedSparkSession {
   }
 
   test("show tables") {
-    checkAnswer(sql("SHOW TABLES IN h2.test"), Seq(Row("test", "people", false)))
+    checkAnswer(sql("SHOW TABLES IN h2.test"), Seq(Row("test", "people", false, "TABLE")))
     // Check not existing namespace
     checkAnswer(sql("SHOW TABLES IN h2.bad_test"), Seq())
   }
@@ -78,9 +78,9 @@ class JDBCTableCatalogSuite extends QueryTest with SharedSparkSession {
       conn.prepareStatement("""CREATE TABLE "test"."to_drop" (id INTEGER)""").executeUpdate()
     }
     checkAnswer(sql("SHOW TABLES IN h2.test"),
-      Seq(Row("test", "to_drop", false), Row("test", "people", false)))
+      Seq(Row("test", "to_drop", false, "TABLE"), Row("test", "people", false, "TABLE")))
     sql("DROP TABLE h2.test.to_drop")
-    checkAnswer(sql("SHOW TABLES IN h2.test"), Seq(Row("test", "people", false)))
+    checkAnswer(sql("SHOW TABLES IN h2.test"), Seq(Row("test", "people", false, "TABLE")))
     Seq(
       "h2.test.not_existing_table" ->
         "Table or view not found: h2.test.not_existing_table",
@@ -101,11 +101,11 @@ class JDBCTableCatalogSuite extends QueryTest with SharedSparkSession {
       }
       checkAnswer(
         sql("SHOW TABLES IN h2.test"),
-        Seq(Row("test", "src_table", false), Row("test", "people", false)))
+        Seq(Row("test", "src_table", false, "TABLE"), Row("test", "people", false, "TABLE")))
       sql("ALTER TABLE h2.test.src_table RENAME TO test.dst_table")
       checkAnswer(
         sql("SHOW TABLES IN h2.test"),
-        Seq(Row("test", "dst_table", false), Row("test", "people", false)))
+        Seq(Row("test", "dst_table", false, "TABLE"), Row("test", "people", false, "TABLE")))
     }
     // Rename not existing table or namespace
     val exp1 = intercept[AnalysisException] {
@@ -156,7 +156,7 @@ class JDBCTableCatalogSuite extends QueryTest with SharedSparkSession {
       sql("CREATE TABLE h2.test.new_table(i INT, j STRING)")
       checkAnswer(
         sql("SHOW TABLES IN h2.test"),
-        Seq(Row("test", "people", false), Row("test", "new_table", false)))
+        Seq(Row("test", "people", false, "TABLE"), Row("test", "new_table", false, "TABLE")))
     }
     withTable("h2.test.new_table") {
       sql("CREATE TABLE h2.test.new_table(i INT, j STRING)")

sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCV2Suite.scala

@@ -145,7 +145,7 @@ class JDBCV2Suite extends QueryTest with SharedSparkSession {
 
   test("show tables") {
     checkAnswer(sql("SHOW TABLES IN h2.test"),
-      Seq(Row("test", "people", false), Row("test", "empty_table", false)))
+      Seq(Row("test", "people", false, "TABLE"), Row("test", "empty_table", false, "TABLE")))
   }
 
   test("SQL API: create table as select") {