Terminate watcher if database changes

src/include/utils/helpers.hpp

@@ -11,7 +11,7 @@ namespace duckdb {
 typedef std::string (*simple_tf_t)(ClientContext &);
 
 struct RunOnceTableFunctionState : GlobalTableFunctionState {
-  RunOnceTableFunctionState() : run(false) {};
+  RunOnceTableFunctionState() : run(false){};
   std::atomic<bool> run;
 
   static unique_ptr<GlobalTableFunctionState> Init(ClientContext &,

src/include/watcher.hpp

@@ -26,6 +26,7 @@ class Watcher {
   std::condition_variable cv;
   std::atomic<bool> should_run;
   HttpServer &server;
+  DatabaseInstance *watched_database;
 };
 } // namespace ui
 } // namespace duckdb

src/watcher.cpp

@@ -9,7 +9,8 @@
 namespace duckdb {
 namespace ui {
 
-Watcher::Watcher(HttpServer &_server) : should_run(false), server(_server) {}
+Watcher::Watcher(HttpServer &_server)
+    : should_run(false), server(_server), watched_database(nullptr) {}
 
 bool WasCatalogUpdated(DatabaseInstance &db, Connection &connection,
                        CatalogState &last_state) {
@@ -62,6 +63,12 @@ void Watcher::Watch() {
       break; // DB went away, nothing to watch
     }
 
+    if (watched_database == nullptr) {
+      watched_database = db.get();
+    } else if (watched_database != db.get()) {
+      break; // DB changed, stop watching, will be restarted
+    }
+
     duckdb::Connection con{*db};
     auto polling_interval = GetPollingInterval(*con.context);
     if (polling_interval == 0) {

test/sql/ui.test

@@ -1,3 +1,4 @@
 # name: test/sql/ui.test
 # description: test ui extension
-# group: [ui]
+# group: [sql]
+