Addresses #459 (#460)

Addresses #459
joyfullservice · Nov 16, 2023 · 3ad141c · 3ad141c
1 parent 2a183df
commit 3ad141c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Version Control.accda.src/dbs-properties.json b/Version Control.accda.src/dbs-properties.json
@@ -41,7 +41,7 @@
       "Type": 10
     },
     "AppVersion": {
-      "Value": "4.0.27",
+      "Value": "4.0.28",
       "Type": 10
     },
     "Auto Compact": {

diff --git a/Version Control.accda.src/modules/clsDbProperty.cls b/Version Control.accda.src/modules/clsDbProperty.cls
@@ -82,7 +82,11 @@ Private Sub IDbComponent_Import(strFile As String)
     Next prp
 
     ' Read properties from source file
+    ' We don't want to parse the dates here, so turning them off for this operation only.
+    ' See issue #459 for additional details.
+    JsonOptions.ConvertDateToIso = False
     Set dImport = ReadJsonFile(strFile)
+    JsonOptions.ConvertDateToIso = True
     If Not dImport Is Nothing Then
         Set dItems = dImport("Items")
         For Each varKey In dItems.Keys
@@ -188,7 +192,11 @@ Private Sub IDbComponent_Merge(strFile As String)
 
     ' Remove any document properties that don't exist in the incoming file,
     ' then import the file.
+    ' We don't want to parse the dates here, so turning them off for this operation only.
+    ' See issue #459 for additional details.
+    JsonOptions.ConvertDateToIso = False
     Set dFile = ReadJsonFile(strFile)
+    JsonOptions.ConvertDateToIso = True
     If dFile Is Nothing Then Set dFile = New Dictionary
     RemoveMissing dFile("Items"), GetDictionary