Merge branch 'main' of github.com:duckdb/duckdb-postgres

Author: Mytherin

CMakeLists.txt

@@ -93,6 +93,8 @@ if(WIN32)
       postgres/src/port/open.c
       postgres/src/port/pgsleep.c
       postgres/src/port/system.c
+      postgres/src/port/dirmod.c
+      postgres/src/port/win32common.c
       postgres/src/port/win32error.c
       postgres/src/port/win32ntdll.c
       postgres/src/port/win32setlocale.c
@@ -120,10 +122,10 @@ if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/postgres)
   message(STATUS "Downloading PostgreSQL source code")
   file(
     DOWNLOAD
-    "https://github.com/postgres/postgres/archive/refs/tags/REL_15_2.tar.gz"
+    "https://github.com/postgres/postgres/archive/refs/tags/REL_15_13.tar.gz"
     ${CMAKE_CURRENT_SOURCE_DIR}/pg.tar.gz
     SHOW_PROGRESS
-    EXPECTED_MD5 615ef3fa75d19c46d2dafd6c66ddb5f6
+    EXPECTED_MD5 106c54e53aca9395354a251eeea914c0
     STATUS PG_DOWNLOAD_RESULT)
 
   if(NOT PG_DOWNLOAD_RESULT EQUAL 0)
@@ -137,7 +139,7 @@ if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/postgres)
        ${CMAKE_CURRENT_SOURCE_DIR}/postgres_tmp)
 
   # Move out of root directory
-  file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/postgres_tmp/postgres-REL_15_2
+  file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/postgres_tmp/postgres-REL_15_13
        ${CMAKE_CURRENT_SOURCE_DIR}/postgres)
 
   # Remove the tmp directory

extension_config.cmake

@@ -12,4 +12,4 @@ duckdb_extension_load(tpcds)
 duckdb_extension_load(json)
 
 # Any extra extensions that should be built
-# e.g.: duckdb_extension_load(json)
+# e.g.: duckdb_extension_load(json)

src/include/postgres_connection.hpp

@@ -24,9 +24,12 @@ struct IndexInfo;
 
 struct OwnedPostgresConnection {
 	explicit OwnedPostgresConnection(PGconn *conn = nullptr);
+	OwnedPostgresConnection(const OwnedPostgresConnection &) = delete;
+	OwnedPostgresConnection &operator=(const OwnedPostgresConnection &) = delete;
 	~OwnedPostgresConnection();
 
 	PGconn *connection;
+	mutex connection_lock;
 };
 
 class PostgresConnection {

src/postgres_connection.cpp

@@ -68,6 +68,7 @@ PGresult *PostgresConnection::PQExecute(const string &query) {
 }
 
 unique_ptr<PostgresResult> PostgresConnection::TryQuery(const string &query, optional_ptr<string> error_message) {
+	lock_guard<mutex> guard(connection->connection_lock);
 	auto result = PQExecute(query.c_str());
 	if (ResultHasError(result)) {
 		if (error_message) {

src/postgres_extension.cpp

@@ -92,6 +92,8 @@ unique_ptr<BaseSecret> CreatePostgresSecretFunction(ClientContext &context, Crea
 			result->secret_map["password"] = named_param.second.ToString();
 		} else if (lower_name == "port") {
 			result->secret_map["port"] = named_param.second.ToString();
+		} else if (lower_name == "passfile") {
+			result->secret_map["passfile"] = named_param.second.ToString();
 		} else {
 			throw InternalException("Unknown named parameter passed to CreatePostgresSecretFunction: " + lower_name);
 		}
@@ -109,6 +111,7 @@ void SetPostgresSecretParameters(CreateSecretFunction &function) {
 	function.named_parameters["user"] = LogicalType::VARCHAR;
 	function.named_parameters["database"] = LogicalType::VARCHAR; // alias for dbname
 	function.named_parameters["dbname"] = LogicalType::VARCHAR;
+	function.named_parameters["passfile"] = LogicalType::VARCHAR;
 }
 
 void SetPostgresNullByteReplacement(ClientContext &context, SetScope scope, Value &parameter) {

src/storage/postgres_catalog.cpp

@@ -92,6 +92,7 @@ string PostgresCatalog::GetConnectionString(ClientContext &context, const string
 		new_connection_info += AddConnectionOption(kv_secret, "host");
 		new_connection_info += AddConnectionOption(kv_secret, "port");
 		new_connection_info += AddConnectionOption(kv_secret, "dbname");
+		new_connection_info += AddConnectionOption(kv_secret, "passfile");
 
 		connection_string = new_connection_info + connection_string;
 	} else if (explicit_secret) {

test/sql/storage/attach_json.test

@@ -12,7 +12,7 @@ statement ok
 PRAGMA enable_verification
 
 statement ok
-ATTACH 'dbname=postgresscanner' AS postgres_db (TYPE POSTGRES)
+ATTACH 'dbname=postgresscanner' AS postgres_db (TYPE POSTGRES, READ_WRITE)
 
 statement ok
 CREATE OR REPLACE TABLE postgres_db.json_tbl AS SELECT '{"a": 42}'::JSON AS json_col

test/sql/storage/attach_show_all_tables.test

@@ -0,0 +1,19 @@
+# name: test/sql/storage/attach_show_all_tables.test
+# description: Test attaching using a secret
+# group: [storage]
+
+require postgres_scanner
+
+require-env POSTGRES_TEST_DATABASE_AVAILABLE
+
+statement ok
+PRAGMA enable_verification
+
+statement ok
+ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
+
+statement ok
+USE s
+
+statement ok
+SHOW ALL TABLES