Tests cleanup, collation fix restored

Author: staticlibs

.github/workflows/IntegrationTests.yml

@@ -105,6 +105,7 @@ jobs:
         password: 'postgres'
         database: 'postgres'
         port: '5432'
+        ssl: true
 
     - name: Run tests
       env:

src/postgres_filter_pushdown.cpp

@@ -81,7 +81,11 @@ string PostgresFilterPushdown::TransformConstantFilter(const string &column_name
 		constant_string = TransformLiteral(constant);
 	}
 	auto operator_string = TransformComparison(comparison_type);
-	return StringUtil::Format("%s %s %s", column_name, operator_string, constant_string);
+	string comparison = StringUtil::Format("%s %s %s", column_name, operator_string, constant_string);
+	if (constant.type().id() == LogicalTypeId::VARCHAR) {
+		comparison += " COLLATE \"C\"";
+	}
+	return comparison;
 }
 
 string PostgresFilterPushdown::TransformExpressionSubject(const string &column_name, const Expression &expr) {

test/sql/scanner/aws-rds.test

@@ -6,10 +6,11 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-require-env POSTGRES_TEST_TEMPORARY_DISABLED
+statement ok
+ATTACH 'dbname=postgresscanner sslmode=require' AS s1 (TYPE POSTGRES)
 
 statement ok
-CALL postgres_attach('dbname=postgresscanner sslmode=require');
+use s1
 
 query III
 select * from cars;

test/sql/scanner/ssl.test

@@ -8,7 +8,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-# TODO: currently fails with out of storage on CI?
 mode skip
 
 statement ok

test/sql/scanner/tpcds.test

@@ -6,8 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-require-env POSTGRES_TEST_TEMPORARY_DISABLED
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS loader (TYPE POSTGRES);
 
@@ -26,13 +24,13 @@ ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES);
 statement ok
 RESET GLOBAL pg_pool_max_connections
 
-query IIIIIIIIIII
-SELECT catalog_name, max_connections, cache_hits, cache_misses, try_failures, thread_local_cache_enabled, max_lifetime_millis, idle_timeout_millis, reaper_thread_running, reaper_thread_period_millis, health_check_query
+query IIIIIIIIII
+SELECT catalog_name, max_connections, /*cache_hits,*/ cache_misses, try_failures, thread_local_cache_enabled, max_lifetime_millis, idle_timeout_millis, reaper_thread_running, reaper_thread_period_millis, health_check_query
 FROM postgres_configure_pool()
 ORDER BY catalog_name
 ----
-s	8	2	1	0	FALSE	0	60000	1	30000	SELECT 1
-s1	8	1	1	0	FALSE	0	60000	1	30000	SELECT 1
+s	8	1	0	FALSE	0	60000	1	30000	SELECT 1
+s1	8	1	0	FALSE	0	60000	1	30000	SELECT 1
 
 query II
 SELECT catalog_name, acquire_mode

test/sql/storage/attach_connection_pool_configure.test

@@ -69,9 +69,6 @@ DELETE FROM s1.test RETURNING *;
 ----
 not yet supported
 
-# mixing duckdb tables in deletes is not supported
-mode skip
-
 statement ok
 INSERT INTO s1.test VALUES (1), (2), (3), (NULL);
 

test/sql/storage/attach_delete.test

@@ -6,8 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-require-env POSTGRES_TEST_TEMPORARY_DISABLED
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES)
 

test/sql/storage/attach_like.test

@@ -6,8 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-require-env POSTGRES_TEST_TEMPORARY_DISABLED
-
 # attach using default secret
 statement ok
 CREATE SECRET (
@@ -113,7 +111,7 @@ DROP SECRET postgres_db;
 statement ok
 CREATE OR REPLACE SECRET postgres_db (
 	TYPE POSTGRES,
-	URI 'postgresql://postgres:postgres@localhost:5432/postgresscanner'
+	URI 'postgresql://postgres:postgres@localhost:5432/postgresscanner?sslmode=allow'
 );
 
 statement ok

test/sql/storage/attach_secret.test

@@ -2,15 +2,16 @@
 # description: Test attaching and querying a Postgres temporary table
 # group: [storage]
 
-mode skip
-
 require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
 statement ok
 ATTACH 'postgres:dbname=postgresscanner' AS s
 
+statement ok
+BEGIN TRANSACTION
+
 statement ok
 CREATE TABLE s.pg_temp.my_datasets(val VARCHAR)
 
@@ -25,3 +26,11 @@ query I
 SELECT * FROM s.pg_temp.my_datasets
 ----
 hello world
+
+statement ok
+ROLLBACK
+
+statement error
+SELECT * FROM s.pg_temp.my_datasets
+----
+does not exist