Skip to content

Commit 6d1c749

Browse files
committed
fix spark tests
1 parent e2aad13 commit 6d1c749

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

duckdb/experimental/spark/sql/type_utils.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
IntegerType,
2020
LongType,
2121
MapType,
22+
NullType,
2223
ShortType,
2324
StringType,
2425
StructField,
@@ -42,6 +43,7 @@
4243
)
4344

4445
_sqltype_to_spark_class = {
46+
"null": NullType,
4547
"boolean": BooleanType,
4648
"utinyint": UnsignedByteType,
4749
"tinyint": ByteType,

tests/fast/test_case_alias.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,22 @@ def test_case_alias(self, duckdb_cursor):
1515
assert r1["CoL2"][0] == 1.05
1616
assert r1["CoL2"][1] == 17
1717

18+
# An explicit column reference takes its output name from the casing as written in the query (COL2),
19+
# unlike `select *` above which preserves the source column's casing (CoL2).
1820
r2 = con.from_df(df).query("df", "select COL1, COL2 from df").df()
1921
assert r2["COL1"][0] == "val1"
2022
assert r2["COL1"][1] == "val3"
21-
assert r2["CoL2"][0] == 1.05
22-
assert r2["CoL2"][1] == 17
23+
assert r2["COL2"][0] == 1.05
24+
assert r2["COL2"][1] == 17
2325

2426
r3 = con.from_df(df).query("df", "select COL1, COL2 from df ORDER BY COL1").df()
2527
assert r3["COL1"][0] == "val1"
2628
assert r3["COL1"][1] == "val3"
27-
assert r3["CoL2"][0] == 1.05
28-
assert r3["CoL2"][1] == 17
29+
assert r3["COL2"][0] == 1.05
30+
assert r3["COL2"][1] == 17
2931

3032
r4 = con.from_df(df).query("df", "select COL1, COL2 from df GROUP BY COL1, COL2 ORDER BY COL1").df()
3133
assert r4["COL1"][0] == "val1"
3234
assert r4["COL1"][1] == "val3"
33-
assert r4["CoL2"][0] == 1.05
34-
assert r4["CoL2"][1] == 17
35+
assert r4["COL2"][0] == 1.05
36+
assert r4["COL2"][1] == 17

0 commit comments

Comments
 (0)