Minor fixes (#776)

* `IsXxx` helpers were returning an `Oid` instead of a `bool`
* simplify secrets invalidation

Author: Y--

include/pgduckdb/pgduckdb_duckdb.hpp

@@ -24,9 +24,12 @@ class DuckDBManager {
 		return manager_instance;
 	}
 
-	static inline DuckDBManager *
-	FindIfInitialized() {
-		return manager_instance.database ? &manager_instance : nullptr;
+	static void
+	InvalidateDuckDBSecretsIfInitialized() {
+		// Only invalidate the secrets if the database is initialized.
+		if (IsInitialized()) {
+			manager_instance.InvalidateDuckDBSecrets();
+		}
 	}
 
 	static duckdb::unique_ptr<duckdb::Connection> CreateConnection();

include/pgduckdb/pgduckdb_metadata_cache.hpp

@@ -15,10 +15,10 @@ Oid DuckdbUnionOid();
 Oid DuckdbMapOid();
 Oid DuckdbJsonOid();
 Oid DuckdbTableAmOid();
-Oid IsDuckdbTable(Form_pg_class relation);
-Oid IsDuckdbTable(Relation relation);
-Oid IsMotherDuckTable(Form_pg_class relation);
-Oid IsMotherDuckTable(Relation relation);
-Oid IsDuckdbExecutionAllowed();
+bool IsDuckdbTable(Form_pg_class relation);
+bool IsDuckdbTable(Relation relation);
+bool IsMotherDuckTable(Form_pg_class relation);
+bool IsMotherDuckTable(Relation relation);
+bool IsDuckdbExecutionAllowed();
 void RequireDuckdbExecution();
 } // namespace pgduckdb

src/pgduckdb_metadata_cache.cpp

@@ -355,31 +355,31 @@ DuckdbTableAmOid() {
 	return cache.table_am_oid;
 }
 
-Oid
+bool
 IsDuckdbTable(Form_pg_class relation) {
 	Assert(cache.valid);
 	return relation->relam == pgduckdb::DuckdbTableAmOid();
 }
 
-Oid
+bool
 IsDuckdbTable(Relation relation) {
 	Assert(cache.valid);
 	return IsDuckdbTable(relation->rd_rel);
 }
 
-Oid
+bool
 IsMotherDuckTable(Form_pg_class relation) {
 	Assert(cache.valid);
 	return IsDuckdbTable(relation) && relation->relpersistence == RELPERSISTENCE_PERMANENT;
 }
 
-Oid
+bool
 IsMotherDuckTable(Relation relation) {
 	Assert(cache.valid);
 	return IsMotherDuckTable(relation->rd_rel);
 }
 
-Oid
+bool
 IsDuckdbExecutionAllowed() {
 	Assert(cache.valid);
 	Assert(cache.postgres_role_oid != InvalidOid);

src/pgduckdb_userdata_cache.cpp

@@ -42,18 +42,10 @@ struct {
 
 bool callback_is_configured = false;
 
-void
-InvalidateDuckDBSecrets() {
-	auto manager = pgduckdb::DuckDBManager::FindIfInitialized();
-	if (manager) {
-		manager->InvalidateDuckDBSecrets();
-	}
-}
-
 void
 InvalidateCache(Datum, int, uint32) {
 	InvalidateUserDataCache();
-	InvokeCPPFunc(InvalidateDuckDBSecrets);
+	InvokeCPPFunc(pgduckdb::DuckDBManager::InvalidateDuckDBSecretsIfInitialized);
 }
 
 } // namespace