Discard column metadata on pass-through query export

Dynamically generated column information seems to change during normal usage of pass-through queries between database builds. Discarding this information reduces the "noise" of source changes when no actual design changes were made to the objects. Closes #182

Version Control.accda.src/dbs-properties.json

@@ -41,7 +41,7 @@
       "Type": 10
     },
     "AppVersion": {
-      "Value": "3.3.1",
+      "Value": "3.3.2",
       "Type": 10
     },
     "Auto Compact": {

Version Control.accda.src/modules/modSanitize.bas

@@ -8,6 +8,8 @@ Option Compare Database
 Option Private Module
 Option Explicit
 
+Private Const ModuleName = "modSanitize"
+
 
 '---------------------------------------------------------------------------------------
 ' Procedure : SanitizeFile
@@ -27,8 +29,11 @@ Public Sub SanitizeFile(strPath As String)
     Dim blnInsideIgnoredBlock As Boolean
     Dim intIndent As Integer
     Dim blnIsReport As Boolean
+    Dim blnIsPassThroughQuery As Boolean
     Dim sngStartTime As Single
     Dim strTempFile As String
+
+    On Error Resume Next
 
     ' Read text from file, and split into lines
     If HasUcs2Bom(strPath) Then
@@ -125,7 +130,16 @@ Public Sub SanitizeFile(strPath As String)
                     ' Turn flag on to ignore Right and Bottom lines
                     blnIsReport = True
                     cData.Add strLine
-
+
+                ' Beginning of main section
+                Case "Begin"
+                    If blnIsPassThroughQuery And Options.AggressiveSanitize Then
+                        ' Ignore remaining content. (See Issue #182)
+                        Exit Do
+                    Else
+                        cData.Add strLine
+                    End If
+
                 Case Else
                     If blnInsideIgnoredBlock Then
                         ' Skip if we are in an ignored block
@@ -150,6 +164,11 @@ Public Sub SanitizeFile(strPath As String)
                     Else
                         ' All other lines will be added.
                         cData.Add strLine
+
+                        ' Check for pass-through query connection string
+                        If StartsWith(strLine, "dbMemo ""Connect"" =""") Then
+                            blnIsPassThroughQuery = True
+                        End If
                     End If
 
             End Select
@@ -169,6 +188,9 @@ Public Sub SanitizeFile(strPath As String)
     ' Replace original file with sanitized version
     WriteFile cData.GetStr, strPath
 
+    ' Log any errors
+    CatchAny eelError, "Error sanitizing file " & FSO.GetFileName(strPath), ModuleName & ".SanitizeFile"
+
 End Sub
 
 

Version Control.accda.src/vbe-project.json

@@ -5,7 +5,7 @@
   },
   "Items": {
     "Name": "MSAccessVCS",
-    "Description": "Version 3.3.0 deployed on 2/23/2021",
+    "Description": "Version 3.3.2 deployed on 2/24/2021",
     "FileName": "rel:Version Control.accda",
     "HelpFile": "",
     "HelpContextId": 0,

Version Control.accda.src/vcs-options.json

@@ -1,6 +1,6 @@
 {
   "Info": {
-    "AddinVersion": "3.3.0",
+    "AddinVersion": "3.3.2",
     "AccessVersion": "14.0 32-bit"
   },
   "Options": {