Merge pull request #252 from duckdb/upgradefixes

Fixes for new DuckDB version
duckdb · Sep 3, 2024 · b6dda6c · b6dda6c
2 parents d0e0115 + f292226
commit b6dda6c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 3 deletions.
diff --git a/duckdb b/duckdb
diff --git a/src/postgres_query.cpp b/src/postgres_query.cpp
@@ -92,5 +92,6 @@ PostgresQueryFunction::PostgresQueryFunction()
 	init_local = scan_function.init_local;
 	function = scan_function.function;
 	projection_pushdown = true;
+	global_initialization = TableFunctionInitialization::INITIALIZE_ON_SCHEDULE;
 }
 } // namespace duckdb
diff --git a/src/postgres_scanner.cpp b/src/postgres_scanner.cpp
@@ -502,7 +502,6 @@ double PostgresScanProgress(ClientContext &context, const FunctionData *bind_dat
 
 	lock_guard<mutex> parallel_lock(gstate.lock);
 	double progress = 100 * double(gstate.page_idx) / double(bind_data.pages_approx);
-	;
 	return MinValue<double>(100, progress);
 }
 
@@ -525,6 +524,7 @@ PostgresScanFunction::PostgresScanFunction()
 	cardinality = PostgresScanCardinality;
 	table_scan_progress = PostgresScanProgress;
 	projection_pushdown = true;
+	global_initialization = TableFunctionInitialization::INITIALIZE_ON_SCHEDULE;
 }
 
 PostgresScanFunctionFilterPushdown::PostgresScanFunctionFilterPushdown()
@@ -538,6 +538,7 @@ PostgresScanFunctionFilterPushdown::PostgresScanFunctionFilterPushdown()
 	table_scan_progress = PostgresScanProgress;
 	projection_pushdown = true;
 	filter_pushdown = true;
+	global_initialization = TableFunctionInitialization::INITIALIZE_ON_SCHEDULE;
 }
 
 } // namespace duckdb
diff --git a/test/sql/scanner/aws-rds.test b/test/sql/scanner/aws-rds.test
@@ -2,6 +2,8 @@
 # description: Read over AWS RDS
 # group: [scanner]
 
+mode skip
+
 require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE

diff --git a/test/sql/storage/attach_temporary_table.test b/test/sql/storage/attach_temporary_table.test
@@ -2,6 +2,8 @@
 # description: Test attaching and querying a Postgres temporary table
 # group: [storage]
 
+mode skip
+
 require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE

diff --git a/test/sql/storage/attach_types.test b/test/sql/storage/attach_types.test
@@ -36,7 +36,7 @@ NULL	NULL	NULL	NULL
 # test all types
 statement ok
 CREATE TABLE all_types_tbl AS SELECT *
-EXCLUDE (float, double, ubigint, hugeint, uhugeint, nested_int_array, struct, struct_of_arrays, array_of_structs, map, "union", fixed_int_array, fixed_varchar_array, fixed_nested_int_array, fixed_nested_varchar_array, fixed_struct_array, struct_of_fixed_array, fixed_array_of_int_list, list_of_fixed_int_array)
+EXCLUDE (float, double, ubigint, hugeint, uhugeint, nested_int_array, struct, struct_of_arrays, array_of_structs, map, "union", fixed_int_array, fixed_varchar_array, fixed_nested_int_array, fixed_nested_varchar_array, fixed_struct_array, struct_of_fixed_array, fixed_array_of_int_list, list_of_fixed_int_array, varint)
 REPLACE(
 	CASE WHEN int IS NOT NULL THEN '2000-01-01' ELSE NULL END AS date,
 	CASE WHEN int IS NOT NULL THEN '2000-01-01 01:02:03' ELSE NULL END AS timestamp,