Bug fixed:

・履歴に存在するファイルは削除しない設定が正しく動作しない問題を解消。
Implem · Apr 27, 2023 · 5acae46 · 5acae46
1 parent 0d40b96
commit 5acae46
Show file tree

Hide file tree

Showing 42 changed files with 317 additions and 203 deletions.
diff --git a/Implem.CodeDefiner/Implem.CodeDefiner.csproj b/Implem.CodeDefiner/Implem.CodeDefiner.csproj
@@ -5,9 +5,9 @@
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
     <Description>This program does the automatic code creation and merging of existing code based on the definition. Also it will make the configuration change of sql server database.</Description>
-    <AssemblyVersion>1.3.37.1</AssemblyVersion>
-    <FileVersion>1.3.37.1</FileVersion>
-    <Version>1.3.37.1</Version>
+    <AssemblyVersion>1.3.37.2</AssemblyVersion>
+    <FileVersion>1.3.37.2</FileVersion>
+    <Version>1.3.37.2</Version>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
 

diff --git a/Implem.DefinitionAccessor/Def.cs b/Implem.DefinitionAccessor/Def.cs
@@ -686,6 +686,7 @@ public static void SetCodeDefinition()
                     case "Model_Update": Code.Model_Update = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_Update, definitionRow, CodeXls); break;
                     case "Model_Update_ExecuteAutomaticNumberingExec": Code.Model_Update_ExecuteAutomaticNumberingExec = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_Update_ExecuteAutomaticNumberingExec, definitionRow, CodeXls); break;
                     case "Model_UpdateAttachmentsStatements": Code.Model_UpdateAttachmentsStatements = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_UpdateAttachmentsStatements, definitionRow, CodeXls); break;
+                    case "Model_UpdateAttachmentsStatements_Create": Code.Model_UpdateAttachmentsStatements_Create = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_UpdateAttachmentsStatements_Create, definitionRow, CodeXls); break;
                     case "Model_UpdateAttachmentsStatementsMethod": Code.Model_UpdateAttachmentsStatementsMethod = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_UpdateAttachmentsStatementsMethod, definitionRow, CodeXls); break;
                     case "Model_UpdateByApiCases": Code.Model_UpdateByApiCases = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_UpdateByApiCases, definitionRow, CodeXls); break;
                     case "Model_UpdateByCalendarCases": Code.Model_UpdateByCalendarCases = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_UpdateByCalendarCases, definitionRow, CodeXls); break;
@@ -916,6 +917,7 @@ public static void SetCodeDefinition()
                     case "Model_WhereDefault": Code.Model_WhereDefault = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_WhereDefault, definitionRow, CodeXls); break;
                     case "Model_WhereSiteIdOrDefault": Code.Model_WhereSiteIdOrDefault = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_WhereSiteIdOrDefault, definitionRow, CodeXls); break;
                     case "Model_WriteAttachmentsExecute": Code.Model_WriteAttachmentsExecute = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_WriteAttachmentsExecute, definitionRow, CodeXls); break;
+                    case "Model_WriteAttachmentsExecute_Update": Code.Model_WriteAttachmentsExecute_Update = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_WriteAttachmentsExecute_Update, definitionRow, CodeXls); break;
                     case "Rds": Code.Rds = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Rds, definitionRow, CodeXls); break;
                     case "Rds_AggregationAverageCases": Code.Rds_AggregationAverageCases = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Rds_AggregationAverageCases, definitionRow, CodeXls); break;
                     case "Rds_AggregationGroupByCases": Code.Rds_AggregationGroupByCases = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Rds_AggregationGroupByCases, definitionRow, CodeXls); break;
@@ -7081,6 +7083,7 @@ public class CodeColumn2nd
         public string Model_Update;
         public string Model_Update_ExecuteAutomaticNumberingExec;
         public string Model_UpdateAttachmentsStatements;
+        public string Model_UpdateAttachmentsStatements_Create;
         public string Model_UpdateAttachmentsStatementsMethod;
         public string Model_UpdateByApiCases;
         public string Model_UpdateByCalendarCases;
@@ -7311,6 +7314,7 @@ public class CodeColumn2nd
         public string Model_WhereDefault;
         public string Model_WhereSiteIdOrDefault;
         public string Model_WriteAttachmentsExecute;
+        public string Model_WriteAttachmentsExecute_Update;
         public string Rds;
         public string Rds_AggregationAverageCases;
         public string Rds_AggregationGroupByCases;
