Merge pull request #31 from Mytherin/interfacechange

Avoid name conflict

Author: Mytherin

src/sqlite_extension.cpp

@@ -43,5 +43,4 @@ DUCKDB_EXTENSION_API const char *sqlite_scanner_version() {
 DUCKDB_EXTENSION_API void sqlite_scanner_storage_init(DBConfig &config) {
 	config.storage_extensions["sqlite_scanner"] = make_unique<SQLiteStorageExtension>();
 }
-
 }

src/sqlite_storage.cpp

@@ -12,12 +12,13 @@
 
 namespace duckdb {
 
-static unique_ptr<Catalog> SQLiteAttach(StorageExtensionInfo *info, AttachedDatabase &db, const string &name, AttachInfo &info,
-                                        AccessMode access_mode) {
+static unique_ptr<Catalog> SQLiteAttach(StorageExtensionInfo *storage_info, AttachedDatabase &db, const string &name,
+                                        AttachInfo &info, AccessMode access_mode) {
 	return make_unique<SQLiteCatalog>(db, info.path, access_mode);
 }
 
-static unique_ptr<TransactionManager> SQLiteCreateTransactionManager(StorageExtensionInfo *info, AttachedDatabase &db, Catalog &catalog) {
+static unique_ptr<TransactionManager> SQLiteCreateTransactionManager(StorageExtensionInfo *storage_info,
+                                                                     AttachedDatabase &db, Catalog &catalog) {
 	auto &sqlite_catalog = (SQLiteCatalog &)catalog;
 	return make_unique<SQLiteTransactionManager>(db, sqlite_catalog);
 }