From 907e3e309a8c2b80442eb42ac6e04c3ea479ae53 Mon Sep 17 00:00:00 2001 From: "Michael J. Seiferling" Date: Thu, 15 Mar 2018 18:11:15 -0600 Subject: [PATCH] Reverted prior database upgrade fix --- GBM/Managers/mgrSQLite.vb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/GBM/Managers/mgrSQLite.vb b/GBM/Managers/mgrSQLite.vb index 3c42e51..c57d9e7 100644 --- a/GBM/Managers/mgrSQLite.vb +++ b/GBM/Managers/mgrSQLite.vb @@ -811,13 +811,6 @@ Public Class mgrSQLite CompactDatabase() - 'We need to push the local game list against the remote database in case they had syncing disabled - Dim hshMonitorList As Hashtable = mgrMonitorList.ReadList(mgrMonitorList.eListTypes.FullList, mgrSQLite.Database.Local) - Dim oSettings As New mgrSettings - oSettings.LoadSettings() - mgrMonitorList.DoListAddUpdateSync(hshMonitorList, Database.Remote, oSettings.SyncFields) - mgrTags.SyncTags(True) - mgrGameTags.SyncGameTags(True) End If If eDatabase = Database.Remote Then 'Backup DB before starting @@ -834,6 +827,14 @@ Public Class mgrSQLite "ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly, BackupLimit, CleanFolder, Parameter, Comments, IsRegEx FROM monitorlist;" & "DROP TABLE monitorlist; ALTER TABLE monitorlist_new RENAME TO monitorlist;" + 'We need to push the local game list against the remote database in case they had syncing disabled + Dim hshMonitorList As Hashtable = mgrMonitorList.ReadList(mgrMonitorList.eListTypes.FullList, mgrSQLite.Database.Local) + Dim oSettings As New mgrSettings + oSettings.LoadSettings() + mgrMonitorList.DoListAddUpdateSync(hshMonitorList, Database.Remote, oSettings.SyncFields) + mgrTags.SyncTags(True) + mgrGameTags.SyncGameTags(True) + sSQL &= "CREATE TABLE manifest_new (ManifestID TEXT NOT NULL PRIMARY KEY, MonitorID TEXT NOT NULL, FileName TEXT NOT NULL, " & "DateUpdated TEXT NOT NULL, UpdatedBy TEXT NOT NULL, CheckSum TEXT);" sSQL &= "INSERT INTO manifest_new (ManifestID, MonitorID, FileName, DateUpdated, UpdatedBy, CheckSum) " &