Fix after rebase master

sql/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/ClientE2ETestSuite.scala

@@ -28,6 +28,7 @@ import scala.jdk.CollectionConverters._
 
 import org.apache.commons.io.FileUtils
 import org.apache.commons.io.output.TeeOutputStream
+import org.apache.commons.lang3.{JavaVersion, SystemUtils}
 import org.scalactic.TolerantNumerics
 import org.scalatest.PrivateMethodTester
 

sql/core/src/main/scala/org/apache/spark/sql/jdbc/MergeByTempTable.scala

@@ -17,11 +17,11 @@
 
 package org.apache.spark.sql.jdbc
 
-import org.apache.spark.sql.types.StructField
-
 import java.sql.Statement
 import java.util.UUID
 
+import org.apache.spark.sql.types.StructField
+
 
 trait MergeByTempTable {
   self: JdbcDialect =>

sql/core/src/main/scala/org/apache/spark/sql/jdbc/OracleDialect.scala

@@ -290,7 +290,7 @@ private case class OracleDialect()
   override def getMergeQuery(
       sourceTableName: String,
       destinationTableName: String,
-      columns: Array[String],
+      columns: Array[StructField],
       keyColumns: Array[String]): String = {
     // Oracle dialect does not like a few bits of the standard SQL MERGE command
     super.getMergeQuery(sourceTableName, destinationTableName, columns, keyColumns)

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

@@ -1369,8 +1369,12 @@ class JDBCSuite extends QueryTest with SharedSparkSession {
   }
 
   test("MergeByTempTable: MERGE table into table") {
-    val columns = Array("id", "ts", "v1", "v2")
-      .map(testMergeByTempTableDialect.quoteIdentifier)
+    val columns = Array(
+      StructField("id", LongType),
+      StructField("ts", TimestampType),
+      StructField("v1", StringType),
+      StructField("v2", IntegerType)
+    )
     val keyColumns = Array("id", "ts")
     val sql = testMergeByTempTableDialect.getMergeQuery(
       "source", "destination", columns, keyColumns)