@@ -7857,6 +7861,7 @@ public class CodeTable
         public CodeDefinition Model_Update = new CodeDefinition();
         public CodeDefinition Model_Update_ExecuteAutomaticNumberingExec = new CodeDefinition();
         public CodeDefinition Model_UpdateAttachmentsStatements = new CodeDefinition();
+        public CodeDefinition Model_UpdateAttachmentsStatements_Create = new CodeDefinition();
         public CodeDefinition Model_UpdateAttachmentsStatementsMethod = new CodeDefinition();
         public CodeDefinition Model_UpdateByApiCases = new CodeDefinition();
         public CodeDefinition Model_UpdateByCalendarCases = new CodeDefinition();
@@ -8087,6 +8092,7 @@ public class CodeTable
         public CodeDefinition Model_WhereDefault = new CodeDefinition();
         public CodeDefinition Model_WhereSiteIdOrDefault = new CodeDefinition();
         public CodeDefinition Model_WriteAttachmentsExecute = new CodeDefinition();
+        public CodeDefinition Model_WriteAttachmentsExecute_Update = new CodeDefinition();
         public CodeDefinition Rds = new CodeDefinition();
         public CodeDefinition Rds_AggregationAverageCases = new CodeDefinition();
         public CodeDefinition Rds_AggregationGroupByCases = new CodeDefinition();

diff --git a/Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj b/Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.3.37.1</AssemblyVersion>
-    <FileVersion>1.3.37.1</FileVersion>
-    <Version>1.3.37.1</Version>
+    <AssemblyVersion>1.3.37.2</AssemblyVersion>
+    <FileVersion>1.3.37.2</FileVersion>
+    <Version>1.3.37.2</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.DisplayAccessor/Implem.DisplayAccessor.csproj b/Implem.DisplayAccessor/Implem.DisplayAccessor.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.3.37.1</AssemblyVersion>
-    <FileVersion>1.3.37.1</FileVersion>
-    <Version>1.3.37.1</Version>
+    <AssemblyVersion>1.3.37.2</AssemblyVersion>
+    <FileVersion>1.3.37.2</FileVersion>
+    <Version>1.3.37.2</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.Factory/Implem.Factory.csproj b/Implem.Factory/Implem.Factory.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.3.37.1</AssemblyVersion>
-    <FileVersion>1.3.37.1</FileVersion>
-    <Version>1.3.37.1</Version>
+    <AssemblyVersion>1.3.37.2</AssemblyVersion>
+    <FileVersion>1.3.37.2</FileVersion>
+    <Version>1.3.37.2</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.Libraries/Implem.Libraries.csproj b/Implem.Libraries/Implem.Libraries.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.3.37.1</AssemblyVersion>
-    <FileVersion>1.3.37.1</FileVersion>
-    <Version>1.3.37.1</Version>
+    <AssemblyVersion>1.3.37.2</AssemblyVersion>
+    <FileVersion>1.3.37.2</FileVersion>
+    <Version>1.3.37.2</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.ParameterAccessor/Implem.ParameterAccessor.csproj b/Implem.ParameterAccessor/Implem.ParameterAccessor.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.3.37.1</AssemblyVersion>
-    <FileVersion>1.3.37.1</FileVersion>
-    <Version>1.3.37.1</Version>
+    <AssemblyVersion>1.3.37.2</AssemblyVersion>
+    <FileVersion>1.3.37.2</FileVersion>
+    <Version>1.3.37.2</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_Create_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_Create_Body.txt
@@ -93,7 +93,8 @@ public List<SqlStatement> CreateStatements(
 <!--Model_UpdateStatus-->
 
     });
-<!--Model_UpdateAttachmentsStatements--->
+
+<!--Model_UpdateAttachmentsStatements_Create--->
 
 <!--Model_CreatePermissions-->
 

diff --git a/...ter/App_Data/Definitions/Definition_Code/Model_UpdateAttachmentsStatementsMethod_Body.txt b/...ter/App_Data/Definitions/Definition_Code/Model_UpdateAttachmentsStatementsMethod_Body.txt
@@ -1,4 +1,4 @@
-private List<SqlStatement> UpdateAttachmentsStatements(Context context, SiteSettings ss)
+private List<SqlStatement> UpdateAttachmentsStatements(Context context, SiteSettings ss, bool verUp = false)
 {
     var statements = new List<SqlStatement>();
     ColumnNames()
@@ -12,10 +12,12 @@
                     context: context,
                     columnName: columnName),
                 statements: statements,
-                referenceId: #ModelName#Id));
+                referenceId: #ModelName#Id,
+                verUp: verUp));
     return statements;
 }
