This commit is contained in:
2021-03-09 15:47:49 +00:00
parent 9a11e4bfb4
commit 2c7cc1742a
3 changed files with 35 additions and 3 deletions

2
.vscode/launch.json vendored
View File

@@ -53,7 +53,7 @@
"AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
"AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
"AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
"AYANOVA_SERVER_TEST_MODE": "false", "AYANOVA_SERVER_TEST_MODE": "true",
"AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
"AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
"AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"

View File

@@ -147,6 +147,7 @@ namespace AyaNova
_newLog.LogInformation("Connected to database server - {0}", DbUtil.DisplayableConnectionString); _newLog.LogInformation("Connected to database server - {0}", DbUtil.DisplayableConnectionString);
//ensure database is ready and present //ensure database is ready and present
DbUtil.EnsureDatabaseExists(_newLog); DbUtil.EnsureDatabaseExists(_newLog);
@@ -572,6 +573,10 @@ namespace AyaNova
AySchema.CheckAndUpdateAsync(dbContext, _newLog).Wait(); AySchema.CheckAndUpdateAsync(dbContext, _newLog).Wait();
} }
//Log server version
_newLog.LogInformation("Database server version - {0}", DbUtil.DBServerVersion(dbContext));
//Check schema //Check schema
_newLog.LogDebug("DB schema check"); _newLog.LogDebug("DB schema check");
AySchema.CheckAndUpdateAsync(dbContext, _newLog).Wait(); AySchema.CheckAndUpdateAsync(dbContext, _newLog).Wait();

View File

@@ -119,6 +119,33 @@ namespace AyaNova.Util
#region DB verification #region DB verification
///////////////////////////////////////////
// Get database server version
//
internal static string DBServerVersion(AyaNova.Models.AyContext ct)
{
using (var cmd = ct.Database.GetDbConnection().CreateCommand())
{
ct.Database.OpenConnection();
cmd.CommandText = $"select version();";
using (var dr = cmd.ExecuteReader())
{
if (dr.Read())
{
if (dr.IsDBNull(0))
return "Unknown / no results";
else
return (dr.GetString(0));
}
else
{
return "Unknown / no results";
}
}
}
}
/////////////////////////////////////////// ///////////////////////////////////////////
//Verify that server exists //Verify that server exists
// spend up to 5 minutes waiting for it to come up before bailing // spend up to 5 minutes waiting for it to come up before bailing
@@ -400,11 +427,11 @@ namespace AyaNova.Util
cmd.CommandText = "ALTER SEQUENCE auser_id_seq RESTART WITH 2;"; cmd.CommandText = "ALTER SEQUENCE auser_id_seq RESTART WITH 2;";
await cmd.ExecuteNonQueryAsync(); await cmd.ExecuteNonQueryAsync();
cmd.CommandText = "delete from \"adashboardview\" where userid <> 1;"; cmd.CommandText = "delete from \"adashboardview\" where userid <> 1;";
await cmd.ExecuteNonQueryAsync(); await cmd.ExecuteNonQueryAsync();
cmd.CommandText = $"ALTER SEQUENCE adashboardview_id_seq RESTART WITH 2;"; cmd.CommandText = $"ALTER SEQUENCE adashboardview_id_seq RESTART WITH 2;";
await cmd.ExecuteNonQueryAsync(); await cmd.ExecuteNonQueryAsync();
cmd.CommandText = "delete from \"apartwarehouse\" where id <> 1;"; cmd.CommandText = "delete from \"apartwarehouse\" where id <> 1;";