Allow sort of operationames with leading spaces #463
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If a operationname has a leading space (like " MyOperation" ) the function "SortItemsByTime" fails. Now sorting will success.
|
Thanks! I can't remember why I added the trailing space padding to the names. It seems like this is not necessary for sorting. I can always adjust it later if it causes any unforeseen issues. |
josef-poetzl
added a commit
to josef-poetzl/msaccess-vcs-addin
that referenced
this pull request
Nov 23, 2023
commit 90b402f Merge: 43c7133 3f01386 Author: Josef Pötzl <[email protected]> Date: Thu Nov 23 11:28:37 2023 +0100 Merge branch 'joyfullservice:dev' into dev commit 3f01386 Author: joyfullservice <[email protected]> Date: Tue Nov 21 09:55:40 2023 -0600 Add note about Access 2007 support See joyfullservice#464 commit 2bf3047 Author: joyfullservice <[email protected]> Date: Fri Nov 17 16:29:16 2023 -0600 Add default git files if dbs in repository root If you use the default options of no special export folder path defined, the project may likely be in the repository root. Add the default .gitignore and .gitattributes files if they are missing. (This would be the default setup for most projects.) commit b32ff4a Author: joyfullservice <[email protected]> Date: Fri Nov 17 14:16:49 2023 -0600 Add dates stored as text to testing database One stored as a regular date string, and the other as an ISO8601 string. (Neither should convert when reading or writing to JSON.) joyfullservice#459 commit cb66895 Author: joyfullservice <[email protected]> Date: Fri Nov 17 13:40:51 2023 -0600 Add saved date property to testing database Verifies that the round trip conversion of saved date properties is working correctly. (The dates are stored as UTC in source files, but converted to local dates when imported into the database properties.) joyfullservice#459 commit 5009bdc Author: joyfullservice <[email protected]> Date: Fri Nov 17 13:38:30 2023 -0600 Turn on date ISO conversion before reading index These dates need to be converted to local dates for internal processing. joyfullservice#459 commit b1bf7bd Author: joyfullservice <[email protected]> Date: Fri Nov 17 13:29:05 2023 -0600 Turn off date ISO conversion by default This is only used in the index and certain database properties. joyfullservice#459 commit adfaa01 Author: joyfullservice <[email protected]> Date: Fri Nov 17 11:54:37 2023 -0600 Refactor date conversion for DB Properties Save custom date properties in ISO (UTC) format in source files, without converting other property types like strings that may parse as dates. joyfullservice#459 commit 64a14de Author: joyfullservice <[email protected]> Date: Fri Nov 17 10:27:55 2023 -0600 Log warning for UNC path access errors Failing to convert a path to UNC may not prevent the operation from completing, but it should be handled and logged. Fixes joyfullservice#461 commit 8776104 Author: joyfullservice <[email protected]> Date: Fri Nov 17 10:19:03 2023 -0600 Adjust detection of system tables Switching to just using a bit flag check to solve joyfullservice#462 commit 259a8df Author: joyfullservice <[email protected]> Date: Fri Nov 17 09:29:24 2023 -0600 Update comment After removing string padding in the previous commit. commit 9b6e1dd Author: Tanarri <[email protected]> Date: Fri Nov 17 16:09:28 2023 +0100 Allow sort of operationames with leading spaces (joyfullservice#463) If a operationname has a leading space (like " MyOperation" ) the function "SortItemsByTime" fails. Now sorting will success. commit 3ad141c Author: hecon5 <[email protected]> Date: Wed Nov 15 23:04:01 2023 -0500 Addresses joyfullservice#459 (joyfullservice#460) Addresses joyfullservice#459 commit 2a183df Author: joyfullservice <[email protected]> Date: Wed Nov 15 15:59:26 2023 -0600 Solve rare edge case with SQL IN clause Just in case a user has an embedded unquoted path in a string, the colon will be treated as a non-spaced boundary character during formatting. (For Microsoft Access SQL only) Fixes joyfullservice#447 commit 1c3bce6 Author: joyfullservice <[email protected]> Date: Wed Nov 15 15:19:55 2023 -0600 Add SQL formatting query to testing database This query demonstrates that we can properly parse and format expressions that refer to controls. joyfullservice#457 commit 62fe0fd Author: joyfullservice <[email protected]> Date: Wed Nov 15 15:10:22 2023 -0600 Add support for ! boundary character This character is used in Microsoft Access in a query when referring directly to a control on a form, and should be treated similar to a period as a separator between elements. joyfullservice#457 commit 4328713 Author: joyfullservice <[email protected]> Date: Wed Nov 15 15:08:47 2023 -0600 Implement dialect in SQL formatting This was previously only partially implemented. joyfullservice#457 commit b8dfdcc Merge: 84b6f77 500b891 Author: Adam Waller <[email protected]> Date: Wed Nov 15 14:15:39 2023 -0600 Merge pull request joyfullservice#458 from hecon5/ISOOptimizations Additional Optimizations for parsing time commit 500b891 Author: Hecon5 <[email protected]> Date: Wed Nov 15 12:57:37 2023 -0500 Verify consistent naming and byref passing of strings commit 732f4e5 Author: Hecon5 <[email protected]> Date: Wed Nov 15 12:53:14 2023 -0500 Bump Version commit 0ef2d02 Author: Hecon5 <[email protected]> Date: Wed Nov 15 12:32:52 2023 -0500 Cache the format types instead of needing to build them every time. commit 1961800 Author: Hecon5 <[email protected]> Date: Wed Nov 15 12:31:57 2023 -0500 Pass by ref so we don't need to build more memory use. Optimize Offset string building to only do math when it's required and fix whitespace. commit 26bf030 Author: Hecon5 <[email protected]> Date: Wed Nov 15 12:46:13 2023 -0500 Revert the ConvDateUTC and ConvTimeUTC functions to always parse the "Fast" way first and revert otherwise. this allows the optimization to be used everywhere with no code changes. Ensure that millisecond accuracy is kept for otherse using the function. No Speed impact is noted on my end to doing this. commit 84b6f77 Merge: a666c9d 436dd45 Author: Adam Waller <[email protected]> Date: Wed Nov 15 10:04:12 2023 -0600 Merge pull request joyfullservice#456 from joyfullservice/SplitLayoutFromVBA Split form/report layout definitions from VBA code commit 436dd45 Author: joyfullservice <[email protected]> Date: Wed Nov 15 09:32:12 2023 -0600 Adjust version number I am using the minor version number to represent releases from the main branch, and the build number to continuously increment during the development cycle. commit 68e01a7 Author: joyfullservice <[email protected]> Date: Wed Nov 15 09:25:32 2023 -0600 Split layout from VBA in testing database Separates the VBA code from the layout definition in the source files. (Applying to testing database now, will apply to main project soon.) commit 923a72b Merge: fe35d3b bc23513 Author: joyfullservice <[email protected]> Date: Wed Nov 15 09:22:10 2023 -0600 Split files while preserving history commit bc23513 Author: joyfullservice <[email protected]> Date: Wed Nov 15 09:22:04 2023 -0600 Restore original files commit c28f32b Author: joyfullservice <[email protected]> Date: Wed Nov 15 09:21:59 2023 -0600 Rename as new files commit fe35d3b Author: joyfullservice <[email protected]> Date: Tue Nov 14 15:44:30 2023 -0600 Add Split Files utility to ribbon (Advanced Tools) Also added an informational message box when the split is complete. commit b7985e9 Author: joyfullservice <[email protected]> Date: Tue Nov 14 15:42:19 2023 -0600 Use faster date parsing for date only values commit e18d818 Author: joyfullservice <[email protected]> Date: Tue Nov 14 15:41:10 2023 -0600 Update error handling Refactored a number of locations to use the new syntax for On Error Resume Next, and added code to clear expected errors. commit aff7be9 Author: joyfullservice <[email protected]> Date: Tue Nov 14 09:21:33 2023 -0600 Fix copy-paste oversight joyfullservice#354 commit 286679d Author: joyfullservice <[email protected]> Date: Tue Nov 14 09:03:32 2023 -0600 Add high-performance wrapper functions Avoids the use of RegEx when it is not necessary to parse a standard date format. joyfullservice#354 commit d5e76f7 Author: joyfullservice <[email protected]> Date: Tue Nov 14 09:02:39 2023 -0600 Add performance timing to ISO date parsing See joyfullservice#354 commit de4602e Author: hecon5 <[email protected]> Date: Mon Nov 13 16:56:40 2023 -0500 Fixes joyfullservice#354 and Fixes joyfullservice#452 (joyfullservice#454) From @hecon5: Bump version minor number because it's not clear that the index will allow round trip from prior types in all cases; it worked on my machine, but that may not always be the case. The date types for the index are handled natively by modJsonConverter and should import/export correctly regardless of user's date / time zone or date encoding on machines. commit e723123 Author: joyfullservice <[email protected]> Date: Mon Nov 13 15:51:10 2023 -0600 Rename function Git.Installed sounds better than Git.GitInstalled, and will almost always be called in the context of the git class. commit e2049fa Author: joyfullservice <[email protected]> Date: Mon Nov 13 15:49:49 2023 -0600 Automate splitting forms and reports Adds a link and some code automation to split forms and reports in existing projects to layout and class files. commit 07bc57c Author: joyfullservice <[email protected]> Date: Mon Nov 13 15:48:48 2023 -0600 Add change hook for options Used for special processing when certain options change. commit ff706a4 Merge: 9577eab 7b8be8f Author: joyfullservice <[email protected]> Date: Mon Nov 13 15:18:55 2023 -0600 Merge branch 'SplitLayoutFromVBA' of https://github.com/joyfullservice/msaccess-vcs-addin into SplitLayoutFromVBA commit 9577eab Author: joyfullservice <[email protected]> Date: Mon Nov 13 15:08:11 2023 -0600 Add wiki page for Split Files Describes the process in a little more detail. commit 7b8be8f Author: Tanarri <[email protected]> Date: Fri Nov 10 15:24:54 2023 +0100 Implement correction according to rubberduck (joyfullservice#453) replace VBA commands: format with format$ trim with trim$ commit 925b019 Author: joyfullservice <[email protected]> Date: Wed Nov 8 17:04:08 2023 -0600 Check for diff tool before comparing objects commit 4f9247d Author: joyfullservice <[email protected]> Date: Wed Nov 8 17:02:50 2023 -0600 Fix bugs in build logic Uncovered these while testing. commit 8f1649a Author: joyfullservice <[email protected]> Date: Wed Nov 8 16:18:47 2023 -0600 Code cleanup and minor tweaks commit 9069232 Author: joyfullservice <[email protected]> Date: Wed Nov 8 15:45:32 2023 -0600 Add support to overlay VBA code after import For some (rare) situations, it is necessary to push the VBA code directly using VBE to preserve certain extended characters that may be corrupted in a regular round-trip export/import cycle. commit 932ac84 Author: joyfullservice <[email protected]> Date: Wed Nov 8 15:41:33 2023 -0600 Rework merging source content before import Cleaning this up to avoid reading and writing the file additional times while merging content from different sources. (Print settings, VBA code) commit 1390f2c Author: joyfullservice <[email protected]> Date: Wed Nov 8 15:37:32 2023 -0600 Move source reading function This is used in several areas, and allows us to maintain the source file encoding determination in a single location. commit 54e070a Author: joyfullservice <[email protected]> Date: Wed Nov 8 15:35:24 2023 -0600 Move print settings processing to clsSourceParser This keeps the LoadComponentFromText function cleaner and easier to read. commit 43c7133 Merge: a666c9d 3e82751 Author: Josef Pötzl <[email protected]> Date: Wed Nov 8 01:04:24 2023 +0100 Merge branch 'dev-jp' into dev commit da9f94a Author: joyfullservice <[email protected]> Date: Mon Nov 6 16:11:33 2023 -0600 Don't auto split layout/VBA for existing projects For existing projects in git repositories, form and report layouts should not be automatically split from the VBA code classes. There is another process that will allow us to split the files while preserving history in both files, but this involves a couple commits and requires a clean branch. For existing projects, this is a manual upgrade (option changes). For new projects, it can happen by default. commit 2d21eb6 Author: joyfullservice <[email protected]> Date: Fri Nov 3 11:48:21 2023 -0500 Verify ribbon active state when the add-in loads Ensure that the ribbon is active when installing or activating the add-in. See joyfullservice#451 commit c2ffccf Author: joyfullservice <[email protected]> Date: Thu Nov 2 17:27:43 2023 -0500 Refactor for name change commit 47c6506 Author: joyfullservice <[email protected]> Date: Thu Nov 2 17:21:57 2023 -0500 Rename Sanitize class to SourceParser This better reflects the expanded role of the class. commit 89101c5 Author: joyfullservice <[email protected]> Date: Thu Nov 2 15:06:49 2023 -0500 Refactor form/report export to split VBA Export is now splitting the VBA from Form and Report objects to separate files with a .cls extension. Moving on to the code that will stitch these files back together before import. commit c87261a Author: joyfullservice <[email protected]> Date: Wed Oct 25 16:49:04 2023 -0500 Refactor class variables commit 1c0d3f4 Author: joyfullservice <[email protected]> Date: Wed Oct 25 16:30:30 2023 -0500 Refactor sanitizing to use class Updating the existing code to use the new class. commit 8e70ad2 Author: joyfullservice <[email protected]> Date: Wed Oct 25 16:20:38 2023 -0500 Convert Sanitize module to class In some cases sanitizing a source file actually creates two distinct outputs. A layout file and a code file. Rather than making the sanitize function more complicated with byref outputs and non-obvious side effects, I am taking the approach of a more explicit object-oriented route where the code is easier to understand and maintain. (And also allows for future enhancements such as SQL extraction for query definition files.) commit 1ca6886 Author: joyfullservice <[email protected]> Date: Wed Oct 25 16:08:09 2023 -0500 Adjust indenting (minor change) commit 0beaee5 Author: joyfullservice <[email protected]> Date: Wed Oct 25 11:53:30 2023 -0500 Support "|" in performance log entry names Refactored parsing the key from the performance item so that we are not dependent upon a unique delimiter. The timing value is always a number, so we can be confident that the first pipe character is the delimiter. The text after that can be anything, including pipe characters. joyfullservice#450 commit 07e364e Author: joyfullservice <[email protected]> Date: Tue Oct 24 14:16:53 2023 -0500 Refactor code module export to shared function This logic will be shared when exporting code modules from forms and reports. commit 40cffbc Author: joyfullservice <[email protected]> Date: Tue Oct 24 13:49:52 2023 -0500 Add option to SplitLayoutFromVBA This option (on by default) will save the VBA code from forms and reports as a related .cls file. (Still under development.) joyfullservice#378 Also removed the "Strip out Publish Option" from the options form. I have never heard of a case where this needs to be changed, and it frees up space for the new option we are adding without cluttering the form. commit a666c9d Author: hecon5 <[email protected]> Date: Fri Oct 20 16:33:38 2023 -0400 Fix issue with LogUnhandledErrors and simplify use. (joyfullservice#449) commit 5362b37 Merge: 8f2f325 490d82e Author: Adam Waller <[email protected]> Date: Fri Oct 20 13:54:57 2023 -0500 Merge pull request joyfullservice#448 from bclothier/MiscBugFixes Misc bug fixes commit 490d82e Author: bclothier <[email protected]> Date: Fri Oct 20 11:47:41 2023 -0500 The AutoClose may run after the form has closed (e.g. if the user is quick to close it) which may result in an error about object members not available. Since the form is closed, there's no point in setting the timer interval. To avoid the error when debugging, we add a IsLoaded check and skip it if it's not loaded. commit 5b5e037 Author: bclothier <[email protected]> Date: Fri Oct 20 11:46:05 2023 -0500 Add more types of queries that should not be formatted by SQL formatter because they are a variant of pass-through queries. commit 736c33c Author: bclothier <[email protected]> Date: Fri Oct 20 11:45:31 2023 -0500 Fix a subscript out of range error where the tokens advance beyond the end of the string but the function GetNextTokenID returns 0, which then fails within FormatSQL function since there is no member at index 0. It's not clear why this only fails every second time a query is exported but it is the case where if it fails, exporting it next time will not yield the error. Do it 3rd time, then it fails. commit 8f2f325 Merge: 6cdac0c 0d9ac0a Author: Adam Waller <[email protected]> Date: Thu Oct 19 18:48:28 2023 -0500 Merge pull request joyfullservice#446 from bclothier/MiscBugFixes Misc bug fixes commit 0d9ac0a Author: bclothier <[email protected]> Date: Thu Oct 19 18:19:17 2023 -0500 The export log was littered with bunch of warnings about unclosed blocks. This seems to be due to not closing it when evaluating the UseTheme. Even if we skipped it, we still need to remove it from m_colBlocks to balance everything out. commit 4703b7b Author: bclothier <[email protected]> Date: Thu Oct 19 18:17:33 2023 -0500 Add a check when loading XML and verify it was successfully parsed. This avoid generating a bad export where the data are not actually exported due to invalid XML being generated by Application.ExportXML. Unfortunately, if a table contains any characters that aren't valid for XML document, it won't try to escape them and include them as literals. Even if they were escaped, they might not be accepted anyway. XML specifications forbids having any characters in 0x01-0x31 range so if a table data contains such characters, this can cause the XML export to fail. In this case, tab delimited will have to be used instead. However, the previous version was simply silently exporting as if everything is hunky-dory when it's not. Hence, the error. commit 734d835 Author: bclothier <[email protected]> Date: Thu Oct 19 18:12:02 2023 -0500 The logic for checking of existence of git files wasn't always working as expected due to searching the current directory rather than using the export folder. commit 6cdac0c Author: joyfullservice <[email protected]> Date: Thu Oct 19 16:20:29 2023 -0500 Add option to pass path to build API You can now specify the source files path when you initiate a build through the API. This allows automated builds to be run even if a copy of the database does not yet exist. (Such as after checking out a project in an automated CI workflow.) joyfullservice#430 commit b418a54 Merge: 1cda774 b1af656 Author: Adam Waller <[email protected]> Date: Thu Oct 19 15:21:12 2023 -0500 Merge pull request joyfullservice#441 from hecon5/clsPerformanceUpdates Updating clsPerformance, as some objects never restart timing, and wh… commit b1af656 Merge: 8c6d7f9 1cda774 Author: Adam Waller <[email protected]> Date: Thu Oct 19 15:20:32 2023 -0500 Merge branch 'dev' into clsPerformanceUpdates commit 8c6d7f9 Author: joyfullservice <[email protected]> Date: Thu Oct 19 15:18:28 2023 -0500 Resolve conflict with upstream file Putting the comma after the argument seems to be the preferred industry-standard approach, based on ChatGPT and Bard. commit eae289b Author: Hecon5 <[email protected]> Date: Thu Oct 19 15:41:03 2023 -0400 Update based on feedback from @joyfullservice. commit 1cda774 Author: joyfullservice <[email protected]> Date: Thu Oct 19 14:02:29 2023 -0500 Allow wrapping of long names in performance class Extending the performance class to allow the wrapping of long names used for categories or operations. (Not really needed within this project, but could potentially be helpful in the future with translations.) joyfullservice#441 commit 3273089 Author: joyfullservice <[email protected]> Date: Mon Oct 2 11:29:03 2023 -0500 Refine some dialect-specific SQL string quotations Backticks only apply to MySQL, while square brackets are used with MSSQL and Access. joyfullservice#442 commit 62fde81 Author: joyfullservice <[email protected]> Date: Mon Oct 2 11:19:38 2023 -0500 Update API examples Removed dependency on an external function, and added an example for building from source. commit 6e8007a Author: Hecon5 <[email protected]> Date: Sat Sep 23 09:26:30 2023 -0400 Bump Version commit bd24538 Author: Hecon5 <[email protected]> Date: Sat Sep 23 09:21:13 2023 -0400 This isn't actually used. commit 4a27077 Author: Hecon5 <[email protected]> Date: Sat Sep 23 09:19:57 2023 -0400 Fixing Private/Public declarations. commit 53394a8 Author: Hecon5 <[email protected]> Date: Sat Sep 23 09:03:00 2023 -0400 Updating clsPerformance, as some objects never restart timing, and when resetting some objects are not cleared. Fixes joyfullservice#331
josef-poetzl
added a commit
to josef-poetzl/msaccess-vcs-addin
that referenced
this pull request
Nov 23, 2023
* Updating clsPerformance, as some objects never restart timing, and when resetting some objects are not cleared. Fixes joyfullservice#331 * Fixing Private/Public declarations. * This isn't actually used. * Bump Version * Update API examples Removed dependency on an external function, and added an example for building from source. * Refine some dialect-specific SQL string quotations Backticks only apply to MySQL, while square brackets are used with MSSQL and Access. joyfullservice#442 * Allow wrapping of long names in performance class Extending the performance class to allow the wrapping of long names used for categories or operations. (Not really needed within this project, but could potentially be helpful in the future with translations.) joyfullservice#441 * Update based on feedback from @joyfullservice. * Resolve conflict with upstream file Putting the comma after the argument seems to be the preferred industry-standard approach, based on ChatGPT and Bard. * Add option to pass path to build API You can now specify the source files path when you initiate a build through the API. This allows automated builds to be run even if a copy of the database does not yet exist. (Such as after checking out a project in an automated CI workflow.) joyfullservice#430 * The logic for checking of existence of git files wasn't always working as expected due to searching the current directory rather than using the export folder. * Add a check when loading XML and verify it was successfully parsed. This avoid generating a bad export where the data are not actually exported due to invalid XML being generated by Application.ExportXML. Unfortunately, if a table contains any characters that aren't valid for XML document, it won't try to escape them and include them as literals. Even if they were escaped, they might not be accepted anyway. XML specifications forbids having any characters in 0x01-0x31 range so if a table data contains such characters, this can cause the XML export to fail. In this case, tab delimited will have to be used instead. However, the previous version was simply silently exporting as if everything is hunky-dory when it's not. Hence, the error. * The export log was littered with bunch of warnings about unclosed blocks. This seems to be due to not closing it when evaluating the UseTheme. Even if we skipped it, we still need to remove it from m_colBlocks to balance everything out. * Fix a subscript out of range error where the tokens advance beyond the end of the string but the function GetNextTokenID returns 0, which then fails within FormatSQL function since there is no member at index 0. It's not clear why this only fails every second time a query is exported but it is the case where if it fails, exporting it next time will not yield the error. Do it 3rd time, then it fails. * Add more types of queries that should not be formatted by SQL formatter because they are a variant of pass-through queries. * The AutoClose may run after the form has closed (e.g. if the user is quick to close it) which may result in an error about object members not available. Since the form is closed, there's no point in setting the timer interval. To avoid the error when debugging, we add a IsLoaded check and skip it if it's not loaded. * Fix issue with LogUnhandledErrors and simplify use. (joyfullservice#449) * Add option to SplitLayoutFromVBA This option (on by default) will save the VBA code from forms and reports as a related .cls file. (Still under development.) joyfullservice#378 Also removed the "Strip out Publish Option" from the options form. I have never heard of a case where this needs to be changed, and it frees up space for the new option we are adding without cluttering the form. * Refactor code module export to shared function This logic will be shared when exporting code modules from forms and reports. * Support "|" in performance log entry names Refactored parsing the key from the performance item so that we are not dependent upon a unique delimiter. The timing value is always a number, so we can be confident that the first pipe character is the delimiter. The text after that can be anything, including pipe characters. joyfullservice#450 * Adjust indenting (minor change) * Convert Sanitize module to class In some cases sanitizing a source file actually creates two distinct outputs. A layout file and a code file. Rather than making the sanitize function more complicated with byref outputs and non-obvious side effects, I am taking the approach of a more explicit object-oriented route where the code is easier to understand and maintain. (And also allows for future enhancements such as SQL extraction for query definition files.) * Refactor sanitizing to use class Updating the existing code to use the new class. * Refactor class variables * Refactor form/report export to split VBA Export is now splitting the VBA from Form and Report objects to separate files with a .cls extension. Moving on to the code that will stitch these files back together before import. * Rename Sanitize class to SourceParser This better reflects the expanded role of the class. * Refactor for name change * Verify ribbon active state when the add-in loads Ensure that the ribbon is active when installing or activating the add-in. See joyfullservice#451 * Don't auto split layout/VBA for existing projects For existing projects in git repositories, form and report layouts should not be automatically split from the VBA code classes. There is another process that will allow us to split the files while preserving history in both files, but this involves a couple commits and requires a clean branch. For existing projects, this is a manual upgrade (option changes). For new projects, it can happen by default. * Move print settings processing to clsSourceParser This keeps the LoadComponentFromText function cleaner and easier to read. * Move source reading function This is used in several areas, and allows us to maintain the source file encoding determination in a single location. * Rework merging source content before import Cleaning this up to avoid reading and writing the file additional times while merging content from different sources. (Print settings, VBA code) * Add support to overlay VBA code after import For some (rare) situations, it is necessary to push the VBA code directly using VBE to preserve certain extended characters that may be corrupted in a regular round-trip export/import cycle. * Code cleanup and minor tweaks * Fix bugs in build logic Uncovered these while testing. * Check for diff tool before comparing objects * Implement correction according to rubberduck (joyfullservice#453) replace VBA commands: format with format$ trim with trim$ * Add wiki page for Split Files Describes the process in a little more detail. * Add change hook for options Used for special processing when certain options change. * Automate splitting forms and reports Adds a link and some code automation to split forms and reports in existing projects to layout and class files. * Rename function Git.Installed sounds better than Git.GitInstalled, and will almost always be called in the context of the git class. * Fixes joyfullservice#354 and Fixes joyfullservice#452 (joyfullservice#454) From @hecon5: Bump version minor number because it's not clear that the index will allow round trip from prior types in all cases; it worked on my machine, but that may not always be the case. The date types for the index are handled natively by modJsonConverter and should import/export correctly regardless of user's date / time zone or date encoding on machines. * Add performance timing to ISO date parsing See joyfullservice#354 * Add high-performance wrapper functions Avoids the use of RegEx when it is not necessary to parse a standard date format. joyfullservice#354 * Fix copy-paste oversight joyfullservice#354 * Update error handling Refactored a number of locations to use the new syntax for On Error Resume Next, and added code to clear expected errors. * Use faster date parsing for date only values * Add Split Files utility to ribbon (Advanced Tools) Also added an informational message box when the split is complete. * Rename as new files * Restore original files * Split layout from VBA in testing database Separates the VBA code from the layout definition in the source files. (Applying to testing database now, will apply to main project soon.) * Adjust version number I am using the minor version number to represent releases from the main branch, and the build number to continuously increment during the development cycle. * Revert the ConvDateUTC and ConvTimeUTC functions to always parse the "Fast" way first and revert otherwise. this allows the optimization to be used everywhere with no code changes. Ensure that millisecond accuracy is kept for otherse using the function. No Speed impact is noted on my end to doing this. * Pass by ref so we don't need to build more memory use. Optimize Offset string building to only do math when it's required and fix whitespace. * Cache the format types instead of needing to build them every time. * Bump Version * Verify consistent naming and byref passing of strings * Implement dialect in SQL formatting This was previously only partially implemented. joyfullservice#457 * Add support for ! boundary character This character is used in Microsoft Access in a query when referring directly to a control on a form, and should be treated similar to a period as a separator between elements. joyfullservice#457 * Add SQL formatting query to testing database This query demonstrates that we can properly parse and format expressions that refer to controls. joyfullservice#457 * Solve rare edge case with SQL IN clause Just in case a user has an embedded unquoted path in a string, the colon will be treated as a non-spaced boundary character during formatting. (For Microsoft Access SQL only) Fixes joyfullservice#447 * Addresses joyfullservice#459 (joyfullservice#460) Addresses joyfullservice#459 * Allow sort of operationames with leading spaces (joyfullservice#463) If a operationname has a leading space (like " MyOperation" ) the function "SortItemsByTime" fails. Now sorting will success. * Update comment After removing string padding in the previous commit. * Adjust detection of system tables Switching to just using a bit flag check to solve joyfullservice#462 * Log warning for UNC path access errors Failing to convert a path to UNC may not prevent the operation from completing, but it should be handled and logged. Fixes joyfullservice#461 * Refactor date conversion for DB Properties Save custom date properties in ISO (UTC) format in source files, without converting other property types like strings that may parse as dates. joyfullservice#459 * Turn off date ISO conversion by default This is only used in the index and certain database properties. joyfullservice#459 * Turn on date ISO conversion before reading index These dates need to be converted to local dates for internal processing. joyfullservice#459 * Add saved date property to testing database Verifies that the round trip conversion of saved date properties is working correctly. (The dates are stored as UTC in source files, but converted to local dates when imported into the database properties.) joyfullservice#459 * Add dates stored as text to testing database One stored as a regular date string, and the other as an ISO8601 string. (Neither should convert when reading or writing to JSON.) joyfullservice#459 * Add default git files if dbs in repository root If you use the default options of no special export folder path defined, the project may likely be in the repository root. Add the default .gitignore and .gitattributes files if they are missing. (This would be the default setup for most projects.) * Add note about Access 2007 support See joyfullservice#464 --------- Co-authored-by: Hecon5 <[email protected]> Co-authored-by: joyfullservice <[email protected]> Co-authored-by: bclothier <[email protected]> Co-authored-by: Tanarri <[email protected]>
josef-poetzl
added a commit
to josef-poetzl/msaccess-vcs-addin
that referenced
this pull request
Jan 19, 2024
* Updating clsPerformance, as some objects never restart timing, and when resetting some objects are not cleared. Fixes joyfullservice#331 * Fixing Private/Public declarations. * This isn't actually used. * Bump Version * Update API examples Removed dependency on an external function, and added an example for building from source. * Refine some dialect-specific SQL string quotations Backticks only apply to MySQL, while square brackets are used with MSSQL and Access. joyfullservice#442 * Allow wrapping of long names in performance class Extending the performance class to allow the wrapping of long names used for categories or operations. (Not really needed within this project, but could potentially be helpful in the future with translations.) joyfullservice#441 * Update based on feedback from @joyfullservice. * Resolve conflict with upstream file Putting the comma after the argument seems to be the preferred industry-standard approach, based on ChatGPT and Bard. * Add option to pass path to build API You can now specify the source files path when you initiate a build through the API. This allows automated builds to be run even if a copy of the database does not yet exist. (Such as after checking out a project in an automated CI workflow.) joyfullservice#430 * The logic for checking of existence of git files wasn't always working as expected due to searching the current directory rather than using the export folder. * Add a check when loading XML and verify it was successfully parsed. This avoid generating a bad export where the data are not actually exported due to invalid XML being generated by Application.ExportXML. Unfortunately, if a table contains any characters that aren't valid for XML document, it won't try to escape them and include them as literals. Even if they were escaped, they might not be accepted anyway. XML specifications forbids having any characters in 0x01-0x31 range so if a table data contains such characters, this can cause the XML export to fail. In this case, tab delimited will have to be used instead. However, the previous version was simply silently exporting as if everything is hunky-dory when it's not. Hence, the error. * The export log was littered with bunch of warnings about unclosed blocks. This seems to be due to not closing it when evaluating the UseTheme. Even if we skipped it, we still need to remove it from m_colBlocks to balance everything out. * Fix a subscript out of range error where the tokens advance beyond the end of the string but the function GetNextTokenID returns 0, which then fails within FormatSQL function since there is no member at index 0. It's not clear why this only fails every second time a query is exported but it is the case where if it fails, exporting it next time will not yield the error. Do it 3rd time, then it fails. * Add more types of queries that should not be formatted by SQL formatter because they are a variant of pass-through queries. * The AutoClose may run after the form has closed (e.g. if the user is quick to close it) which may result in an error about object members not available. Since the form is closed, there's no point in setting the timer interval. To avoid the error when debugging, we add a IsLoaded check and skip it if it's not loaded. * Fix issue with LogUnhandledErrors and simplify use. (joyfullservice#449) * Add option to SplitLayoutFromVBA This option (on by default) will save the VBA code from forms and reports as a related .cls file. (Still under development.) joyfullservice#378 Also removed the "Strip out Publish Option" from the options form. I have never heard of a case where this needs to be changed, and it frees up space for the new option we are adding without cluttering the form. * Refactor code module export to shared function This logic will be shared when exporting code modules from forms and reports. * Support "|" in performance log entry names Refactored parsing the key from the performance item so that we are not dependent upon a unique delimiter. The timing value is always a number, so we can be confident that the first pipe character is the delimiter. The text after that can be anything, including pipe characters. joyfullservice#450 * Adjust indenting (minor change) * Convert Sanitize module to class In some cases sanitizing a source file actually creates two distinct outputs. A layout file and a code file. Rather than making the sanitize function more complicated with byref outputs and non-obvious side effects, I am taking the approach of a more explicit object-oriented route where the code is easier to understand and maintain. (And also allows for future enhancements such as SQL extraction for query definition files.) * Refactor sanitizing to use class Updating the existing code to use the new class. * Refactor class variables * Refactor form/report export to split VBA Export is now splitting the VBA from Form and Report objects to separate files with a .cls extension. Moving on to the code that will stitch these files back together before import. * Rename Sanitize class to SourceParser This better reflects the expanded role of the class. * Refactor for name change * Verify ribbon active state when the add-in loads Ensure that the ribbon is active when installing or activating the add-in. See joyfullservice#451 * Don't auto split layout/VBA for existing projects For existing projects in git repositories, form and report layouts should not be automatically split from the VBA code classes. There is another process that will allow us to split the files while preserving history in both files, but this involves a couple commits and requires a clean branch. For existing projects, this is a manual upgrade (option changes). For new projects, it can happen by default. * Move print settings processing to clsSourceParser This keeps the LoadComponentFromText function cleaner and easier to read. * Move source reading function This is used in several areas, and allows us to maintain the source file encoding determination in a single location. * Rework merging source content before import Cleaning this up to avoid reading and writing the file additional times while merging content from different sources. (Print settings, VBA code) * Add support to overlay VBA code after import For some (rare) situations, it is necessary to push the VBA code directly using VBE to preserve certain extended characters that may be corrupted in a regular round-trip export/import cycle. * Code cleanup and minor tweaks * Fix bugs in build logic Uncovered these while testing. * Check for diff tool before comparing objects * Implement correction according to rubberduck (joyfullservice#453) replace VBA commands: format with format$ trim with trim$ * Add wiki page for Split Files Describes the process in a little more detail. * Add change hook for options Used for special processing when certain options change. * Automate splitting forms and reports Adds a link and some code automation to split forms and reports in existing projects to layout and class files. * Rename function Git.Installed sounds better than Git.GitInstalled, and will almost always be called in the context of the git class. * Fixes joyfullservice#354 and Fixes joyfullservice#452 (joyfullservice#454) From @hecon5: Bump version minor number because it's not clear that the index will allow round trip from prior types in all cases; it worked on my machine, but that may not always be the case. The date types for the index are handled natively by modJsonConverter and should import/export correctly regardless of user's date / time zone or date encoding on machines. * Add performance timing to ISO date parsing See joyfullservice#354 * Add high-performance wrapper functions Avoids the use of RegEx when it is not necessary to parse a standard date format. joyfullservice#354 * Fix copy-paste oversight joyfullservice#354 * Update error handling Refactored a number of locations to use the new syntax for On Error Resume Next, and added code to clear expected errors. * Use faster date parsing for date only values * Add Split Files utility to ribbon (Advanced Tools) Also added an informational message box when the split is complete. * Rename as new files * Restore original files * Split layout from VBA in testing database Separates the VBA code from the layout definition in the source files. (Applying to testing database now, will apply to main project soon.) * Adjust version number I am using the minor version number to represent releases from the main branch, and the build number to continuously increment during the development cycle. * Revert the ConvDateUTC and ConvTimeUTC functions to always parse the "Fast" way first and revert otherwise. this allows the optimization to be used everywhere with no code changes. Ensure that millisecond accuracy is kept for otherse using the function. No Speed impact is noted on my end to doing this. * Pass by ref so we don't need to build more memory use. Optimize Offset string building to only do math when it's required and fix whitespace. * Cache the format types instead of needing to build them every time. * Bump Version * Verify consistent naming and byref passing of strings * Implement dialect in SQL formatting This was previously only partially implemented. joyfullservice#457 * Add support for ! boundary character This character is used in Microsoft Access in a query when referring directly to a control on a form, and should be treated similar to a period as a separator between elements. joyfullservice#457 * Add SQL formatting query to testing database This query demonstrates that we can properly parse and format expressions that refer to controls. joyfullservice#457 * Solve rare edge case with SQL IN clause Just in case a user has an embedded unquoted path in a string, the colon will be treated as a non-spaced boundary character during formatting. (For Microsoft Access SQL only) Fixes joyfullservice#447 * Addresses joyfullservice#459 (joyfullservice#460) Addresses joyfullservice#459 * Allow sort of operationames with leading spaces (joyfullservice#463) If a operationname has a leading space (like " MyOperation" ) the function "SortItemsByTime" fails. Now sorting will success. * Update comment After removing string padding in the previous commit. * Adjust detection of system tables Switching to just using a bit flag check to solve joyfullservice#462 * Log warning for UNC path access errors Failing to convert a path to UNC may not prevent the operation from completing, but it should be handled and logged. Fixes joyfullservice#461 * Refactor date conversion for DB Properties Save custom date properties in ISO (UTC) format in source files, without converting other property types like strings that may parse as dates. joyfullservice#459 * Turn off date ISO conversion by default This is only used in the index and certain database properties. joyfullservice#459 * Turn on date ISO conversion before reading index These dates need to be converted to local dates for internal processing. joyfullservice#459 * Add saved date property to testing database Verifies that the round trip conversion of saved date properties is working correctly. (The dates are stored as UTC in source files, but converted to local dates when imported into the database properties.) joyfullservice#459 * Add dates stored as text to testing database One stored as a regular date string, and the other as an ISO8601 string. (Neither should convert when reading or writing to JSON.) joyfullservice#459 * Add default git files if dbs in repository root If you use the default options of no special export folder path defined, the project may likely be in the repository root. Add the default .gitignore and .gitattributes files if they are missing. (This would be the default setup for most projects.) * Add note about Access 2007 support See joyfullservice#464 * Add test for Public Creatable class instance This is an undocumented property value that is sometimes used in the wild. Currently when you build from source, PublicCreatable (5) classes are converted to PublicNotCreatable (2). This instancing property can be set in VBA, and we want the imported class to match what was exported. This test currently fails, but will pass when the add-in is updated to support this property. * Support for PublicCreatable instancing for classes This (technically undocumented) technique allows class objects to be created by external projects without using factory methods. This approach was used in some of my projects, so it was important for me to see this property correctly set when the application was built from source. * Check VCS version before export Checks the VCS version before export to warn the user if we are running an export with an older version of VCS than was last used on this project. joyfullservice#465 * Check VCS version on build Check the VCS version before building, and warn if the project version is greater than the installed version. joyfullservice#465 * Reset error break mode after loading options The ability to break and debug VBA errors is dependent on an option value that is saved with each project. The on error directive should be reset after loading the project options to ensure that we can successfully break on errors. * Include name prefix with VBA code overlay Testing this on a machine using the Unicode BETA option in Windows. * Resolve build path during options upgrade We may not have a database open when upgrading options. Fall back to the path used to load the project options to determine the source file path. joyfullservice#467 * Add some documentation for merge build Taking some time to document the intended behavior of the merge build functionality as we work through some bugs. joyfullservice#471, joyfullservice#81 * Update Merge-Build.md Expand table of expected behavior. * Remove git integration for getting modified source I don't think this is actually being used in the wild, and it simplifies the process to have only a single code path for detecting changed source files. * Add missing database objects on merge If a source file exists, but no matching database object exists, we should merge the source file into the database. joyfullservice#471 * Fix SQL export of non-formatted queries Pass-through queries are now exported as SQL again. * Refactor source modified date for multiple files Some types of components, such as tables, forms, reports, queries, and shared images may use multiple source files to represent a single database component. We may need to check all of the related source files to accurately determine the latest modification date. * Log performance of clearing files by extension * Refactor components to provide file extension list Parent functionality such as determining the most recent file modified, getting the last modified date, and checking for alternate source files is better done by having the class provide the list of file extensions that might be used by the class, and having single external functions perform these tasks. (Avoids some redundant code.) * Add multi-file support to file properties hash This will allow us to more accurately detect changes in non-primary source files. (Such as a change in a shared image.) * Simplify component class Removing three functions that are not uniquely specific to each component type and are handled by external functions now that we have exposed the source code file extensions. * Remove Upgrade function on IDbComponent We don't need to try to support mixes of various versions of export files. Use the same version of VCS to build a fresh copy of the project, then export with the latest VCS to upgrade source file. * Move logic to clear legacy files Moving this to the Export function. * Rework processing of conflicts & orphaned objects Refactored the detection and processing of source conflicts and orphaned source files & database objects to better handle source file types that involve multiple files. joyfullservice#473 joyfullservice#471 joyfullservice#472 * Compare source contents of related files When checking for changes in source files, we need to check all the related source files for each component, not just the primary source file. * Adapt export comparison to support multiple files Further changes to compare all related source files. * Update testing database Updated to latest version of VCS. * Include class instancing in code module hash Class modules have an instancing property that needs to be checked for changes along with the VBA code to ensure that the database object matches the last export. A module will now be flagged as changed if the instancing property is changed. * Trap any XML import errors * Add alternate XML format function for big files Large XML files may cause memory errors with XSLT operations. Adding an alternate approach to simply replace the leading tabs with two spaces. This should allow the add-in to export even extremely large table data files as formatted XML. joyfullservice#389, fixes joyfullservice#474 * Remove format version from custom groups Any recent version of export file should be using the new format, and we don't need to carry this conversion forward into v4. * Fix issue with orphaned file detection Need to pass a dictionary, not a collection to the CompareToIndex function. * Move testing code to testing module * Require hash on index update Any update to the index is now required to provide a hash to match the source file. joyfullservice#472 * Save schema filter rules as collection Saving each filter line as a single element in a collection makes a much more readable section in the options.json file, especially when the rules become more complex. Previously this was saved as a combined string value which makes it harder to read changes to individual rules. * Support AfterBuild hooks in add-in project Made a tweak so we can use the RunAfterBuild hook in the add-in project to verify (load) the resources immediately after building from source. This will help prevent accidentally deploying the add-in without the needed resource records, as happened in joyfullservice#477. * Rename as new files * Restore original files * Split forms from VBA code in add-in project Going forward, this will allow us to edit the VBA code without affecting the layout definition files in forms. * Add region support type double (joyfullservice#481) Co-authored-by: Festiis <[email protected]> * Add some additional comments to code changes Clarifies why we are using the Val() function when parsing ISO dates. * Add initial support for CommandBar popup menus This is still a work in progress, but has the basic functionality of exporting and importing custom CommandBars. * Add error handling to linked table refresh This could be related to a recent Access bug, but it is helpful to trap the error if it occurs. joyfullservice#484 --------- Co-authored-by: Hecon5 <[email protected]> Co-authored-by: joyfullservice <[email protected]> Co-authored-by: bclothier <[email protected]> Co-authored-by: Tanarri <[email protected]> Co-authored-by: Festim Nuredini <[email protected]> Co-authored-by: Festiis <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If a operationname has a leading space (like " MyOperation" ) the function "SortItemsByTime" fails.
Now sorting will success.