-private void WriteAttachments(Context context, SiteSettings ss)
+
+private void WriteAttachments(Context context, SiteSettings ss, bool verUp = false)
 {
     ColumnNames()
         .Where(columnName => columnName.StartsWith("Attachments"))
@@ -27,5 +29,6 @@ private void WriteAttachments(Context context, SiteSettings ss)
                 column: ss.GetColumn(
                     context: context,
                     columnName: columnName),
-                referenceId: #ModelName#Id));
+                referenceId: #ModelName#Id,
+                verUp: verUp));
 }
diff --git a/...leasanter/App_Data/Definitions/Definition_Code/Model_UpdateAttachmentsStatements_Body.txt b/...leasanter/App_Data/Definitions/Definition_Code/Model_UpdateAttachmentsStatements_Body.txt
@@ -1 +1,4 @@
-statements.AddRange(UpdateAttachmentsStatements(context: context, ss: ss));
+statements.AddRange(UpdateAttachmentsStatements(
+    context: context,
+    ss: ss,
+    verUp: verUp));
diff --git a/...santer/App_Data/Definitions/Definition_Code/Model_UpdateAttachmentsStatements_Create.json b/...santer/App_Data/Definitions/Definition_Code/Model_UpdateAttachmentsStatements_Create.json
@@ -0,0 +1,5 @@
+{
+    "Id": "Model_UpdateAttachmentsStatements_Create",
+    "Indent": "3",
+    "Include": "Issues,Results"
+}
diff --git a/...er/App_Data/Definitions/Definition_Code/Model_UpdateAttachmentsStatements_Create_Body.txt b/...er/App_Data/Definitions/Definition_Code/Model_UpdateAttachmentsStatements_Create_Body.txt
@@ -0,0 +1,3 @@
+statements.AddRange(UpdateAttachmentsStatements(
+    context: context,
+    ss: ss));
diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_Update_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_Update_Body.txt
@@ -13,7 +13,7 @@
     bool otherInitValue = false,
     bool setBySession = true,
     bool get = true,
-    bool checkConflict = true) 
+    bool checkConflict = true)
 {
 <!--Model_OnUpdating_ServerScript-->
 <!--Model_OnApiUpdatingMailAddress_Users-->
@@ -27,19 +27,24 @@
 
 <!--Model_OnUpdatingExtendedSqls-->
 
+    var verUp = Versions.VerUp(
+        context: context,
+        ss: ss,
+        verUp: VerUp);
     statements.AddRange(UpdateStatements(
         context: context,
         ss: ss,
         param: param,
         otherInitValue: otherInitValue,
         additionalStatements: additionalStatements,
-        checkConflict: checkConflict));
+        checkConflict: checkConflict,
+        verUp: verUp));
 
 <!--Model_UpdateReminders-->
 <!--Model_UpdateExecute-->
 <!--Model_Update_ExecuteAutomaticNumberingExec-->
 <!--Model_UpdateExecute_User-->
-<!--Model_WriteAttachmentsExecute-->
+<!--Model_WriteAttachmentsExecute_Update-->
 <!--Model_ForceSynchronizeSummaryExecute-->
 <!--Model_UpdateWikiTitle-->
 <!--Model_OnUpdatedNotice-->
