Merge branch 'main' into propagate_execution_error

duckdb · May 29, 2024 · 59c5b92 · 59c5b92
2 parents 27213a1 + 495e3d9
commit 59c5b92
Show file tree

Hide file tree

Showing 9 changed files with 1,126 additions and 24 deletions.
diff --git a/Makefile b/Makefile
@@ -68,7 +68,15 @@ third_party/duckdb/Makefile:
 	git submodule update --init --recursive
 
 third_party/duckdb/build/$(QUACK_BUILD_DUCKDB)/src/$(DUCKDB_LIB):
-	$(MAKE) -C third_party/duckdb $(QUACK_BUILD_DUCKDB) DISABLE_SANITIZER=1 ENABLE_UBSAN=0 BUILD_UNITTESTS=OFF BUILD_HTTPFS=1 CMAKE_EXPORT_COMPILE_COMMANDS=1 -j8
+	$(MAKE) -C third_party/duckdb \
+	$(QUACK_BUILD_DUCKDB) \
+	DISABLE_SANITIZER=1 \
+	ENABLE_UBSAN=0 \
+	BUILD_UNITTESTS=OFF \
+	BUILD_HTTPFS=1 \
+	BUILD_JSON=1 \
+	CMAKE_EXPORT_COMPILE_COMMANDS=1 \
+	-j8
 
 install-duckdb:
 	$(install_bin) -m 755 third_party/duckdb/build/$(QUACK_BUILD_DUCKDB)/src/$(DUCKDB_LIB) $(DESTDIR)$(PG_LIB)

diff --git a/include/quack/quack_types.hpp b/include/quack/quack_types.hpp
@@ -15,8 +15,8 @@ namespace quack {
 constexpr int32_t QUACK_DUCK_DATE_OFFSET = 10957;
 constexpr int64_t QUACK_DUCK_TIMESTAMP_OFFSET = INT64CONST(10957) * USECS_PER_DAY;
 
-duckdb::LogicalType ConvertPostgresToDuckColumnType(Oid type);
-Oid GetPostgresDuckDBType(duckdb::LogicalTypeId type);
+duckdb::LogicalType ConvertPostgresToDuckColumnType(Oid type, int32_t typmod);
+Oid GetPostgresDuckDBType(duckdb::LogicalType type);
 void ConvertPostgresToDuckValue(Datum value, duckdb::Vector &result, idx_t offset);
 void ConvertDuckToPostgresValue(TupleTableSlot *slot, duckdb::Value &value, idx_t col);
 void InsertTupleIntoChunk(duckdb::DataChunk &output, PostgresHeapSeqScanThreadInfo &threadScanInfo,