Handle Spark 3

Author: dongjoon-hyun

Tests/SparkConnectTests/MergeIntoWriterTests.swift

@@ -31,11 +31,20 @@ struct MergeIntoWriterTests {
     let tableName = "TABLE_" + UUID().uuidString.replacingOccurrences(of: "-", with: "")
     try await SQLHelper.withTable(spark, tableName)({
       let mergeInto = try await spark.range(1).mergeInto(tableName, "true")
-      try await #require(throws: SparkConnectError.TableOrViewNotFound) {
-        try await mergeInto.whenMatched().delete().merge()
-      }
-      try await #require(throws: SparkConnectError.TableOrViewNotFound) {
-        try await mergeInto.whenMatched("true").delete().merge()
+      if await spark.version >= "4.0.0" {
+        try await #require(throws: SparkConnectError.TableOrViewNotFound) {
+          try await mergeInto.whenMatched().delete().merge()
+        }
+        try await #require(throws: SparkConnectError.TableOrViewNotFound) {
+          try await mergeInto.whenMatched("true").delete().merge()
+        }
+      } else {
+        try await #require(throws: Error.self) {
+          try await mergeInto.whenMatched().delete().merge()
+        }
+        try await #require(throws: Error.self) {
+          try await mergeInto.whenMatched("true").delete().merge()
+        }
       }
     })
     await spark.stop()
@@ -47,11 +56,20 @@ struct MergeIntoWriterTests {
     let tableName = "TABLE_" + UUID().uuidString.replacingOccurrences(of: "-", with: "")
     try await SQLHelper.withTable(spark, tableName)({
       let mergeInto = try await spark.range(1).mergeInto(tableName, "true")
-      try await #require(throws: SparkConnectError.TableOrViewNotFound) {
-        try await mergeInto.whenNotMatched().insertAll().merge()
-      }
-      try await #require(throws: SparkConnectError.TableOrViewNotFound) {
-        try await mergeInto.whenNotMatched("true").insertAll().merge()
+      if await spark.version >= "4.0.0" {
+        try await #require(throws: SparkConnectError.TableOrViewNotFound) {
+          try await mergeInto.whenNotMatched().insertAll().merge()
+        }
+        try await #require(throws: SparkConnectError.TableOrViewNotFound) {
+          try await mergeInto.whenNotMatched("true").insertAll().merge()
+        }
+      } else {
+        try await #require(throws: Error.self) {
+          try await mergeInto.whenNotMatched().insertAll().merge()
+        }
+        try await #require(throws: Error.self) {
+          try await mergeInto.whenNotMatched("true").insertAll().merge()
+        }
       }
     })
     await spark.stop()
@@ -63,11 +81,20 @@ struct MergeIntoWriterTests {
     let tableName = "TABLE_" + UUID().uuidString.replacingOccurrences(of: "-", with: "")
     try await SQLHelper.withTable(spark, tableName)({
       let mergeInto = try await spark.range(1).mergeInto(tableName, "true")
-      try await #require(throws: SparkConnectError.TableOrViewNotFound) {
-        try await mergeInto.whenNotMatchedBySource().delete().merge()
-      }
-      try await #require(throws: SparkConnectError.TableOrViewNotFound) {
-        try await mergeInto.whenNotMatchedBySource("true").delete().merge()
+      if await spark.version >= "4.0.0" {
+        try await #require(throws: SparkConnectError.TableOrViewNotFound) {
+          try await mergeInto.whenNotMatchedBySource().delete().merge()
+        }
+        try await #require(throws: SparkConnectError.TableOrViewNotFound) {
+          try await mergeInto.whenNotMatchedBySource("true").delete().merge()
+        }
+      } else {
+        try await #require(throws: Error.self) {
+          try await mergeInto.whenNotMatchedBySource().delete().merge()
+        }
+        try await #require(throws: Error.self) {
+          try await mergeInto.whenNotMatchedBySource("true").delete().merge()
+        }
       }
     })
     await spark.stop()