Merge pull request #187 from A9G-Data-Droid/testASCII

Merging numerous updates to simplify the Unicode conversion process. See #186 for additional details.

.gitignore

@@ -9,10 +9,7 @@
 *.laccdb
 
 # Comment out the following line if you wish to include the log files in git.
-Export.log
-Import.log
-Build.log
-Merge.log
+*.log
 
 # The local VCS index file is paired with the database and should not
 # be comitted to version control.

Testing/Testing.accdb.src/dbs-properties.json

@@ -1,4 +1,4 @@
-{
+{
   "Info": {
     "Class": "clsDbProperty",
     "Description": "Database Properties (DAO)"

Testing/Testing.accdb.src/forms/frmMain.bas

@@ -15,7 +15,7 @@ Begin Form
     ItemSuffix =13
     Right =15975
     Bottom =11745
-    DatasheetGridlinesColor =14806254
+    DatasheetGridlinesColor =15132391
     RecSrcDt = Begin
         0x18691eff0b76e540
     End
@@ -186,10 +186,10 @@ Begin Form
                     LayoutCachedWidth =8520
                     LayoutCachedHeight =3660
                     PictureCaptionArrangement =5
-                    BackColor =14136213
-                    BorderColor =14136213
-                    HoverColor =15060409
-                    PressedColor =9592887
+                    BackColor =14461583
+                    BorderColor =14461583
+                    HoverColor =15189940
+                    PressedColor =9917743
                     HoverForeColor =4210752
                     PressedForeColor =4210752
                     WebImagePaddingLeft =2
@@ -314,10 +314,10 @@ Begin Form
                     LayoutCachedWidth =8520
                     LayoutCachedHeight =4620
                     PictureCaptionArrangement =5
-                    BackColor =14136213
-                    BorderColor =14136213
-                    HoverColor =15060409
-                    PressedColor =9592887
+                    BackColor =14461583
+                    BorderColor =14461583
+                    HoverColor =15189940
+                    PressedColor =9917743
                     HoverForeColor =4210752
                     PressedForeColor =4210752
                     WebImagePaddingLeft =2

Testing/Testing.accdb.src/macros/AutoExec.bas

@@ -1,4 +1,4 @@
-Version =196611
+Version =196611
 ColumnsShown =0
 Begin
     Action ="OpenForm"

Testing/Testing.accdb.src/modules/basExtendedChars.bas

@@ -1,6 +1,6 @@
 Option Compare Database
 Option Explicit
 
-' The following line uses extended ASCII characters
-' and should show up as a solid line.
-'—————————————————————————————————————————————————————————
+' This module is used to prove that all ASCII characters survive the export\import cycle.
+
+'——————————————————————————————————————————————————————————————————————————————————————————

Testing/Testing.accdb.src/nav-pane-groups.json

@@ -1,30 +1,16 @@
-{
+{
   "Info": {
     "Class": "clsDbNavPaneGroup",
     "Description": "Navigation Pane Custom Groups",
     "Export File Format": 1.1
   },
   "Items": {
     "Categories": [
-      {
-        "Name": "Custom",
-        "Flags": 0,
-        "Position": 3,
-        "Groups": [
-        ]
-      },
       {
         "Name": "My Category",
         "Flags": 0,
         "Position": 2,
         "Groups": [
-          {
-            "Name": "Unassigned Objects",
-            "Flags": 4,
-            "Position": 1,
-            "Objects": [
-            ]
-          },
           {
             "Name": "Macros & Reports",
             "Flags": 0,
@@ -77,7 +63,7 @@
           {
             "Name": "Unassigned Objects",
             "Flags": 4,
-            "Position": 3,
+            "Position": 1,
             "Objects": [
             ]
           }

Testing/Testing.accdb.src/queries/qryNavigationPaneGroups.bas

@@ -1,4 +1,4 @@
-Operation =1
+Operation =1
 Option =0
 Where ="(((MSysNavPaneGroups.Name) Is Not Null) AND ((MSysNavPaneGroups.GroupCategoryID)"
     "=3))"

Testing/Testing.accdb.src/queries/qryNavigationPaneGroups.sql

@@ -1,4 +1,4 @@
-SELECT MSysNavPaneGroups.Name AS GroupName, MSysNavPaneGroups.Flags AS GroupFlags, MSysNavPaneGroups.Position AS GroupPosition, MSysObjects.Type AS ObjectType, MSysObjects.Name AS ObjectName, MSysNavPaneGroupToObjects.Flags AS ObjectFlags, MSysNavPaneGroupToObjects.Icon AS ObjectIcon, MSysNavPaneGroupToObjects.Position AS ObjectPosition
+SELECT MSysNavPaneGroups.Name AS GroupName, MSysNavPaneGroups.Flags AS GroupFlags, MSysNavPaneGroups.Position AS GroupPosition, MSysObjects.Type AS ObjectType, MSysObjects.Name AS ObjectName, MSysNavPaneGroupToObjects.Flags AS ObjectFlags, MSysNavPaneGroupToObjects.Icon AS ObjectIcon, MSysNavPaneGroupToObjects.Position AS ObjectPosition
 FROM MSysNavPaneGroups LEFT JOIN (MSysNavPaneGroupToObjects LEFT JOIN MSysObjects ON MSysNavPaneGroupToObjects.ObjectID = MSysObjects.Id) ON MSysNavPaneGroups.Id = MSysNavPaneGroupToObjects.GroupID
 WHERE (((MSysNavPaneGroups.Name) Is Not Null) AND ((MSysNavPaneGroups.GroupCategoryID)=3))
 ORDER BY MSysNavPaneGroups.Name, MSysObjects.Type, MSysObjects.Name;

Testing/Testing.accdb.src/reports/rptDefaultPrinter.bas

@@ -1,4 +1,4 @@
-Version =20
+Version =20
 VersionRequired =20
 Begin Report
     LayoutForPrint = NotDefault
@@ -13,7 +13,7 @@ Begin Report
     Width =8884
     DatasheetFontHeight =11
     ItemSuffix =1
-    DatasheetGridlinesColor =14806254
+    DatasheetGridlinesColor =15132391
     RecSrcDt = Begin
         0xe05ff061b477e540
     End

Testing/Testing.accdb.src/reports/rptNavigationPaneGroups.bas

@@ -1,4 +1,4 @@
-Version =20
+Version =20
 VersionRequired =20
 Begin Report
     LayoutForPrint = NotDefault
@@ -13,7 +13,7 @@ Begin Report
     Width =11700
     DatasheetFontHeight =11
     ItemSuffix =7
-    DatasheetGridlinesColor =14806254
+    DatasheetGridlinesColor =15132391
     RecSrcDt = Begin
         0x2df649898e77e540
     End
@@ -74,7 +74,7 @@ Begin Report
         Begin FormHeader
             KeepTogether = NotDefault
             Height =960
-            BackColor =15849926
+            BackColor =15064278
             Name ="ReportHeader"
             AutoHeight =1
             AlternateBackThemeColorIndex =1

Testing/Testing.accdb.src/reports/rptNonDefaultPaperSize.bas

@@ -1,4 +1,4 @@
-Version =20
+Version =20
 VersionRequired =20
 Begin Report
     LayoutForPrint = NotDefault
@@ -13,7 +13,7 @@ Begin Report
     Width =8884
     DatasheetFontHeight =11
     ItemSuffix =1
-    DatasheetGridlinesColor =14806254
+    DatasheetGridlinesColor =15132391
     RecSrcDt = Begin
         0xe05ff061b477e540
     End

Testing/Testing.accdb.src/tables/tblInternal.txt

@@ -1,4 +1,4 @@
-ID	ObjectType	Notes
+ID	ObjectType	Notes
 1	Table	
 2	Form	
 3	Query	

Testing/Testing.accdb.src/tables/tblSaveXML.xml

@@ -1,4 +1,4 @@
-<dataroot xmlns:od="urn:schemas-microsoft-com:officedata">
+<dataroot xmlns:od="urn:schemas-microsoft-com:officedata">
 <tblSaveXML>
 <ID>1</ID>
 <ObjectType>Table</ObjectType>

Testing/Testing.accdb.src/tbldefs/USysApplicationLog.sql

@@ -1,4 +1,4 @@
-CREATE TABLE [USysApplicationLog] (
+CREATE TABLE [USysApplicationLog] (
   [ID] AUTOINCREMENT CONSTRAINT [PrimaryKey] PRIMARY KEY UNIQUE NOT NULL,
   [SourceObject] VARCHAR (255),
   [Data Macro Instance ID] VARCHAR (255),

Testing/Testing.accdb.src/tbldefs/tblHidden.sql

@@ -1,3 +1,3 @@
-CREATE TABLE [tblHidden] (
+CREATE TABLE [tblHidden] (
   [ID] AUTOINCREMENT CONSTRAINT [PrimaryKey] PRIMARY KEY UNIQUE NOT NULL
 )

Testing/Testing.accdb.src/tbldefs/tblInternal.sql

@@ -1,4 +1,4 @@
-CREATE TABLE [tblInternal] (
+CREATE TABLE [tblInternal] (
   [ID] AUTOINCREMENT,
   [ObjectType] VARCHAR (255),
   [Notes] VARCHAR (255),

Testing/Testing.accdb.src/tbldefs/tblLinkedAccess.sql

@@ -1,4 +1,4 @@
-CREATE TABLE [tblLinkedAccess] (
+CREATE TABLE [tblLinkedAccess] (
   [ID] AUTOINCREMENT,
   [ObjectType] VARCHAR (255),
   [Notes] VARCHAR (255),

Testing/Testing.accdb.src/tbldefs/tblLinkedCSV.sql

@@ -1,4 +1,4 @@
-CREATE TABLE [tblLinkedCSV] (
+CREATE TABLE [tblLinkedCSV] (
   [ID] LONG ,
   [Color] VARCHAR (255)
 )

Testing/Testing.accdb.src/tbldefs/tblSaveXML.sql

@@ -1,4 +1,4 @@
-CREATE TABLE [tblSaveXML] (
+CREATE TABLE [tblSaveXML] (
   [ID] AUTOINCREMENT,
   [ObjectType] VARCHAR (255),
   [Notes] VARCHAR (255),

Testing/Testing.accdb.src/tdmacros/tblSaveXML.xml

@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-16" standalone="no"?>
+<?xml version="1.0" encoding="UTF-16" standalone="no"?>
 <DataMacros xmlns="http://schemas.microsoft.com/office/accessservices/2009/11/application"><DataMacro Event="AfterUpdate"><Statements><Action Name="SetLocalVar"><Argument Name="Name">UpdatedID</Argument><Argument Name="Value">[ID]</Argument></Action><ForEachRecord><Data><Reference>tblSaveXML</Reference><WhereCondition>[ID]=[UpdatedID]</WhereCondition></Data><Statements><EditRecord><Data/><Statements><Action Name="SetField"><Argument Name="Field">UpdateDate</Argument><Argument Name="Value">Now()</Argument></Action></Statements></EditRecord></Statements></ForEachRecord></Statements></DataMacro></DataMacros>

Testing/Testing.accdb.src/vbe-project.json

@@ -1,14 +1,13 @@
-{
+{
   "Info": {
     "Class": "clsDbVbeProject",
-    "Description": "VBE Project",
-    "VCS Version": "3.1.25"
+    "Description": "VBE Project"
   },
   "Items": {
     "Name": "VCS Testing",
     "Description": "For automated testing of Version Control",
     "FileName": "rel:Testing.accdb",
-    "HelpFile": "",
+    "HelpFile": "99672516",
     "HelpContextId": 123456,
     "Mode": 0,
     "Protection": 0,

Testing/Testing.accdb.src/vbeforms/frmForm20.frm

@@ -16,6 +16,8 @@ Attribute VB_Exposed = False
 
 
 
+
+
 Option Compare Database
 Option Explicit
 

Testing/Testing.accdb.src/vcs-options.json

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

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

@@ -1,4 +1,4 @@
-{
+{
   "Info": {
     "Class": "clsDbProperty",
     "Description": "Database Properties (DAO)"
@@ -41,7 +41,7 @@
       "Type": 10
     },
     "AppVersion": {
-      "Value": "3.3.6",
+      "Value": "3.3.7",
       "Type": 10
     },
     "Auto Compact": {
@@ -117,7 +117,7 @@
       "Type": 4
     },
     "ProjVer": {
-      "Value": 119,
+      "Value": 142,
       "Type": 3
     },
     "QueryTimeout": {
@@ -197,7 +197,7 @@
       "Type": 2
     },
     "Version": {
-      "Value": "14.0",
+      "Value": "12.0",
       "Type": 12
     },
     "WebDesignMode": {

Version Control.accda.src/forms/frmVCSInstall.bas

@@ -1,4 +1,4 @@
-Version =20
+Version =20
 VersionRequired =20
 Begin Form
     PopUp = NotDefault
@@ -21,7 +21,7 @@ Begin Form
     Top =2430
     Right =-6105
     Bottom =10335
-    DatasheetGridlinesColor =14806254
+    DatasheetGridlinesColor =15132391
     RecSrcDt = Begin
         0x79e78b777268e540
     End
@@ -1419,7 +1419,7 @@ Begin Form
                     Width =2160
                     FontSize =9
                     TabIndex =4
-                    ForeColor =16711680
+                    ForeColor =12673797
                     Name ="cmdExplainOptions"
                     Caption ="Explain options..."
                     HyperlinkAddress ="https://github.com/joyfullservice/msaccess-vcs-integration/wiki/Installation"
@@ -1527,10 +1527,10 @@ Begin Form
                     LayoutCachedTop =120
                     LayoutCachedWidth =7080
                     LayoutCachedHeight =300
-                    BackColor =14136213
-                    BorderColor =14136213
-                    HoverColor =15060409
-                    PressedColor =9592887
+                    BackColor =14461583
+                    BorderColor =14461583
+                    HoverColor =15189940
+                    PressedColor =9917743
                     HoverForeColor =4210752
                     PressedForeColor =4210752
                     WebImagePaddingLeft =2

Version Control.accda.src/forms/frmVCSMain.bas

@@ -1,4 +1,4 @@
-Version =20
+Version =20
 VersionRequired =20
 Begin Form
     PopUp = NotDefault
@@ -20,7 +20,7 @@ Begin Form
     Top =2430
     Right =28545
     Bottom =15015
-    DatasheetGridlinesColor =14806254
+    DatasheetGridlinesColor =15132391
     RecSrcDt = Begin
         0x79e78b777268e540
     End
@@ -1642,7 +1642,7 @@ Begin Form
                     Height =240
                     FontSize =10
                     BorderColor =10921638
-                    ForeColor =16711680
+                    ForeColor =12673797
                     Name ="lblOpenLogFile"
                     Caption ="Open Log File..."
                     OnClick ="[Event Procedure]"