From c3eb8d95a25e35bf785b4ce8aeb309aa1db6cf09 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 7 Aug 2020 19:11:38 +0000 Subject: [PATCH] --- .vscode/launch.json | 2 +- server/AyaNova/models/AyContext.cs | 2 ++ server/AyaNova/models/Logo.cs | 21 +++++++++++++++++++++ server/AyaNova/util/AySchema.cs | 17 +++++++++++++++-- 4 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 server/AyaNova/models/Logo.cs diff --git a/.vscode/launch.json b/.vscode/launch.json index 9efe9077..69b973c3 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -51,7 +51,7 @@ "AYANOVA_USE_URLS": "http://*:7575;", "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", - "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\\PostgreSQLPortable_12.0\\App\\PgSQL\\bin\\" diff --git a/server/AyaNova/models/AyContext.cs b/server/AyaNova/models/AyContext.cs index b13e6324..ee0ea43e 100644 --- a/server/AyaNova/models/AyContext.cs +++ b/server/AyaNova/models/AyContext.cs @@ -68,6 +68,8 @@ namespace AyaNova.Models public virtual DbSet WorkOrderTemplateItem { get; set; } + public virtual DbSet Logo { get; set; } + //Note: had to add this constructor to work with the code in startup.cs that gets the connection string from the appsettings.json file //and commented out the above on configuring public AyContext(DbContextOptions options) : base(options) diff --git a/server/AyaNova/models/Logo.cs b/server/AyaNova/models/Logo.cs new file mode 100644 index 00000000..d2246595 --- /dev/null +++ b/server/AyaNova/models/Logo.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using AyaNova.Biz; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using Newtonsoft.Json; + +namespace AyaNova.Models +{ + + public class Logo + { + public long Id { get; set; } + public byte[] Large { get; set; } + public byte[] Medium { get; set; } + public byte[] Small { get; set; } + + + } + +} diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index 675c5dfd..c2b4a583 100644 --- a/server/AyaNova/util/AySchema.cs +++ b/server/AyaNova/util/AySchema.cs @@ -20,9 +20,9 @@ namespace AyaNova.Util /////////// CHANGE THIS ON NEW SCHEMA UPDATE //////////////////// //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!! - private const int DESIRED_SCHEMA_LEVEL = 12; + private const int DESIRED_SCHEMA_LEVEL = 13; - internal const long EXPECTED_COLUMN_COUNT = 383; + internal const long EXPECTED_COLUMN_COUNT = 387; internal const long EXPECTED_INDEX_COUNT = 139; //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!! @@ -705,6 +705,19 @@ $BODY$; await SetSchemaLevelAsync(++currentSchema); } + ////////////////////////////////////////////////// + // LOGO table + if (currentSchema < 13) + { + LogUpdateMessage(log); + + await ExecQueryAsync("CREATE TABLE alogo (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, " + + "large bytea, medium bytea, small bytea)"); + + await SetSchemaLevelAsync(++currentSchema); + } + +