@@ -68,7 +73,8 @@ public List<SqlStatement> UpdateStatements(
     SqlParamCollection param = null,
     bool otherInitValue = false,
     List<SqlStatement> additionalStatements = null,
-    bool checkConflict = true)
+    bool checkConflict = true,
+    bool verUp = false)
 {
 
 <!--Model_SetAttachmentsData-->
@@ -82,10 +88,7 @@ public List<SqlStatement> UpdateStatements(
 
 <!--Model_IfDuplicated-->
 
-    if (Versions.VerUp(
-        context: context,
-        ss: ss,
-        verUp: VerUp))
+    if (verUp)
     {
         statements.Add(Rds.#TableName#CopyToStatement(
             where: where,

diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_Utilities_UpdateByGrid_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_Utilities_UpdateByGrid_Body.txt
@@ -71,7 +71,8 @@
             statements.AddRange(#modelName#Model.UpdateStatements(
                 context: context,
                 ss: ss,
-                dataTableName: formData.Id.ToString()));
+                dataTableName: formData.Id.ToString(),
+                verUp: #modelName#Model.VerUp));
         }
         else if (formData.Id < 0)
         {

diff --git a/...Pleasanter/App_Data/Definitions/Definition_Code/Model_WriteAttachmentsExecute_Update.json b/...Pleasanter/App_Data/Definitions/Definition_Code/Model_WriteAttachmentsExecute_Update.json
@@ -0,0 +1,6 @@
+{
+    "Id": "Model_WriteAttachmentsExecute_Update",
+    "Indent": "3",
+    "ItemOnly": "1",
+    "Exclude": "Sites,Wikis"
+}
diff --git a/...santer/App_Data/Definitions/Definition_Code/Model_WriteAttachmentsExecute_Update_Body.txt b/...santer/App_Data/Definitions/Definition_Code/Model_WriteAttachmentsExecute_Update_Body.txt
@@ -0,0 +1,4 @@
+WriteAttachments(
+    context: context,
+    ss: ss,
+    verUp: verUp);
diff --git a/Implem.Pleasanter/Implem.Pleasanter.csproj b/Implem.Pleasanter/Implem.Pleasanter.csproj
@@ -5,9 +5,9 @@
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
     <Description>Business application platform</Description>
     <AssemblyName>Implem.Pleasanter</AssemblyName>
-    <AssemblyVersion>1.3.37.1</AssemblyVersion>
-    <FileVersion>1.3.37.1</FileVersion>
-    <Version>1.3.37.1</Version>
+    <AssemblyVersion>1.3.37.2</AssemblyVersion>
+    <FileVersion>1.3.37.2</FileVersion>
+    <Version>1.3.37.2</Version>
     <Nullable>disable</Nullable>
 	<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>

diff --git a/Implem.Pleasanter/Libraries/DataTypes/Attachment.cs b/Implem.Pleasanter/Libraries/DataTypes/Attachment.cs
@@ -91,19 +91,20 @@ public void DeleteFromLocal(
             Context context,
             SiteSettings ss,
             Column column,
-            long referenceId)
+            long referenceId,
+            bool verUp)
         {
             var path = Path.Combine(
                 Directories.BinaryStorage(),
                 "Attachments",
                 Guid);
-            if (ss == null
-                || column.NotDeleteExistHistory == false
-                || !ExistsHistory(
-                    context: context,
-                    ss: ss,
-        　　　　    column: column,
-        　　　　    referenceId: referenceId))
+            if (column?.NotDeleteExistHistory != true
+                || (verUp == false
+                    && !ExistsHistory(
+                        context: context,
+                        ss: ss,
+                        column: column,
+                        referenceId: referenceId)))
             {
                 if (System.IO.File.Exists(path))
                 {
@@ -117,7 +118,8 @@ public void SqlStatement(
             SiteSettings ss,
             Column column,
             List<SqlStatement> statements,
-            long referenceId)
+            long referenceId,
+            bool verUp)
         {
             if (Added == true)
             {
@@ -140,12 +142,13 @@ public void SqlStatement(
             }
             else if (Deleted == true && !Overwritten.HasValue)
             {
-                if (column.NotDeleteExistHistory == false
-                    || !ExistsHistory(
-                        context: context,
-                        ss: ss,
-                        column: column,
-                        referenceId: referenceId))
+                if (column?.NotDeleteExistHistory != true
+                    || (verUp == false
+                        && !ExistsHistory(
+                            context: context,
+                            ss: ss,
+                            column: column,
+                            referenceId: referenceId)))
                 {
                     statements.Add(Rds.DeleteBinaries(
                         factory: context,
@@ -174,6 +177,10 @@ private bool ExistsHistory(
             Column column,
             long referenceId)
         {
+            if (ss == null)
+            {
+                return false;
+            }
             switch (ss.ReferenceType)
             {
                 case "Issues":
@@ -190,8 +197,7 @@ private bool ExistsHistory(
                                     columnBrackets: column.ColumnName.ToSingleArray(),
                                     value: $"%\"Guid\":\"{Guid}\"%",
                                     name: Strings.NewGuid(),
-                                    _operator: context.Sqls.LikeWithEscape),
-                            top: 1)) == 1;
+                                    _operator: context.Sqls.LikeWithEscape))) >= 1;
                 case "Results":
                     return Rds.ExecuteScalar_int(
                         context: context,
@@ -206,8 +212,7 @@ private bool ExistsHistory(
                                     columnBrackets: column.ColumnName.ToSingleArray(),
                                     value: $"%\"Guid\":\"{Guid}\"%",
                                     name: Strings.NewGuid(),
-                                    _operator: context.Sqls.LikeWithEscape),
-                            top: 1)) == 1;
+                                    _operator: context.Sqls.LikeWithEscape))) >= 1;
                 default:
                     return false;
             }