cleanups

Author: aclowes

src/include/postgres_secret_storage.hpp

@@ -18,8 +18,7 @@ class PostgresCatalog;
 
 class PostgresSecretStorage : public SecretStorage {
 public:
-  PostgresSecretStorage(const string &name_p, DatabaseInstance &db,
-                        PostgresCatalog &postgres_catalog, SecretManager &secret_manager);
+  PostgresSecretStorage(const string &name_p, PostgresCatalog &postgres_catalog, SecretManager &secret_manager);
   ~PostgresSecretStorage() override;
 
   bool IncludeInLookups() override { return true; }
@@ -43,7 +42,6 @@ class PostgresSecretStorage : public SecretStorage {
   unique_ptr<const BaseSecret> DeserializeSecret(const string &hex_string, const string &secret_name);
   PostgresCatalog *GetPostgresCatalog(ClientContext &context);
 
-  DatabaseInstance &db;
   SecretManager &secret_manager;
   string attached_database_name;
   string secrets_table_name;

src/postgres_secret_storage.cpp

@@ -34,9 +34,9 @@ int64_t PostgresSecretStorage::GetNextTieBreakOffset() {
 	return next_tie_break_offset.fetch_add(1);
 }
 
-PostgresSecretStorage::PostgresSecretStorage(const string &name_p, DatabaseInstance &db_p,
-                                             PostgresCatalog &postgres_catalog_p, SecretManager &secret_manager_p)
-    : SecretStorage(name_p, GetNextTieBreakOffset()), db(db_p), secret_manager(secret_manager_p),
+PostgresSecretStorage::PostgresSecretStorage(const string &name_p, PostgresCatalog &postgres_catalog_p, 
+											 SecretManager &secret_manager_p)
+    : SecretStorage(name_p, GetNextTieBreakOffset()), secret_manager(secret_manager_p),
       attached_database_name(postgres_catalog_p.GetAttached().GetName()), secrets_table_name("duckdb_secrets") {
 	persistent = true;
 

src/storage/postgres_catalog.cpp

@@ -115,7 +115,7 @@ void PostgresCatalog::Initialize(bool load_builtin) {
 
 	// Register the secret storage
 	try {
-		auto storage = make_uniq<PostgresSecretStorage>(storage_name, db_instance, *this, secret_manager);
+		auto storage = make_uniq<PostgresSecretStorage>(storage_name, *this, secret_manager);
 		secret_manager.LoadSecretStorage(std::move(storage));
 	} catch (InvalidConfigurationException &) {
 		// Storage already exists - this is fine, reuse the existing one