Sanitize the ColumnInfo value

This cached value is recreated when a form is imported, and can cause VCS noise on subsequent builds if the underlying data source is changed. See #412 for a detailed discussion on this.
joyfullservice · Jul 11, 2023 · f61080b · f61080b
1 parent f4a8248
commit f61080b
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/Version Control.accda.src/modules/modSanitize.bas b/Version Control.accda.src/modules/modSanitize.bas
@@ -174,9 +174,12 @@ Public Function SanitizeFile(strPath As String, blnReturnHash As Boolean) As Str
                         SkipLine lngLine
                     ElseIf StartsWith(strTLine, "Checksum =") Then
                         ' Ignore Checksum lines, since they will change.
-                        SkipLine lngLine
-                    ElseIf StartsWith(strTLine, "BaseInfo =") Then
-                        ' BaseInfo is used with combo boxes, similar to RowSource.
+                        SkipLine lngLine, eslBasic
+                    ElseIf StartsWith(strTLine, "ColumnInfo =") _
+                        Or StartsWith(strTLine, "BaseInfo =") Then
+                        ' [ColumnInfo] contains some cached info from the record source
+                        ' and will be regenerated when the form is imported. See #412
+                        ' [BaseInfo] is used with combo boxes, similar to RowSource.
                         ' Since the value could span multiple lines, we need to
                         ' check the indent level of the following lines to see how
                         ' many lines to skip.
@@ -193,7 +196,7 @@ Public Function SanitizeFile(strPath As String, blnReturnHash As Boolean) As Str
                         SkipLine lngLine, eslAggressive
                     ElseIf blnIsReport And StartsWith(strLine, "    Bottom =") Then
                         ' Turn flag back off now that we have ignored these two lines.
-                        SkipLine lngLine
+                        SkipLine lngLine, eslAggressive
                         blnIsReport = False
                     ElseIf StartsWith(strTLine, "Begin ") Then
                         ' Include block type name for controls