Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Several bug fixes and new tool #58

Merged
merged 24 commits into from
Sep 13, 2019
Merged

Several bug fixes and new tool #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
bae9ec8
Implement merging code
qlands Aug 14, 2019
92f171c
Fix merging process
qlands Aug 14, 2019
1af84c2
Bump create schema to 2.0. Fix some attributes
qlands Aug 16, 2019
b9d1693
Support more merging options
qlands Aug 16, 2019
1e142b7
Allow audit for certaint tables
qlands Aug 16, 2019
8e65862
Fix merge bugs
qlands Aug 18, 2019
339fc50
Fix merge bugs
qlands Aug 18, 2019
807a04f
New tool to merge versions. Replaces CompareCreate and CompareInsert
qlands Aug 21, 2019
e56b7ee
Remove old compare tools. This is now replaced by the mergeVersions tool
qlands Aug 21, 2019
7863006
Add support to ignore VNS
qlands Aug 21, 2019
6662b97
Fixes in merge files
qlands Aug 27, 2019
3015f56
Fix several issues
qlands Sep 1, 2019
9c38b56
Fix merging issues
qlands Sep 1, 2019
eda5f12
Remove yes/no code
qlands Sep 1, 2019
85fd5d0
Fix error codes in help
qlands Sep 3, 2019
766fc3c
Fix dependency
qlands Sep 5, 2019
b9d3ce9
Change query to list_name
qlands Sep 7, 2019
5741e04
Fix bug with lookup table fields. Use search if no list_name is present
qlands Sep 9, 2019
0d19f4a
Fix some bugs
qlands Sep 9, 2019
9b382d9
Fix _submitted_by field size
qlands Sep 11, 2019
dfc6c52
Add _xform_id_string to schema
qlands Sep 11, 2019
3c35cc5
Fix _xform_id_string xml code
qlands Sep 11, 2019
f3819e5
Properly place new variables in C
qlands Sep 11, 2019
1c85723
Fix bug in sql
qlands Sep 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ jxformtomysql
createaudittriggers
createdummyjson
mysqltosqlite
mergeversions

#Other directories
old
Expand Down
1,182 changes: 725 additions & 457 deletions JXFormToMysql/main.cpp
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion utilities/MySQLToSQLite/MySQLToSQLite.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CONFIG -= app_bundle

TEMPLATE = app

INCLUDEPATH += ../3rdparty
INCLUDEPATH += ../../3rdparty

SOURCES += \
main.cpp
Expand Down
19 changes: 0 additions & 19 deletions utilities/compareCreateXML/compareCreateXML.pro
View file
Open in desktop

This file was deleted.

Loading