Merge pull request #347 from Mytherin/issue341

Fix #341: add mutex to querying using Postgres connection

Author: Mytherin

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) {

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