Skip to content

Tests cleanup, collation fix restored #480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
staticlibs merged 1 commit into from
Jun 7, 2026
Merged

Tests cleanup, collation fix restored #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/IntegrationTests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ jobs:
password: 'postgres'
database: 'postgres'
port: '5432'
ssl: true

- name: Run tests
env:
Expand Down Expand Up @@ -297,7 +298,7 @@ jobs:
working-directory: ./duckdb
run: |
DUCKDB_VERSION=$(git rev-parse --short=10 HEAD)
KEY="${{ runner.os }}-${{ runner.arch }}-$DUCKDB_VERSION"-relassert-${{ matrix.threadsan }}
KEY="${{ runner.os }}-${{ runner.arch }}-$DUCKDB_VERSION"-relassert-${{ matrix.sanitizer.name }}
echo "value=${KEY}" >> "${GITHUB_OUTPUT}"

- name: Restore Cache
Expand Down
6 changes: 5 additions & 1 deletion src/postgres_filter_pushdown.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
17 changes: 0 additions & 17 deletions test/sql/scanner/aws-rds.test
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions test/sql/scanner/ssl.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion test/sql/scanner/tpcds.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 4 additions & 6 deletions test/sql/storage/attach_connection_pool_configure.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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
Expand Down
3 changes: 0 additions & 3 deletions test/sql/storage/attach_delete.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 0 additions & 2 deletions test/sql/storage/attach_like.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 1 addition & 3 deletions test/sql/storage/attach_secret.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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
Expand Down
13 changes: 11 additions & 2 deletions test/sql/storage/attach_temporary_table.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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
4 changes: 1 addition & 3 deletions test/sql/storage/attach_timeout_error.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ require postgres_scanner

require-env POSTGRES_TEST_DATABASE_AVAILABLE

require-env POSTGRES_TEST_TEMPORARY_DISABLED

statement ok
ATTACH 'dbname=postgresscanner options=''-c statement_timeout=1000''' AS s (TYPE POSTGRES, READ_ONLY);
ATTACH 'dbname=postgresscanner port=5432 sslmode=allow options=''-c statement_timeout=1000''' AS s (TYPE POSTGRES, READ_ONLY);

statement error
SELECT * FROM postgres_query(s, 'select count(*) from tpch.lineitem, tpch.lineitem t2, tpch.lineitem t3');
Expand Down
16 changes: 0 additions & 16 deletions test/sql/storage/postgres_execute_transaction.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 s (TYPE POSTGRES)

Expand Down Expand Up @@ -63,17 +61,3 @@ SELECT query FROM duckdb_logs_parsed('PostgresQueryLog');
----
BEGIN TRANSACTION ISOLATION LEVEL REPEATABLE READ
COMMIT
BEGIN TRANSACTION ISOLATION LEVEL REPEATABLE READ
COMMIT
BEGIN TRANSACTION ISOLATION LEVEL REPEATABLE READ
COMMIT
BEGIN TRANSACTION ISOLATION LEVEL REPEATABLE READ
COMMIT
BEGIN TRANSACTION ISOLATION LEVEL REPEATABLE READ
COMMIT
BEGIN TRANSACTION ISOLATION LEVEL REPEATABLE READ
COMMIT
BEGIN TRANSACTION ISOLATION LEVEL REPEATABLE READ
COMMIT
BEGIN TRANSACTION ISOLATION LEVEL REPEATABLE READ
COMMIT
Loading