Merged from 3.4

pawelsalawa · Feb 9, 2025 · 2726fb4 · 2726fb4
1 parent 3134186
commit 2726fb4
Show file tree

Hide file tree

Showing 35 changed files with 48,704 additions and 5,206 deletions.
diff --git a/.github/workflows/lin_release.yml b/.github/workflows/lin_release.yml
@@ -2,11 +2,11 @@ env:
     TARGET_ARCH: 'x86_64'
     QT_VERSION: '6.5.3'
     TCL_VERSION: '8.6'
-    SQLITE_VERSION: '3470200'
+    SQLITE_VERSION: '3490000'
     PYTHON_VERSION: '3.13'
     PORTABLE_DIR: ${{ github.workspace }}/output/portable/SQLiteStudio
     INSTALLBUILDER_DIR: ../ib
-    INSTALLBUILDER_URL: https://releases.installbuilder.com/installbuilder/installbuilder-enterprise-24.3.0-linux-x64-installer.run
+    INSTALLBUILDER_URL: https://releases.installbuilder.com/installbuilder/installbuilder-enterprise-24.11.1-linux-x64-installer.run
     LIBSSL_DIR_URL: http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/
     LIBSSL_DEB: libssl1.1_1.1.1f-1ubuntu2.23_amd64.deb
     BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
@@ -116,7 +116,7 @@ jobs:
                 SQLITE3_ZIP=sqlite3-linux-x64-$SQLITE_VERSION.zip
                 curl -L https://github.com/pawelsalawa/sqlite3-sqls/releases/download/v$SQLITE_DOT_VERSION/$SQLITE3_ZIP --output $SQLITE3_ZIP
 
-                sudo rm -f /usr/lib/libsqlite* /usr/local/lib/libsqlite* /usr/include/sqlite* /usr/local/include/sqlite* /usr/lib/x86_64-linux-gnu/libsqlite*
+                sudo rm -f /usr/lib/libsqlite* /usr/local/lib/libsqlite* /usr/include/sqlite* /usr/local/include/sqlite* /usr/lib/$TARGET_ARCH-linux-gnu/libsqlite*
                 sudo unzip $SQLITE3_ZIP libsqlite3.so -d /usr/local/lib
                 sudo unzip $SQLITE3_ZIP sqlite3.h sqlite3ext.h -d /usr/local/include
                 sudo ln -s /usr/local/lib/libsqlite3.so /usr/local/lib/libsqlite3.so.0

diff --git a/.github/workflows/lin_release_arm.yml b/.github/workflows/lin_release_arm.yml
diff --git a/.github/workflows/mac_release.yml b/.github/workflows/mac_release.yml
@@ -1,12 +1,12 @@
 env:
     QT_VERSION: '5.15.2'
     TCL_VERSION: '8.6.16'
-    SQLITE_VERSION: '3470200'
+    SQLITE_VERSION: '3490000'
     PYTHON_VERSION: '3.9'
     ICU_VERSION: '74.2'
     PORTABLE_DIR: ${{ github.workspace }}/output/portable/SQLiteStudio
     INSTALLBUILDER_DIR: ../ib
-    INSTALLBUILDER_URL: https://releases.installbuilder.com/installbuilder/installbuilder-enterprise-24.3.0-osx-installer.dmg
+    INSTALLBUILDER_URL: https://releases.installbuilder.com/installbuilder/installbuilder-enterprise-24.11.1-osx-installer.dmg
     BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
 name: MacOSX release build

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,7 +1,6 @@
 env:
     TCL_VERSION: '8.6'
-    SQLITE_VERSION: '3470100'
-    SQLITE_RELEASE_YEAR: '2024'
+    SQLITE_VERSION: '3490000'
     PORTABLE_DIR: ${{ github.workspace }}/output/portable/SQLiteStudio
 
 name: Unit tests
@@ -57,33 +56,41 @@ jobs:
                 setup-python: 'false'
                 extra: '--external 7z'
 
