|
@@ -203,35 +203,14 @@ public static class DataUpdater
|
|
|
newVersion = toVersion;
|
|
|
return true;
|
|
|
}
|
|
|
-
|
|
|
- private static DatabaseVersion GetVersionSettings()
|
|
|
- {
|
|
|
- var result = DbFactory.NewProvider(Logger.Main).Query(new Filter<GlobalSettings>(x => x.Section).IsEqualTo(nameof(DatabaseVersion)))
|
|
|
- .Rows.FirstOrDefault()?.ToObject<GlobalSettings>();
|
|
|
- if(result != null)
|
|
|
- {
|
|
|
- return Serialization.Deserialize<DatabaseVersion>(result.Contents);
|
|
|
- }
|
|
|
- var settings = new GlobalSettings() { Section = nameof(DatabaseVersion), Key = "" };
|
|
|
- var dbVersion = new DatabaseVersion() { Version = "6.30b" };
|
|
|
- settings.Contents = Serialization.Serialize(dbVersion);
|
|
|
- DbFactory.NewProvider(Logger.Main).Save(settings);
|
|
|
- return dbVersion;
|
|
|
- }
|
|
|
-
|
|
|
- private static VersionNumber GetDatabaseVersion()
|
|
|
- {
|
|
|
- var dbVersion = GetVersionSettings();
|
|
|
- return VersionNumber.Parse(dbVersion.Version);
|
|
|
- }
|
|
|
-
|
|
|
+
|
|
|
private static void UpdateVersionNumber(VersionNumber version)
|
|
|
{
|
|
|
if (version.IsDevelopmentVersion)
|
|
|
{
|
|
|
return;
|
|
|
}
|
|
|
- var dbVersion = GetVersionSettings();
|
|
|
+ var dbVersion = DbFactory.GetVersionSettings();
|
|
|
dbVersion.Version = version.ToString();
|
|
|
|
|
|
var result = DbFactory.NewProvider(Logger.Main).Query(new Filter<GlobalSettings>(x => x.Section).IsEqualTo(nameof(DatabaseVersion)))
|
|
@@ -249,7 +228,7 @@ public static class DataUpdater
|
|
|
{
|
|
|
try
|
|
|
{
|
|
|
- var from = GetDatabaseVersion();
|
|
|
+ var from = DbFactory.GetDatabaseVersion();
|
|
|
var to = VersionNumber.Parse(CoreUtils.GetVersion());
|
|
|
|
|
|
var success = MigrateDatabase(from, to, out var newVersion);
|