diff --git a/dist/install/windows/x64/lan.iss b/dist/install/windows/x64/lan.iss index 1b3f8670..4b5abc73 100644 --- a/dist/install/windows/x64/lan.iss +++ b/dist/install/windows/x64/lan.iss @@ -1,7 +1,7 @@ ; LAN install for internal network use only #define MyAppName "AyaNova server" -#define MyAppVersion "8.0.35" +#define MyAppVersion "8.0.36" #define MyAppPublisher "Ground Zero Tech-Works, Inc." #define MyAppURL "https://ayanova.com/" #define MyAppLauncherExeName "ayanova-launcher.exe" diff --git a/dist/install/windows/x64/standalone.iss b/dist/install/windows/x64/standalone.iss index e45df9c1..b5db31d2 100644 --- a/dist/install/windows/x64/standalone.iss +++ b/dist/install/windows/x64/standalone.iss @@ -3,7 +3,7 @@ ; external to lan requires different config #define MyAppName "AyaNova" -#define MyAppVersion "8.0.35" +#define MyAppVersion "8.0.36" #define MyAppPublisher "Ground Zero Tech-Works, Inc." #define MyAppURL "https://ayanova.com/" #define MyAppLauncherExeName "ayanova-launcher.exe" diff --git a/docs/8.0/ayanova/docs/ops-restore.md b/docs/8.0/ayanova/docs/ops-restore.md index 9a331ec9..3228145b 100644 --- a/docs/8.0/ayanova/docs/ops-restore.md +++ b/docs/8.0/ayanova/docs/ops-restore.md @@ -101,7 +101,7 @@ The PostgreSQL utility pg_restore is used to restore the `.backup` file containi The command format is: `pg_restore -U postgres -c [PATH_TO_THE_AYANOVA_BACKUP_FILE_TO_BE_RESTORED.backup]` -Run the restore command from the console substituting your backup file path in the examples below: +Run the restore command from a command prompt substituting your backup file path in the examples below: Windows server: @@ -116,6 +116,14 @@ Windows self contained "single" user installation: "C:/Program Files/ayanova/local-postgres/bin/pg_restore" -U postgres -c -d AyaNova "C:\temp\db-20211212195504569.backup" ``` +Windows Powershell terminal with quoted path: + +Powershell needs an ampersand character at the start of a quoted path to a command to correctly interpret the input as a command: + +```bat +& "C:/Program Files/ayanova/local-postgres/bin/pg_restore" -U postgres -c -d AyaNova "C:\temp\db-20211212195504569.backup" +``` + Linux server: The database backup file must be placed in a location that the 'postgres' user has permission to read from. @@ -141,7 +149,7 @@ Repeat the Linux server installation instruction step [Set ownership and permiss AyaNova can be re-started at this point, for server type installations restart through the IIS 'site' in Windows or the Service in Linux. -If using the desktop single Windows installation, stop the PostgreSQL started in the earlier restore step by typing `ctrl-c` in the PostgreSQL console window then start AyaNova from the desktop launcher as normally. +If using the desktop single Windows installation, stop the PostgreSQL started in the earlier restore step by typing `ctrl-c` in the PostgreSQL window then start AyaNova from the desktop launcher as normally. ### Verify the data diff --git a/docs/8.0/ayanova/mkdocs.yml b/docs/8.0/ayanova/mkdocs.yml index 287a7b83..1f7a07e5 100644 --- a/docs/8.0/ayanova/mkdocs.yml +++ b/docs/8.0/ayanova/mkdocs.yml @@ -7,7 +7,7 @@ theme: site_name: AyaNova manual site_dir: '../../../server/AyaNova/wwwroot/docs' strict: true -copyright: Copyright © 2023 Ground Zero Tech-Works Inc. REV-2023-01-27 +copyright: Copyright © 2023 Ground Zero Tech-Works Inc. REV-2023-02-10 extra: generator: false # Extensions diff --git a/server/AyaNova/AyaNova.csproj b/server/AyaNova/AyaNova.csproj index be7273f6..fa02bb31 100644 --- a/server/AyaNova/AyaNova.csproj +++ b/server/AyaNova/AyaNova.csproj @@ -4,8 +4,8 @@ true - 8.0.35 - 8.0.35.0 + 8.0.36 + 8.0.36.0 ayanova.ico bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml 1591 diff --git a/server/AyaNova/util/AyaNovaVersion.cs b/server/AyaNova/util/AyaNovaVersion.cs index cd079166..5b6934b8 100644 --- a/server/AyaNova/util/AyaNovaVersion.cs +++ b/server/AyaNova/util/AyaNovaVersion.cs @@ -5,7 +5,7 @@ namespace AyaNova.Util /// internal static class AyaNovaVersion { - public const string VersionString = "8.0.35"; + public const string VersionString = "8.0.36"; public const string FullNameAndVersion = "AyaNova server " + VersionString; public const string CurrentApiVersion="v8"; }//eoc diff --git a/server/AyaNova/util/License.cs b/server/AyaNova/util/License.cs index 66ac5ac5..0e9642d6 100644 --- a/server/AyaNova/util/License.cs +++ b/server/AyaNova/util/License.cs @@ -700,6 +700,9 @@ namespace AyaNova.Core try { //First fetch the schema db id for the servers database, the license must match + //NOTE: if get error "Sequence contains more than one element" here + //this is caused by a user restoring AyaNova DB without using the -c clean command line switch and + //so it puts two records into the schemaversion table causing this line to bomb as it's expecting single record only var schema = await ct.SchemaVersion.AsNoTracking().SingleOrDefaultAsync(); if (schema == null || string.IsNullOrWhiteSpace(schema.Id)) { @@ -814,6 +817,10 @@ namespace AyaNova.Core { var msg = "E1020 - Error initializing license key"; log.LogCritical(ex, msg); + if (ex.Message.Contains("Sequence contains more than one element")) + { + log.LogCritical("The preceding error may have been caused by AyaNova database recently restored without using the -c CLEAN option in the restore command"); + } apiServerState.SetSystemLock(msg); throw new ApplicationException(msg, ex); }