Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
wayneguow committed Jun 14, 2024
1 parent 6f44c66 commit 249999e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions common/utils/src/main/resources/error/error-conditions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4664,12 +4664,6 @@
],
"sqlState" : "42K0E"
},
"UNSUPPORTED_JOIN_TYPE" : {
"message" : [
"Unsupported join type '<typ>'. Supported join types include: <supported>."
],
"sqlState" : "0A000"
},
"UNSUPPORTED_INSERT" : {
"message" : [
"Can't insert into the target."
Expand Down Expand Up @@ -4703,6 +4697,12 @@
},
"sqlState" : "42809"
},
"UNSUPPORTED_JOIN_TYPE" : {
"message" : [
"Unsupported join type '<typ>'. Supported join types include: <supported>."
],
"sqlState" : "0A000"
},
"UNSUPPORTED_MERGE_CONDITION" : {
"message" : [
"MERGE operation contains unsupported <condName> condition."
Expand Down
2 changes: 1 addition & 1 deletion python/pyspark/sql/tests/test_dataframe.py
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ def test_join_without_on(self):
def test_invalid_join_method(self):
df1 = self.spark.createDataFrame([("Alice", 5), ("Bob", 8)], ["name", "age"])
df2 = self.spark.createDataFrame([("Alice", 80), ("Bob", 90)], ["name", "height"])
self.assertRaises(IllegalArgumentException, lambda: df1.join(df2, how="invalid-join-type"))
self.assertRaises(AnalysisException, lambda: df1.join(df2, how="invalid-join-type"))

# Cartesian products require cross join syntax
def test_require_cross(self):
Expand Down

0 comments on commit 249999e

Please sign in to comment.