diff --git a/.vscode/launch.json b/.vscode/launch.json index 0e2049e9..8fd97968 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -53,7 +53,7 @@ "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "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_TZ_OFFSET": "-7", "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" diff --git a/server/AyaNova/Startup.cs b/server/AyaNova/Startup.cs index c2673dc7..07534417 100644 --- a/server/AyaNova/Startup.cs +++ b/server/AyaNova/Startup.cs @@ -147,6 +147,7 @@ namespace AyaNova _newLog.LogInformation("Connected to database server - {0}", DbUtil.DisplayableConnectionString); + //ensure database is ready and present DbUtil.EnsureDatabaseExists(_newLog); @@ -572,6 +573,10 @@ namespace AyaNova AySchema.CheckAndUpdateAsync(dbContext, _newLog).Wait(); } + + //Log server version + _newLog.LogInformation("Database server version - {0}", DbUtil.DBServerVersion(dbContext)); + //Check schema _newLog.LogDebug("DB schema check"); AySchema.CheckAndUpdateAsync(dbContext, _newLog).Wait(); diff --git a/server/AyaNova/util/DbUtil.cs b/server/AyaNova/util/DbUtil.cs index c85d382a..849226dc 100644 --- a/server/AyaNova/util/DbUtil.cs +++ b/server/AyaNova/util/DbUtil.cs @@ -119,6 +119,33 @@ namespace AyaNova.Util #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 // 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;"; await cmd.ExecuteNonQueryAsync(); - + cmd.CommandText = "delete from \"adashboardview\" where userid <> 1;"; 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(); cmd.CommandText = "delete from \"apartwarehouse\" where id <> 1;";