fix: move the extension out of the duckdb namespace into adbc_scanner

Author: rustyconover

src/adbc_catalog.cpp

@@ -9,8 +9,8 @@
 #include "duckdb/parser/parsed_data/create_table_function_info.hpp"
 #include <nanoarrow/nanoarrow.h>
 
-namespace duckdb {
-namespace adbc {
+namespace adbc_scanner {
+using namespace duckdb;
 
 // Info code to name mapping
 static string GetInfoName(uint32_t info_code) {
@@ -1215,5 +1215,4 @@ void RegisterAdbcCatalogFunctions(DatabaseInstance &db) {
     }
 }
 
-} // namespace adbc
-} // namespace duckdb
+} // namespace adbc_scanner

src/adbc_connection.cpp

@@ -1,7 +1,7 @@
 #include "adbc_connection.hpp"
 
-namespace duckdb {
-namespace adbc {
+namespace adbc_scanner {
+using namespace duckdb;
 
 shared_ptr<AdbcConnectionWrapper> GetValidatedConnection(int64_t connection_id, const string &function_name) {
 	auto &registry = ConnectionRegistry::Get();
@@ -94,5 +94,4 @@ shared_ptr<AdbcConnectionWrapper> CreateConnectionFromOptions(const vector<pair<
 	return connection;
 }
 
-} // namespace adbc
-} // namespace duckdb
+} // namespace adbc_scanner

src/adbc_filter_pushdown.cpp

@@ -6,8 +6,8 @@
 #include "duckdb/common/enum_util.hpp"
 #include "duckdb/common/constants.hpp"
 
-namespace duckdb {
-namespace adbc {
+namespace adbc_scanner {
+using namespace duckdb;
 
 string AdbcFilterPushdown::CreateExpression(string &column_name, vector<unique_ptr<TableFilter>> &filters,
                                             string op, vector<Value> &params, vector<LogicalType> &param_types) {
@@ -145,5 +145,4 @@ FilterPushdownResult AdbcFilterPushdown::TransformFilters(const vector<column_t>
 	return result;
 }
 
-} // namespace adbc
-} // namespace duckdb
+} // namespace adbc_scanner

src/adbc_functions.cpp

@@ -5,8 +5,8 @@
 #include "duckdb/main/extension/extension_loader.hpp"
 #include "duckdb/parser/parsed_data/create_scalar_function_info.hpp"
 
-namespace duckdb {
-namespace adbc {
+namespace adbc_scanner {
+using namespace duckdb;
 
 // Helper to extract key-value pairs from either a STRUCT or MAP
 static vector<pair<string, string>> ExtractOptions(Vector &options_vector, idx_t row_idx) {
@@ -231,5 +231,4 @@ void RegisterAdbcScalarFunctions(DatabaseInstance &db) {
 	}
 }
 
-} // namespace adbc
-} // namespace duckdb
+} // namespace adbc_scanner

src/adbc_scan.cpp

@@ -18,8 +18,8 @@
 #include <nanoarrow/nanoarrow.h>
 #include <queue>
 
-namespace duckdb {
-namespace adbc {
+namespace adbc_scanner {
+using namespace duckdb;
 
 // Numeric value from ADBC statistics union (type_id: 0=int64, 1=uint64, 2=float64)
 struct AdbcStatValue {
@@ -1728,5 +1728,4 @@ void RegisterAdbcInsertFunction(DatabaseInstance &db) {
     loader.RegisterFunction(info);
 }
 
-} // namespace adbc
-} // namespace duckdb
+} // namespace adbc_scanner

src/adbc_scanner_extension.cpp

@@ -9,39 +9,43 @@
 #include "duckdb/main/config.hpp"
 #include "query_farm_telemetry.hpp"
 
-namespace duckdb {
+namespace adbc_scanner {
 
-static void LoadInternal(ExtensionLoader &loader) {
+static void LoadInternal(duckdb::ExtensionLoader &loader) {
 	// Register ADBC secret type and create secret function
-	adbc::RegisterAdbcSecrets(loader);
+	RegisterAdbcSecrets(loader);
 
 	// Register ADBC scalar functions (adbc_connect, adbc_disconnect)
-	adbc::RegisterAdbcScalarFunctions(loader.GetDatabaseInstance());
+	RegisterAdbcScalarFunctions(loader.GetDatabaseInstance());
 
 	// Register ADBC table functions (adbc_scan)
-	adbc::RegisterAdbcTableFunctions(loader.GetDatabaseInstance());
+	RegisterAdbcTableFunctions(loader.GetDatabaseInstance());
 
 	// Register ADBC catalog functions (adbc_info, adbc_tables)
-	adbc::RegisterAdbcCatalogFunctions(loader.GetDatabaseInstance());
+	RegisterAdbcCatalogFunctions(loader.GetDatabaseInstance());
 
 	// Register ADBC execute function (adbc_execute for DDL/DML)
-	adbc::RegisterAdbcExecuteFunction(loader.GetDatabaseInstance());
+	RegisterAdbcExecuteFunction(loader.GetDatabaseInstance());
 
 	// Register ADBC insert function (adbc_insert for bulk ingestion)
-	adbc::RegisterAdbcInsertFunction(loader.GetDatabaseInstance());
+	RegisterAdbcInsertFunction(loader.GetDatabaseInstance());
 
 	// Register ADBC clear cache function
 	RegisterAdbcClearCacheFunction(loader.GetDatabaseInstance());
 
 	// Register ADBC storage extension for ATTACH support
-	auto &config = DBConfig::GetConfig(loader.GetDatabaseInstance());
-	config.storage_extensions["adbc"] = make_uniq<AdbcStorageExtension>();
+	auto &config = duckdb::DBConfig::GetConfig(loader.GetDatabaseInstance());
+	config.storage_extensions["adbc"] = duckdb::make_uniq<AdbcStorageExtension>();
 
 	QueryFarmSendTelemetry(loader, "adbc", "2025120801");
 }
 
+} // namespace adbc_scanner
+
+namespace duckdb {
+
 void AdbcScannerExtension::Load(ExtensionLoader &loader) {
-	LoadInternal(loader);
+	adbc_scanner::LoadInternal(loader);
 }
 
 std::string AdbcScannerExtension::Name() {
@@ -57,6 +61,6 @@ std::string AdbcScannerExtension::Version() const {
 extern "C" {
 
 DUCKDB_CPP_EXTENSION_ENTRY(adbc_scanner, loader) {
-	duckdb::LoadInternal(loader);
+	adbc_scanner::LoadInternal(loader);
 }
 }

src/adbc_secrets.cpp

@@ -2,8 +2,8 @@
 #include "duckdb/main/extension/extension_loader.hpp"
 #include "duckdb/common/string_util.hpp"
 
-namespace duckdb {
-namespace adbc {
+namespace adbc_scanner {
+using namespace duckdb;
 
 unique_ptr<SecretEntry> AdbcGetSecretByName(ClientContext &context, const string &secret_name) {
 	auto &secret_manager = SecretManager::Get(context);
@@ -202,5 +202,4 @@ void RegisterAdbcSecrets(ExtensionLoader &loader) {
 	loader.RegisterFunction(adbc_secret_function);
 }
 
-} // namespace adbc
-} // namespace duckdb
+} // namespace adbc_scanner

src/include/adbc_connection.hpp

@@ -8,8 +8,8 @@
 #include <mutex>
 #include <unordered_set>
 
-namespace duckdb {
-namespace adbc {
+namespace adbc_scanner {
+using namespace duckdb;
 
 // Forward declaration
 class AdbcConnectionWrapper;
@@ -465,5 +465,4 @@ void ForEachArrowBatch(ArrowArrayStream &stream, const string &function_name, Ca
 	}
 }
 
-} // namespace adbc
-} // namespace duckdb
+} // namespace adbc_scanner

src/include/adbc_filter_pushdown.hpp

@@ -12,8 +12,8 @@
 #include "duckdb/planner/filter/conjunction_filter.hpp"
 #include "duckdb/planner/filter/constant_filter.hpp"
 
-namespace duckdb {
-namespace adbc {
+namespace adbc_scanner {
+using namespace duckdb;
 
 // Result of transforming filters - contains both the WHERE clause and bound parameters
 struct FilterPushdownResult {
@@ -47,5 +47,4 @@ class AdbcFilterPushdown {
 	                               string op, vector<Value> &params, vector<LogicalType> &param_types);
 };
 
-} // namespace adbc
-} // namespace duckdb
+} // namespace adbc_scanner

src/include/adbc_functions.hpp

@@ -2,8 +2,8 @@
 
 #include "duckdb.hpp"
 
-namespace duckdb {
-namespace adbc {
+namespace adbc_scanner {
+using namespace duckdb;
 
 // Register scalar functions (adbc_connect, adbc_disconnect)
 void RegisterAdbcScalarFunctions(DatabaseInstance &db);
@@ -20,9 +20,7 @@ void RegisterAdbcExecuteFunction(DatabaseInstance &db);
 // Register insert function (adbc_insert for bulk ingestion)
 void RegisterAdbcInsertFunction(DatabaseInstance &db);
 
-} // namespace adbc
-
-// Register adbc_clear_cache scalar function (outside adbc namespace)
+// Register adbc_clear_cache scalar function
 void RegisterAdbcClearCacheFunction(DatabaseInstance &db);
 
-} // namespace duckdb
+} // namespace adbc_scanner