From: Will Budic <redacted>
Date: Sun, 23 Feb 2020 10:09:30 +0000 (+1100)
Subject: Aiding further with upgrade issuses.
X-Git-Url: https://lifelog.hopto.org/gitweb/?a=commitdiff_plain;h=dc4462811e508fcc3a16fdaadb0b75c7a4f53c93;p=LifeLog.git

Aiding further with upgrade issuses.
---

diff --git a/htdocs/cgi-bin/login_ctr.cgi b/htdocs/cgi-bin/login_ctr.cgi
index 4051133..0bb9827 100755
--- a/htdocs/cgi-bin/login_ctr.cgi
+++ b/htdocs/cgi-bin/login_ctr.cgi
@@ -206,7 +206,7 @@ sub checkCreateTables {
         #perl 5.28+ <--
         #if ( 'RTF' ~~ @names ) {
         if(grep( /RTF/, @names)){
-            #$db->begin_work();
+            $db->do('DROP TABLE life_log_login_ctr_temp_table;') if($curr_tables{'life_log_login_ctr_temp_table'});
             $db->do('CREATE TABLE life_log_login_ctr_temp_table AS SELECT * FROM LOG;');
             my %notes_ids = ();
             if($hasNotesTbl){
diff --git a/htdocs/cgi-bin/system/modules/Settings.pm b/htdocs/cgi-bin/system/modules/Settings.pm
index 39f6b85..46dfbe8 100644
--- a/htdocs/cgi-bin/system/modules/Settings.pm
+++ b/htdocs/cgi-bin/system/modules/Settings.pm
@@ -231,7 +231,7 @@ sub selectRecords {
                 return 0 if(!$pst);
                 return $pst;
     }catch{
-                SettingsException->throw(error=>"Database error encountered.", show_trace=>$DEBUG);
+                SettingsException->throw(error=>"Database error encountered. Settings::selectRecords[sql]", show_trace=>$DEBUG);
     };
 }