[SPARK-29873][SQL] set operations should not escape when regen golden file with --SET --import both specified

Author: yaooqinn

sql/core/src/test/resources/sql-tests/inputs/ansi/literals.sql

@@ -1,2 +1,5 @@
 --- malformed interval literal with ansi mode
+-- SET spark.abc=xyz
 --import literals.sql
+
+SET spark.abc;

sql/core/src/test/resources/sql-tests/inputs/set-cmd.sql

@@ -0,0 +1,3 @@
+set spark.abc;
+set spark.abc=efg;
+set spark.abc;

sql/core/src/test/resources/sql-tests/inputs/set-cmd_import.sql

@@ -0,0 +1,2 @@
+--SET spark.abc=xyz;
+--import set-cmd.sql

sql/core/src/test/resources/sql-tests/results/ansi/literals.sql.out

@@ -1,5 +1,5 @@
 -- Automatically generated by SQLQueryTestSuite
--- Number of queries: 48
+-- Number of queries: 49
 
 
 -- !query 0
@@ -472,3 +472,11 @@ select +integer '7'
 struct<7:int>
 -- !query 47 output
 7
+
+
+-- !query 48
+SET spark.abc
+-- !query 48 schema
+struct<key:string,value:string>
+-- !query 48 output
+spark.abc	<undefined>

sql/core/src/test/resources/sql-tests/results/set-cmd.sql.out

@@ -0,0 +1,26 @@
+-- Automatically generated by SQLQueryTestSuite
+-- Number of queries: 3
+
+
+-- !query 0
+set spark.abc
+-- !query 0 schema
+struct<key:string,value:string>
+-- !query 0 output
+spark.abc	<undefined>
+
+
+-- !query 1
+set spark.abc=efg
+-- !query 1 schema
+struct<key:string,value:string>
+-- !query 1 output
+spark.abc	efg
+
+
+-- !query 2
+set spark.abc
+-- !query 2 schema
+struct<key:string,value:string>
+-- !query 2 output
+spark.abc	efg

sql/core/src/test/resources/sql-tests/results/set-cmd_import.sql.out

@@ -0,0 +1,26 @@
+-- Automatically generated by SQLQueryTestSuite
+-- Number of queries: 3
+
+
+-- !query 0
+set spark.abc
+-- !query 0 schema
+struct<key:string,value:string>
+-- !query 0 output
+spark.abc	xyz;
+
+
+-- !query 1
+set spark.abc=efg
+-- !query 1 schema
+struct<key:string,value:string>
+-- !query 1 output
+spark.abc	efg
+
+
+-- !query 2
+set spark.abc
+-- !query 2 schema
+struct<key:string,value:string>
+-- !query 2 output
+spark.abc	efg

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

@@ -285,7 +285,7 @@ class SQLQueryTestSuite extends QueryTest with SharedSparkSession {
 
     // When we are regenerating the golden files, we don't need to set any config as they
     // all need to return the same result
-    if (regenerateGoldenFiles || !isTestWithConfigSets) {
+    if ((regenerateGoldenFiles && importedTestCaseName.isEmpty) || !isTestWithConfigSets) {
       runQueries(queries, testCase, None)
     } else {
       val configSets = {