properly disconnect sqlite db before restoring

oetiker · Jun 12, 2023 · 6f00c8d · 6f00c8d
1 parent 66d2e55
commit 6f00c8d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+0.46.2 2023-06-12 15:00:43 +0200 Tobias Oetiker <[email protected]>
+
+ - fix restore process to properly reconnect to database
+
 0.46.1 2023-05-23 12:12:33 +0200 Tobias Oetiker <[email protected]>
 
  - resync branches

diff --git a/lib/CallBackery.pm b/lib/CallBackery.pm
@@ -37,7 +37,7 @@ use CallBackery::Plugin::Doc;
 use CallBackery::Database;
 use CallBackery::User;
 
-our $VERSION = '0.46.1';
+our $VERSION = '0.46.2';
 
 
 =head2 config

diff --git a/lib/CallBackery/Config.pm b/lib/CallBackery/Config.pm
@@ -554,12 +554,14 @@ sub restoreConfigBlob {
         for ($member->fileName){
             /^\{DATABASE\}$/ && do {
                 $self->log->warn("Restoring Database!");
+                $self->app->database->mojoSqlDb->disconnect;
                 unlink glob $cfg->{BACKEND}{cfg_db}.'*';
                 $member->extractToFileNamed($cfg->{BACKEND}{cfg_db});
                 last;
             };
             /^\{DATABASEDUMP\}$/ && do {
                 $self->log->warn("Restoring Database Dump!");
+                $self->app->database->mojoSqlDb->disconnect;
                 unlink glob $cfg->{BACKEND}{cfg_db}.'*';
                 open my $sqlite, '|-', '/usr/bin/sqlite3',$cfg->{BACKEND}{cfg_db};
                 my $sql = $member->contents();