From 09972da7e474817ab86dafd5e31dac3c56c1c5c2 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 10 Mar 2022 23:40:25 +0000 Subject: [PATCH] --- .vscode/launch.json | 2 +- server/AyaNova/Controllers/AttachmentController.cs | 2 +- server/AyaNova/util/AySchema.cs | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 7c905164..2c3525c1 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -48,7 +48,7 @@ "AYANOVA_DATA_PATH": "c:\\temp\\ravendata", "AYANOVA_USE_URLS": "http://*:7575;", //"AYANOVA_PERMANENTLY_ERASE_DATABASE":"true", - "AYANOVA_SERVER_TEST_MODE": "true", + "AYANOVA_SERVER_TEST_MODE": "false", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-8", //"AYANOVA_REPORT_RENDERING_TIMEOUT":"1", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", diff --git a/server/AyaNova/Controllers/AttachmentController.cs b/server/AyaNova/Controllers/AttachmentController.cs index a2aacd04..b4af2ca3 100644 --- a/server/AyaNova/Controllers/AttachmentController.cs +++ b/server/AyaNova/Controllers/AttachmentController.cs @@ -617,7 +617,7 @@ namespace AyaNova.Api.Controllers await ct.Database.OpenConnectionAsync(); cmd.CommandText = $@"select afileattachment.id, displayfilename,contenttype,lastmodified, afileattachment.notes, size, auser.name as attachedbyuser from afileattachment left join auser on (afileattachment.attachtoobjectid=auser.id) - where attachtoatype={ayaType} and attachtoobjectid={ayaId} + where attachtoatype={(int)ayaType} and attachtoobjectid={ayaId} order by displayfilename"; using (var dr = await cmd.ExecuteReaderAsync()) diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index 0358e45e..a3f1ed04 100644 --- a/server/AyaNova/util/AySchema.cs +++ b/server/AyaNova/util/AySchema.cs @@ -22,16 +22,16 @@ namespace AyaNova.Util //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImportingAsync WHEN NEW TABLES ADDED!!!! private const int DESIRED_SCHEMA_LEVEL = 1; - internal const long EXPECTED_COLUMN_COUNT = 1359; + internal const long EXPECTED_COLUMN_COUNT = 1360; internal const long EXPECTED_INDEX_COUNT = 156; - internal const long EXPECTED_CHECK_CONSTRAINTS = 548; - internal const long EXPECTED_FOREIGN_KEY_CONSTRAINTS = 201; + internal const long EXPECTED_CHECK_CONSTRAINTS = 549; + internal const long EXPECTED_FOREIGN_KEY_CONSTRAINTS = 202; internal const long EXPECTED_VIEWS = 11; internal const long EXPECTED_ROUTINES = 2; //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImportingAsync WHEN NEW TABLES ADDED!!!! - ///////////////////////////////////////// (C1359:I156:CC548:FC201:V11:R2) + ///////////////////////////////////////// C1360:I156:CC549:FC202:V11:R2 /*