eric/duckdb-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update database instance in server first

Browse Source 
So that even if we throw after loading twice we'll have refreshed the instance
This commit is contained in:
Yves
2025-02-20 22:01:04 +01:00
parent 2b93a8d969
commit 3ac477d185
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ui_extension.cpp
View File

@@ -130,10 +130,14 @@ void InitStorageExtension(duckdb::DatabaseInstance &db) {
} }
static void LoadInternal(DatabaseInstance &instance) { static void LoadInternal(DatabaseInstance &instance) {
auto &config = DBConfig::GetConfig(instance);
InitStorageExtension(instance); InitStorageExtension(instance);
// If the server is already running we need to update the database instance
// since the previous one was invalidated (eg. in the shell when we '.open'
// a new database)
ui::HttpServer::UpdateDatabaseInstanceIfRunning(instance.shared_from_this());
auto &config = DBConfig::GetConfig(instance);
config.AddExtensionOption( config.AddExtensionOption(
UI_LOCAL_PORT_SETTING_NAME, UI_LOCAL_PORT_SETTING_DESCRIPTION, UI_LOCAL_PORT_SETTING_NAME, UI_LOCAL_PORT_SETTING_DESCRIPTION,
LogicalType::USMALLINT, Value::USMALLINT(UI_LOCAL_PORT_SETTING_DEFAULT)); LogicalType::USMALLINT, Value::USMALLINT(UI_LOCAL_PORT_SETTING_DEFAULT));
@@ -155,11 +159,6 @@ static void LoadInternal(DatabaseInstance &instance) {
SingleBoolResultBind, RunOnceTableFunctionState::Init); SingleBoolResultBind, RunOnceTableFunctionState::Init);
ExtensionUtil::RegisterFunction(instance, tf); ExtensionUtil::RegisterFunction(instance, tf);
} }
// If the server is already running we need to update the database instance
// since the previous one was invalidated (eg. in the shell when we '.open'
// a new database)
ui::HttpServer::UpdateDatabaseInstanceIfRunning(instance.shared_from_this());
} }
void UiExtension::Load(DuckDB &db) { LoadInternal(*db.instance); } void UiExtension::Load(DuckDB &db) { LoadInternal(*db.instance); }