+            - name: Clone GH scripts
+              uses: actions/checkout@v3
+              with:
+                repository: pawelsalawa/gh-action-scripts
+                ref: main
+                path: gh-scripts
+
+            - name: Setup GH scripts path
+              shell: bash
+              run: |
+                mv gh-scripts ..
+                cd ..
+                chmod +x gh-scripts/scripts/*.sh
+                echo "GH_SCRIPTS=$(pwd)/gh-scripts/scripts" >> $GITHUB_ENV
+                echo "DEBUG=${{ inputs.DEBUG }}" >> $GITHUB_ENV
+
             - name: Clone repo
               uses: actions/checkout@v3
               with:
                 ref: ${{ env.GITHUB_REF }}
 
             - name: Install SQLite3
               run: |
+                cd ..
+                SQLITE_DOT_VERSION=$($GH_SCRIPTS/convert_int_ver.sh $SQLITE_VERSION)
+                SQLITE3_ZIP=sqlite3-linux-x64-$SQLITE_VERSION.zip
+                curl -L https://github.com/pawelsalawa/sqlite3-sqls/releases/download/v$SQLITE_DOT_VERSION/$SQLITE3_ZIP --output $SQLITE3_ZIP
+
                 sudo rm -f /usr/lib/libsqlite* /usr/local/lib/libsqlite* /usr/include/sqlite* /usr/local/include/sqlite* /usr/lib/x86_64-linux-gnu/libsqlite*
-                wget http://sqlite.org/$SQLITE_RELEASE_YEAR/sqlite-amalgamation-$SQLITE_VERSION.zip
-                unzip sqlite-amalgamation-$SQLITE_VERSION.zip
-                cd sqlite-amalgamation-$SQLITE_VERSION
-                gcc sqlite3.c -lpthread -ldl -lm -Os -fpic -shared -o libsqlite3.so \
-                    -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT \
-                    -DSQLITE_ENABLE_DBSTAT_VTAB \
-                    -DSQLITE_ENABLE_BYTECODE_VTAB \
-                    -DSQLITE_ENABLE_COLUMN_METADATA \
-                    -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
-                    -DSQLITE_ENABLE_FTS3 \
-                    -DSQLITE_ENABLE_FTS4 \
-                    -DSQLITE_ENABLE_FTS5 \
-                    -DSQLITE_ENABLE_GEOPOLY \
-                    -DSQLITE_ENABLE_JSON1 \
-                    -DSQLITE_ENABLE_RTREE \
-                    -DSQLITE_ENABLE_MATH_FUNCTIONS
-                strip libsqlite3.so
-                sudo cp -P libsqlite3.so* /usr/local/lib/
-                sudo cp *.h /usr/local/include/
+                sudo unzip $SQLITE3_ZIP libsqlite3.so -d /usr/local/lib
+                sudo unzip $SQLITE3_ZIP sqlite3.h sqlite3ext.h -d /usr/local/include
+                sudo ln -s /usr/local/lib/libsqlite3.so /usr/local/lib/libsqlite3.so.0
+                sudo ln -s /usr/local/lib/libsqlite3.so /usr/local/lib/libsqlite3.so.0.8.6
+                ls -l /usr/local/lib/libsqlite3*
+                ls -l /usr/local/include/sqlite*
 
             - name: Install Tcl
               run: sudo apt-get install -qq libtcl$TCL_VERSION tcl$TCL_VERSION-dev

diff --git a/.github/workflows/win32_release.yml b/.github/workflows/win32_release.yml
@@ -1,14 +1,14 @@
 env:
     QT_VERSION: '5.15.2'
-    SQLITE_VERSION: '3470200'
+    SQLITE_VERSION: '3490000'
     QT_ARCH: 'win32_mingw81'
     PYTHON_VERSION: '3.9'
     ICU_VER: '75'
     ICU_URL: https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-icu-75.1-2-any.pkg.tar.zst
     PORTABLE_DIR: output/portable/SQLiteStudio
     INSTALLBUILDER_DIR: ../ib
     MINGW_URL: https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/tools_mingw/qt.tools.win32_mingw810/8.1.0-1-202004170606i686-8.1.0-release-posix-dwarf-rt_v6-rev0.7z
-    INSTALLBUILDER_URL: https://releases.installbuilder.com/installbuilder/installbuilder-enterprise-24.3.0-windows-installer.exe
+    INSTALLBUILDER_URL: https://releases.installbuilder.com/installbuilder/installbuilder-enterprise-24.11.1-windows-installer.exe
     BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
 name: Windows 32-bit release build

diff --git a/.github/workflows/win64_release.yml b/.github/workflows/win64_release.yml
@@ -1,15 +1,15 @@
 env:
     QT_VERSION: '6.8.0'
     QT_ARCH: 'win64_mingw'
-    SQLITE_VERSION: '3470200'
+    SQLITE_VERSION: '3490000'
     PYTHON_VERSION: '3.13'
     ICU_VER: '75'
     ICU_URL: https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-icu-75.1-2-any.pkg.tar.zst
     MINGW_DIRNAME: mingw1310_64
     PORTABLE_DIR: output/portable/SQLiteStudio
     INSTALLBUILDER_DIR: ../ib
     MINGW_URL: https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/tools_mingw1310/qt.tools.win64_mingw1310/13.1.0-202407240918mingw1310.7z
-    INSTALLBUILDER_URL: https://releases.installbuilder.com/installbuilder/installbuilder-enterprise-24.3.0-windows-x64-installer.exe
+    INSTALLBUILDER_URL: https://releases.installbuilder.com/installbuilder/installbuilder-enterprise-24.11.1-windows-x64-installer.exe
     BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
 name: Windows 64-bit release build

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,13 +1,25 @@
 # ChangeLog
 
-### 3.5.0
+### 4.0.0
 - ADDED: #4662 ScriptingPython plugin now allow selecting Python installed in your system and it's compatible with all recent (and not so recent) Python versions. Big thanks to @tuffnatty for this!
 - ADDED: #5237 ARM64 code compatibility.
 - CHANGE: #4553 Application has moved to Qt 6 (dropping Qt 5 support). This solves several technical issues (for example accented characters on MacOS, better UI scaling for high DPI displays, better dark theme support and more).
 - CHANGE: #5102 All raster icons are replaced with vector icons (SVG). This makes them scalable and work well with high DPI displays.
 - BUGFIX: #3995 Fixed blank MDI window buttons when using 150% interface scaling under Windows.
 - BIGFIX: #3146 Fixed accent characters support under MacOS.
 
+### 3.4.16
+- ADDED: #5231 Added safe-mode command line option to bypass issues caused by corrupted session.
+- CHANGE: #5248 Database Export dialog has now Export Indexes and Export Triggers options, just like the Single Table Export dialog.
+- CHANGE: SQLite updated to 3.49.0.
+- CHANGE: Config options for WxSQLite plugin extended to support AEGIS and Ascon-128 ciphers.
+- BUGFIX: #5247 Fixed crash when opening a View's Trigger and enabled trigger-related entries in context menu for a View's Trigger.
+- BUGFIX: #5233 Fixed result column name when using [] quoting operator for column alias name.
+- BUGFIX: #5226 Fixed SQL formatter for INSERT statement when database prefix is used, so the dot is not removed after database name.
+- BUGFIX: #5234 Fixed SQL formatter for GENERATED ALWAYS column in CREATE TABLE statement, so it doesn't quote type name.
+- BUGFIX: #5245 Enterprise SQL formatter preview is no longer resetting vertical scroll when updating preview contents.
+- BUGFIX: #5254 Fixed handling Views that reference columns with spaces in their name, when commits table modifications.
+
 ### 3.4.15
 - BUGFIX: #5218 Fixed Drag&Drop of items in the database list - a bug that was introduced in 3.4.14.
 - BUGFIX: #5216 Fixed Query Executor to use Smart Execution Method when there is a Virtual Table mentioned in the query, therefore enabling all advanced features of the Query Executor.

diff --git a/Plugins/DbSqliteWx/DbSqliteWx.pro b/Plugins/DbSqliteWx/DbSqliteWx.pro
@@ -57,6 +57,8 @@ unix: {
 }
 win32: {
     DEFINES += SQLITE_OS_WIN=1
+    # This one is to be removed after SQLiteStudio 3.4 (as mingw is updated and it's probably fixed there - to be checked if the plugin compiles without it)
+    QMAKE_CFLAGS += -fno-asynchronous-unwind-tables
 }
 DEFINES += SQLITE_HAS_CODEC SQLITE_ALLOW_XTHREAD_CONNECT=1 SQLITE_THREADSAFE=1 SQLITE_TEMP_STORE=2 CODEC_TYPE=CODEC_TYPE_AES256 \
     SQLITE_CORE USE_DYNAMIC_SQLITE3_LOAD=0 \

diff --git a/Plugins/DbSqliteWx/dbsqlitewx.cpp b/Plugins/DbSqliteWx/dbsqlitewx.cpp
@@ -18,7 +18,9 @@ QList<DbPluginOption> DbSqliteWx::getOptionsList() const
         {"wxSQLite3: AES 256 Bit", "aes256cbc"},
         {"sqleet: ChaCha20-Poly1305", "chacha20"},
         {"SQLCipher: AES 256 Bit", "sqlcipher"},
-        {"System.Data.SQLite: RC4", "rc4"}
+        {"System.Data.SQLite: RC4", "rc4"},
+        {"Ascon-128 v1.2", "ascon128"},
+        {"AEGIS", "aegis"},
     };
     static_qstring(defaultCipher, "aes256cbc");
 

diff --git a/Plugins/DbSqliteWx/dbsqlitewx.json b/Plugins/DbSqliteWx/dbsqlitewx.json
@@ -3,6 +3,6 @@
     "title":         "WxSQLite3",
     "description":   "Provides support for WxSQLite3/SQLCipher/System.Data.SQLite3 databases, including encryption.",
     "minAppVersion": 30300,
-    "version":       10002,
+    "version":       10003,
     "author":        "SalSoft"
 }
diff --git a/Plugins/DbSqliteWx/update_sqlite_version.tcl b/Plugins/DbSqliteWx/update_sqlite_version.tcl
@@ -4,7 +4,7 @@
 # https://github.com/utelle/wxsqlite3/releases
 # Link from download page will redicrect to the codeload.....
 
-set THE_URL "https://github.com/utelle/SQLite3MultipleCiphers/releases/download/v1.9.2/sqlite3mc-1.9.2-sqlite-3.47.2-amalgamation.zip"
+set THE_URL "https://github.com/utelle/SQLite3MultipleCiphers/releases/download/v2.0.3/sqlite3mc-2.0.3-sqlite-3.49.0-amalgamation.zip"
 
 set SRC_DIR "src"
 set FILES [list \