resolve conflicts and modify testcases

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalogSuite.scala

@@ -26,7 +26,7 @@ import org.apache.spark.sql.catalyst.expressions._
 import org.apache.spark.sql.catalyst.parser.CatalystSqlParser
 import org.apache.spark.sql.catalyst.plans.PlanTest
 import org.apache.spark.sql.catalyst.plans.logical.{Range, SubqueryAlias, View}
-import org.apache.spark.sql.types.IntegerType
+import org.apache.spark.sql.types.{IntegerType, StructField, StructType}
 
 class InMemorySessionCatalogSuite extends SessionCatalogSuite {
   protected val utils = new CatalogTestUtils {
@@ -452,14 +452,23 @@ abstract class SessionCatalogSuite extends PlanTest {
   }
 
   test("alter table add columns") {
-    val externalCatalog = newBasicCatalog()
-    val sessionCatalog = new SessionCatalog(externalCatalog)
-    sessionCatalog.createTable(newTable("t1", "default"), ignoreIfExists = false)
-    val oldTab = externalCatalog.getTable("default", "t1")
-    sessionCatalog.alterTableSchema(TableIdentifier("t1", Some("default")),
-      oldTab.schema.add("c3", IntegerType))
-    val newTab = externalCatalog.getTable("default", "t1")
-    assert(newTab.schema.equals(oldTab.schema.add("c3", IntegerType)))
+    withBasicCatalog { sessionCatalog =>
+      sessionCatalog.createTable(newTable("t1", "default"), ignoreIfExists = false)
+      val oldTab = sessionCatalog.externalCatalog.getTable("default", "t1")
+      sessionCatalog.alterTableSchema(TableIdentifier("t1", Some("default")),
+        oldTab.schema.add("c3", IntegerType))
+      val newTab = sessionCatalog.externalCatalog.getTable("default", "t1")
+      if (sessionCatalog.externalCatalog.isInstanceOf[InMemoryCatalog]) {
+        assert(newTab.schema.toString == oldTab.schema.add("c3", IntegerType).toString)
+      } else {
+        // HiveExternalCatalog will always arrange the partition columns to the end
+        val oldTabSchema = StructType(oldTab.schema.take(
+          oldTab.schema.length - oldTab.partitionColumnNames.length) ++
+          Seq(StructField("c3", IntegerType)) ++
+          oldTab.schema.takeRight(oldTab.partitionColumnNames.length))
+        assert(newTab.schema.toString == oldTabSchema.toString)
+      }
+    }
   }
 
   test("get table") {

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

@@ -165,6 +165,28 @@ class InMemoryCatalogedDDLSuite extends DDLSuite with SharedSQLContext with Befo
       assert(e.contains("Hive support is required to CREATE Hive TABLE (AS SELECT)"))
     }
   }
+
+  Seq("true", "false").foreach { caseSensitive =>
+    test(s"alter table add columns with existing column name - caseSensitive $caseSensitive") {
+      withSQLConf(("spark.sql.caseSensitive", caseSensitive)) {
+        withTable("t1") {
+          sql("CREATE TABLE t1 (c1 int) USING PARQUET")
+          if (caseSensitive == "false") {
+            val e = intercept[AnalysisException] {
+              sql("ALTER TABLE t1 ADD COLUMNS (C1 string)")
+            }.getMessage
+            assert(e.contains("Found duplicate column(s)"))
+          } else {
+            // hive catalog will still complains that c1 is duplicate column name because hive
+            // identifiers are case insensitive.
+            sql("ALTER TABLE t1 ADD COLUMNS (C1 string)")
+            assert(sql("SELECT * FROM t1").schema
+              .equals(new StructType().add("c1", IntegerType).add("C1", StringType)))
+          }
+        }
+      }
+    }
+  }
 }
 
 abstract class DDLSuite extends QueryTest with SQLTestUtils {
@@ -2269,26 +2291,6 @@ abstract class DDLSuite extends QueryTest with SQLTestUtils {
     }
   }
 
-  Seq("true", "false").foreach { caseSensitive =>
-    test(s"alter table add columns with existing column name - caseSensitive $caseSensitive") {
-      withSQLConf(("spark.sql.caseSensitive", caseSensitive)) {
-        withTable("t1") {
-          sql("CREATE TABLE t1 (c1 int) USING PARQUET")
-          if (caseSensitive == "false") {
-            val e = intercept[AnalysisException] {
-              sql("ALTER TABLE t1 ADD COLUMNS (C1 string)")
-            }.getMessage
-            assert(e.contains("Found duplicate column(s)"))
-          } else {
-            sql("ALTER TABLE t1 ADD COLUMNS (C1 string)")
-            assert(sql("SELECT * FROM t1").schema
-              .equals(new StructType().add("c1", IntegerType).add("C1", StringType)))
-          }
-        }
-      }
-    }
-  }
-
   test("alter table add columns to table referenced by a view") {
     withTable("t1") {
       withView("v1") {

sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveDDLSuite.scala

@@ -1940,4 +1940,25 @@ class HiveDDLSuite
       assert(e.contains("Found duplicate column(s)"))
     }
   }
+
+  Seq("true", "false").foreach { caseSensitive =>
+    test(s"alter table add columns with existing column name - caseSensitive $caseSensitive") {
+      withSQLConf(("spark.sql.caseSensitive", caseSensitive)) {
+        withTable("t1") {
+          sql("CREATE TABLE t1 (c1 int) USING PARQUET")
+          if (caseSensitive == "false") {
+            val e = intercept[AnalysisException] {
+              sql("ALTER TABLE t1 ADD COLUMNS (C1 string)")
+            }.getMessage
+            assert(e.contains("Found duplicate column(s)"))
+          } else {
+            val e = intercept[AnalysisException] {
+              sql("ALTER TABLE t1 ADD COLUMNS (C1 string)")
+            }.getMessage
+            assert(e.contains("HiveException"))
+          }
+        }
+      }
+    }
+  }
 }