fix incorrectly mapping timestamp types

duckdb · Aug 1, 2024 · 18fd5dc · 18fd5dc
1 parent 8c69cd9
commit 18fd5dc
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/src/delta_utils.cpp b/src/delta_utils.cpp
@@ -27,8 +27,8 @@ unique_ptr<SchemaVisitor::FieldList> SchemaVisitor::VisitSnapshotSchema(ffi::Sha
     visitor.visit_boolean = VisitSimpleType<LogicalType::BOOLEAN>();
     visitor.visit_binary = VisitSimpleType<LogicalType::VARCHAR>();
     visitor.visit_date = VisitSimpleType<LogicalType::DATE>();
-    visitor.visit_timestamp = VisitSimpleType<LogicalType::TIMESTAMP>();
-    visitor.visit_timestamp_ntz = VisitSimpleType<LogicalType::TIMESTAMP_TZ>();
+    visitor.visit_timestamp = VisitSimpleType<LogicalType::TIMESTAMP_TZ>();
+    visitor.visit_timestamp_ntz = VisitSimpleType<LogicalType::TIMESTAMP>();
 
     uintptr_t result = visit_schema(snapshot, &visitor);
     return state.TakeFieldList(result);

diff --git a/test/sql/delta_kernel_rs/timestamp_ntz.test b/test/sql/delta_kernel_rs/timestamp_ntz.test
@@ -0,0 +1,29 @@
+# name: test/sql/delta_kernel_rs/timestamp_ntz.test
+# description: table with timestamp_ntz type (timstamp without timezone)
+# group: [delta_kernel_rs]
+
+require parquet
+
+require delta
+
+require-env DELTA_KERNEL_TESTS_PATH
+
+query III
+DESCRIBE FROM delta_scan('${DELTA_KERNEL_TESTS_PATH}/data-reader-timestamp_ntz') order by id
+----
+id	INTEGER	YES	NULL	NULL	NULL
+tsNtz	TIMESTAMP	YES	NULL	NULL	NULL
+tsNtzPartition	TIMESTAMP	YES	NULL	NULL	NULL
+
+query III
+FROM delta_scan('${DELTA_KERNEL_TESTS_PATH}/data-reader-timestamp_ntz') order by id
+----
+0	2021-11-18 02:30:00.123456	2021-11-18 02:30:00.123456
+1	2013-07-05 17:01:00.123456	2021-11-18 02:30:00.123456
+2	NULL	2021-11-18 02:30:00.123456
+3	2021-11-18 02:30:00.123456	2013-07-05 17:01:00.123456
+4	2013-07-05 17:01:00.123456	2013-07-05 17:01:00.123456
+5	NULL	2013-07-05 17:01:00.123456
+6	2021-11-18 02:30:00.123456	NULL
+7	2013-07-05 17:01:00.123456	NULL
+8	NULL	NULL