Merge branch 'main' into postgres-native-scan

duckdb · Jan 8, 2025 · 7b0685b · 7b0685b
2 parents 48acfba + dadb234
commit 7b0685b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/src/pgduckdb_types.cpp b/src/pgduckdb_types.cpp
@@ -1268,7 +1268,7 @@ ConvertPostgresToDuckValue(Oid attr_type, Datum value, duckdb::Vector &result, i
 		size_t bytea_length = VARSIZE_ANY_EXHDR(value);
 		const duckdb::string_t s(bytea_data, bytea_length);
 		auto data = duckdb::FlatVector::GetData<duckdb::string_t>(result);
-		data[offset] = duckdb::StringVector::AddString(result, s);
+		data[offset] = duckdb::StringVector::AddStringOrBlob(result, s);
 		break;
 	}
 	case duckdb::LogicalTypeId::LIST: {

diff --git a/test/regression/expected/temporary_tables.out b/test/regression/expected/temporary_tables.out
@@ -226,13 +226,22 @@ SELECT * FROM t;
 (1 row)
 
 -- CTAS from DuckDB table to postgres table
-CREATE TEMP TABLE t_heap2(c) USING heap AS SELECT * FROM t_heap;
+CREATE TEMP TABLE t_heap2(c) USING heap AS SELECT * FROM t;
 SELECT * FROM t_heap2;
  c 
 ---
  1
 (1 row)
 
+-- CTAS from postgres table to postgres table (not actually handled by
+-- pg_duckdb, but should still work)
+CREATE TEMP TABLE t_heap3(c) USING heap AS SELECT * FROM t_heap;
+SELECT * FROM t_heap3;
+ c 
+---
+ 1
+(1 row)
+
 SELECT duckdb.raw_query($$ SELECT database_name, schema_name, sql FROM duckdb_tables() $$);
 NOTICE:  result: database_name	schema_name	sql	
 VARCHAR	VARCHAR	VARCHAR	
@@ -472,4 +481,4 @@ SELECT * FROM ta;
  3 | 3
 (6 rows)
 
-DROP TABLE webpages, t, t_heap, t_heap2, ta, tb, tc, td;
+DROP TABLE webpages, t, t_heap, t_heap2, t_heap3, ta, tb, tc, td;
diff --git a/test/regression/sql/temporary_tables.sql b/test/regression/sql/temporary_tables.sql
@@ -159,9 +159,14 @@ CREATE TEMP TABLE t(b) USING duckdb AS SELECT * FROM t_heap;
 SELECT * FROM t;
 
 -- CTAS from DuckDB table to postgres table
-CREATE TEMP TABLE t_heap2(c) USING heap AS SELECT * FROM t_heap;
+CREATE TEMP TABLE t_heap2(c) USING heap AS SELECT * FROM t;
 SELECT * FROM t_heap2;
 
+-- CTAS from postgres table to postgres table (not actually handled by
+-- pg_duckdb, but should still work)
+CREATE TEMP TABLE t_heap3(c) USING heap AS SELECT * FROM t_heap;
+SELECT * FROM t_heap3;
+
 SELECT duckdb.raw_query($$ SELECT database_name, schema_name, sql FROM duckdb_tables() $$);
 
 -- multi-VALUES
@@ -250,4 +255,4 @@ INSERT INTO ta (a) SELECT * FROM generate_series(1, 3); -- OK
 INSERT INTO ta (b) SELECT * FROM generate_series(1, 3); -- OK
 SELECT * FROM ta;
 
-DROP TABLE webpages, t, t_heap, t_heap2, ta, tb, tc, td;
+DROP TABLE webpages, t, t_heap, t_heap2, t_heap3, ta, tb, tc, td;