fix more

Author: dongjoon-hyun

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

@@ -257,6 +257,7 @@ class DataSourceV2SQLSuite
   }
 
   test("CreateTable: without USING clause") {
+    spark.conf.set(SQLConf.LEGACY_CREATE_HIVE_TABLE_BY_DEFAULT_ENABLED.key, "false")
     // unset this config to use the default v2 session catalog.
     spark.conf.unset(V2_SESSION_CATALOG_IMPLEMENTATION.key)
     val testCatalog = catalog("testcat").asTableCatalog
@@ -613,6 +614,7 @@ class DataSourceV2SQLSuite
   }
 
   test("CreateTableAsSelect: without USING clause") {
+    spark.conf.set(SQLConf.LEGACY_CREATE_HIVE_TABLE_BY_DEFAULT_ENABLED.key, "false")
     // unset this config to use the default v2 session catalog.
     spark.conf.unset(V2_SESSION_CATALOG_IMPLEMENTATION.key)
     val testCatalog = catalog("testcat").asTableCatalog

sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLParserSuite.scala

@@ -77,8 +77,10 @@ class DDLParserSuite extends AnalysisTest with SharedSparkSession {
 
   private def withCreateTableStatement(sql: String)(prediction: CreateTableStatement => Unit)
     : Unit = {
-    val statement = parser.parsePlan(sql).asInstanceOf[CreateTableStatement]
-    prediction(statement)
+    withSQLConf(SQLConf.LEGACY_CREATE_HIVE_TABLE_BY_DEFAULT_ENABLED.key -> "false") {
+      val statement = parser.parsePlan(sql).asInstanceOf[CreateTableStatement]
+      prediction(statement)
+    }
   }
 
   test("alter database - property values must be set") {
@@ -485,18 +487,20 @@ class DDLParserSuite extends AnalysisTest with SharedSparkSession {
   }
 
   test("Test CTAS #3") {
-    val s3 = """CREATE TABLE page_view AS SELECT * FROM src"""
-    val statement = parser.parsePlan(s3).asInstanceOf[CreateTableAsSelectStatement]
-    assert(statement.tableName(0) == "page_view")
-    assert(statement.asSelect == parser.parsePlan("SELECT * FROM src"))
-    assert(statement.partitioning.isEmpty)
-    assert(statement.bucketSpec.isEmpty)
-    assert(statement.properties.isEmpty)
-    assert(statement.provider.isEmpty)
-    assert(statement.options.isEmpty)
-    assert(statement.location.isEmpty)
-    assert(statement.comment.isEmpty)
-    assert(!statement.ifNotExists)
+    withSQLConf(SQLConf.LEGACY_CREATE_HIVE_TABLE_BY_DEFAULT_ENABLED.key -> "false") {
+      val s3 = """CREATE TABLE page_view AS SELECT * FROM src"""
+      val statement = parser.parsePlan(s3).asInstanceOf[CreateTableAsSelectStatement]
+      assert(statement.tableName(0) == "page_view")
+      assert(statement.asSelect == parser.parsePlan("SELECT * FROM src"))
+      assert(statement.partitioning.isEmpty)
+      assert(statement.bucketSpec.isEmpty)
+      assert(statement.properties.isEmpty)
+      assert(statement.provider.isEmpty)
+      assert(statement.options.isEmpty)
+      assert(statement.location.isEmpty)
+      assert(statement.comment.isEmpty)
+      assert(!statement.ifNotExists)
+    }
   }
 
   test("Test CTAS #4") {

sql/core/src/test/scala/org/apache/spark/sql/sources/InsertSuite.scala

@@ -844,18 +844,20 @@ class InsertSuite extends DataSourceTest with SharedSparkSession {
   }
 
   test("SPARK-29174 Support LOCAL in INSERT OVERWRITE DIRECTORY to data source") {
-    withTempPath { dir =>
-      val path = dir.toURI.getPath
-      sql(s"""create table tab1 ( a int) location '$path'""")
-      sql("insert into tab1 values(1)")
-      checkAnswer(sql("select * from tab1"), Seq(1).map(i => Row(i)))
-      sql("create table tab2 ( a int)")
-      sql("insert into tab2 values(2)")
-      checkAnswer(sql("select * from tab2"), Seq(2).map(i => Row(i)))
-      sql(s"""insert overwrite local directory '$path' using parquet select * from tab2""")
-      sql("refresh table tab1")
-      checkAnswer(sql("select * from tab1"), Seq(2).map(i => Row(i)))
+    withSQLConf(SQLConf.LEGACY_CREATE_HIVE_TABLE_BY_DEFAULT_ENABLED.key -> "false") {
+      withTempPath { dir =>
+        val path = dir.toURI.getPath
+        sql(s"""create table tab1 ( a int) location '$path'""")
+        sql("insert into tab1 values(1)")
+        checkAnswer(sql("select * from tab1"), Seq(1).map(i => Row(i)))
+        sql("create table tab2 ( a int)")
+        sql("insert into tab2 values(2)")
+        checkAnswer(sql("select * from tab2"), Seq(2).map(i => Row(i)))
+        sql(s"""insert overwrite local directory '$path' using parquet select * from tab2""")
+        sql("refresh table tab1")
+        checkAnswer(sql("select * from tab1"), Seq(2).map(i => Row(i)))
       }
+    }
   }
 
   test("SPARK-29174 fail LOCAL in INSERT OVERWRITE DIRECT remote path") {