Apply new patch

Author: carlopi

src/include/storage/postgres_optimizer.hpp

@@ -9,6 +9,7 @@
 #pragma once
 
 #include "duckdb/main/config.hpp"
+#include "duckdb/optimizer/optimizer_extension.hpp"
 
 namespace duckdb {
 

src/postgres_extension.cpp

@@ -161,7 +161,7 @@ static void LoadInternal(ExtensionLoader &loader) {
 	loader.RegisterFunction(postgres_secret_function);
 
 	auto &config = DBConfig::GetConfig(loader.GetDatabaseInstance());
-	config.storage_extensions["postgres_scanner"] = make_uniq<PostgresStorageExtension>();
+	StorageExtension::Register(config, "postgres_scanner", make_shared_ptr<PostgresStorageExtension>());
 
 	config.AddExtensionOption("pg_use_binary_copy", "Whether or not to use BINARY copy to read data",
 	                          LogicalType::BOOLEAN, Value::BOOLEAN(true));
@@ -191,9 +191,9 @@ static void LoadInternal(ExtensionLoader &loader) {
 
 	OptimizerExtension postgres_optimizer;
 	postgres_optimizer.optimize_function = PostgresOptimizer::Optimize;
-	config.optimizer_extensions.push_back(std::move(postgres_optimizer));
+	OptimizerExtension::Register(config, std::move(postgres_optimizer));
 
-	config.extension_callbacks.push_back(make_uniq<PostgresExtensionCallback>());
+	ExtensionCallback::Register(config, make_shared_ptr<PostgresExtensionCallback>());
 	for (auto &connection : ConnectionManager::Get(loader.GetDatabaseInstance()).GetConnectionList()) {
 		connection->registered_state->Insert("postgres_extension", make_shared_ptr<PostgresExtensionState>());
 	}

src/postgres_storage.cpp

@@ -1,5 +1,6 @@
 #include "duckdb.hpp"
 
+#include "duckdb/main/settings.hpp"
 #include "postgres_storage.hpp"
 #include "storage/postgres_catalog.hpp"
 #include "duckdb/parser/parsed_data/attach_info.hpp"
@@ -11,7 +12,7 @@ static unique_ptr<Catalog> PostgresAttach(optional_ptr<StorageExtensionInfo> sto
                                           AttachedDatabase &db, const string &name, AttachInfo &info,
                                           AttachOptions &attach_options) {
 	auto &config = DBConfig::GetConfig(context);
-	if (!config.options.enable_external_access) {
+	if (!Settings::Get<EnableExternalAccessSetting>(context)) {
 		throw PermissionException("Attaching Postgres databases is disabled through configuration");
 	}
 	string attach_path = info.path;

src/storage/postgres_index_set.cpp

@@ -1,6 +1,7 @@
 #include "storage/postgres_index_set.hpp"
 #include "storage/postgres_schema_entry.hpp"
 #include "storage/postgres_transaction.hpp"
+#include "duckdb/parser/expression/columnref_expression.hpp"
 #include "duckdb/parser/parsed_data/create_schema_info.hpp"
 #include "storage/postgres_index_entry.hpp"
 #include "duckdb/parser/parsed_expression_iterator.hpp"