From 2f03f59eeaba3cc3ac8d5dfd83d4926799825481 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 23 Apr 2021 18:26:57 +0200 Subject: [PATCH] refresh views --- .../DatabaseContext.Views.cs | 50 +++++++++++-------- .../EgtBEAMWALL.DataLayer.csproj | 7 +++ 2 files changed, 36 insertions(+), 21 deletions(-) diff --git a/EgtBEAMWALL.DataLayer/DatabaseContext.Views.cs b/EgtBEAMWALL.DataLayer/DatabaseContext.Views.cs index 3a728e88..04e467e0 100644 --- a/EgtBEAMWALL.DataLayer/DatabaseContext.Views.cs +++ b/EgtBEAMWALL.DataLayer/DatabaseContext.Views.cs @@ -11,7 +11,7 @@ using System.Data.Entity.Infrastructure.MappingViews; [assembly: DbMappingViewCacheTypeAttribute( typeof(EgtBEAMWALL.DataLayer.DatabaseContext), - typeof(Edm_EntityMappingGeneratedViews.ViewsForBaseEntitySetsa95a868b62cc753257f94e9de93da89a15deb865d6b60b5e975a50d917c6ee74))] + typeof(Edm_EntityMappingGeneratedViews.ViewsForBaseEntitySets991d60e8c06fb7a14542a1fa467435dadb8759ce92cff08ef069c8042ed59eec))] namespace Edm_EntityMappingGeneratedViews { @@ -23,14 +23,14 @@ namespace Edm_EntityMappingGeneratedViews /// Implements a mapping view cache. /// [GeneratedCode("Entity Framework 6 Power Tools", "0.9.2.0")] - internal sealed class ViewsForBaseEntitySetsa95a868b62cc753257f94e9de93da89a15deb865d6b60b5e975a50d917c6ee74 : DbMappingViewCache + internal sealed class ViewsForBaseEntitySets991d60e8c06fb7a14542a1fa467435dadb8759ce92cff08ef069c8042ed59eec : DbMappingViewCache { /// /// Gets a hash value computed over the mapping closure. /// public override string MappingHashValue { - get { return "a95a868b62cc753257f94e9de93da89a15deb865d6b60b5e975a50d917c6ee74"; } + get { return "991d60e8c06fb7a14542a1fa467435dadb8759ce92cff08ef069c8042ed59eec"; } } /// @@ -404,19 +404,23 @@ namespace Edm_EntityMappingGeneratedViews { return new DbMappingView(@" SELECT VALUE -- Constructing LogMachineModel - [CodeFirstDatabaseSchema.LogMachineModel](T1.LogMachineModel_DbId, T1.LogMachineModel_CncFileName, T1.LogMachineModel_Description, T1.LogMachineModel_DtEvent, T1.LogMachineModel_DtExported, T1.LogMachineModel_EventType, T1.LogMachineModel_MachineId, T1.LogMachineModel_Message, T1.LogMachineModel_SN, T1.LogMachineModel_Value) + [CodeFirstDatabaseSchema.LogMachineModel](T1.LogMachineModel_DbId, T1.LogMachineModel_AlarmCode, T1.LogMachineModel_AlarmDtEvent, T1.LogMachineModel_AlarmMessage, T1.LogMachineModel_AlarmOperation, T1.LogMachineModel_AlarmType, T1.LogMachineModel_CommExecuted, T1.LogMachineModel_CommandState, T1.LogMachineModel_CommandType, T1.LogMachineModel_Description, T1.LogMachineModel_NewOpState, T1.LogMachineModel_ResultType, T1.LogMachineModel_VarAddress, T1.LogMachineModel_VarValue) FROM ( SELECT T.LogDbId AS LogMachineModel_DbId, - T.CncFileName AS LogMachineModel_CncFileName, + T.AlarmCode AS LogMachineModel_AlarmCode, + T.AlarmDatetime AS LogMachineModel_AlarmDtEvent, + T.AlarmMessage AS LogMachineModel_AlarmMessage, + T.AlarmOperation AS LogMachineModel_AlarmOperation, + T.AlarmType AS LogMachineModel_AlarmType, + T.CommandExecutedCorrectly AS LogMachineModel_CommExecuted, + CAST(T.CommandState AS [Edm.Int32]) AS LogMachineModel_CommandState, + CAST(T.CommandType AS [Edm.Int32]) AS LogMachineModel_CommandType, T.Description AS LogMachineModel_Description, - T.DtEvent AS LogMachineModel_DtEvent, - T.DtExported AS LogMachineModel_DtExported, - CAST(T.EventType AS [Edm.Int32]) AS LogMachineModel_EventType, - T.MachineId AS LogMachineModel_MachineId, - T.Message AS LogMachineModel_Message, - T.SN AS LogMachineModel_SN, - T.[Value] AS LogMachineModel_Value, + T.NewOpState AS LogMachineModel_NewOpState, + CAST(T.ResultType AS [Edm.Int32]) AS LogMachineModel_ResultType, + T.VarAddress AS LogMachineModel_VarAddress, + T.VarValue AS LogMachineModel_VarValue, True AS _from0 FROM DatabaseContext.LogMachineList AS T ) AS T1"); @@ -430,19 +434,23 @@ namespace Edm_EntityMappingGeneratedViews { return new DbMappingView(@" SELECT VALUE -- Constructing LogMachineList - [EgtBEAMWALL.DataLayer.LogMachineModel](T1.LogMachineModel_LogDbId, T1.LogMachineModel_CncFileName, T1.LogMachineModel_Description, T1.LogMachineModel_DtEvent, T1.LogMachineModel_DtExported, T1.LogMachineModel_EventType, T1.LogMachineModel_MachineId, T1.LogMachineModel_Message, T1.LogMachineModel_SN, T1.LogMachineModel_Value) + [EgtBEAMWALL.DataLayer.LogMachineModel](T1.LogMachineModel_LogDbId, T1.LogMachineModel_AlarmCode, T1.LogMachineModel_AlarmDatetime, T1.LogMachineModel_AlarmMessage, T1.LogMachineModel_AlarmOperation, T1.LogMachineModel_AlarmType, T1.LogMachineModel_CommandExecutedCorrectly, T1.LogMachineModel_CommandState, T1.LogMachineModel_CommandType, T1.LogMachineModel_Description, T1.LogMachineModel_NewOpState, T1.LogMachineModel_ResultType, T1.LogMachineModel_VarAddress, T1.LogMachineModel_VarValue) FROM ( SELECT T.DbId AS LogMachineModel_LogDbId, - T.CncFileName AS LogMachineModel_CncFileName, + T.AlarmCode AS LogMachineModel_AlarmCode, + T.AlarmDtEvent AS LogMachineModel_AlarmDatetime, + T.AlarmMessage AS LogMachineModel_AlarmMessage, + T.AlarmOperation AS LogMachineModel_AlarmOperation, + T.AlarmType AS LogMachineModel_AlarmType, + T.CommExecuted AS LogMachineModel_CommandExecutedCorrectly, + CAST(T.CommandState AS [EgtBEAMWALL.DataLayer.CommandStates]) AS LogMachineModel_CommandState, + CAST(T.CommandType AS [EgtBEAMWALL.DataLayer.LogCommandTypes]) AS LogMachineModel_CommandType, T.Description AS LogMachineModel_Description, - T.DtEvent AS LogMachineModel_DtEvent, - T.DtExported AS LogMachineModel_DtExported, - CAST(T.EventType AS [EgtBEAMWALL.DataLayer.EventType]) AS LogMachineModel_EventType, - T.MachineId AS LogMachineModel_MachineId, - T.Message AS LogMachineModel_Message, - T.SN AS LogMachineModel_SN, - T.[Value] AS LogMachineModel_Value, + T.NewOpState AS LogMachineModel_NewOpState, + CAST(T.ResultType AS [EgtBEAMWALL.DataLayer.ResultTypes]) AS LogMachineModel_ResultType, + T.VarAddress AS LogMachineModel_VarAddress, + T.VarValue AS LogMachineModel_VarValue, True AS _from0 FROM CodeFirstDatabase.LogMachineModel AS T ) AS T1"); diff --git a/EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj b/EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj index 3828ba4f..d22c3623 100644 --- a/EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj +++ b/EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj @@ -96,6 +96,10 @@ 202104150749157_FullDbInit.cs + + + 202104231625149_LogMachineUpgrade.cs + @@ -113,6 +117,9 @@ 202104150749157_FullDbInit.cs + + 202104231625149_LogMachineUpgrade.cs +