Merged from 3.4

pawelsalawa · Nov 30, 2024 · afc0acc · afc0acc
2 parents 92f04bb + f4c4694
commit afc0acc
Show file tree

Hide file tree

Showing 43 changed files with 62,387 additions and 24,996 deletions.
diff --git a/.github/workflows/lin_release.yml b/.github/workflows/lin_release.yml
@@ -2,8 +2,8 @@ env:
     workflow_name: lin_release
     TARGET_ARCH: 'x86_64'
     TCL_VERSION: '8.6.14'
-    SQLITE_VERSION: '3410200'
-    SQLITE_RELEASE_YEAR: '2023'
+    SQLITE_VERSION: '3470100'
+    SQLITE_RELEASE_YEAR: '2024'
     ICU_VERSION: '74.2'
     PORTABLE_DIR: ${{ github.workspace }}/output/portable/SQLiteStudio
     INSTALLBUILDER_DIR: ../ib
@@ -317,16 +317,19 @@ jobs:
               working-directory: ${{ env.PORTABLE_DIR }}
               run: |
                 cd $PORTABLE_DIR
-                mkdir platforms imageformats iconengines printsupport platformthemes platforminputcontexts
+                mkdir platforms imageformats iconengines printsupport platformthemes platforminputcontexts wayland-decoration-client wayland-graphics-integration-client wayland-shell-integration
                 cd "${{ env.Qt5_Dir }}/plugins"
-                cp platforms/libqwayland-generic.so platforms/libqxcb.so "$PORTABLE_DIR/platforms/"
+                cp platforms/libqwayland-*.so platforms/libqxcb.so "$PORTABLE_DIR/platforms/"
                 for f in qgif qicns qico qjpeg qsvg qtga qtiff qwbmp; do
                     cp imageformats/lib$f.so "$PORTABLE_DIR/imageformats/"
                 done
                 cp iconengines/libqsvgicon.so "$PORTABLE_DIR/iconengines/"
                 cp printsupport/libcupsprintersupport.so "$PORTABLE_DIR/printsupport/"
                 cp platformthemes/libqgtk3.so "$PORTABLE_DIR/platformthemes/"
                 cp platforminputcontexts/libcomposeplatforminputcontextplugin.so "$PORTABLE_DIR/platforminputcontexts/"
+                cp wayland-decoration-client/*.so "$PORTABLE_DIR/wayland-decoration-client/"
+                cp wayland-graphics-integration-client/*.so "$PORTABLE_DIR/wayland-graphics-integration-client/"
+                cp wayland-shell-integration/*.so "$PORTABLE_DIR/wayland-shell-integration/"
                 if [ "$QT_VERSION_MAJ" = 6 ]; then
                     for f in qmng qwebp; do
                         cp imageformats/lib$f.so "$PORTABLE_DIR/imageformats"
@@ -367,7 +370,7 @@ jobs:
               run: |
                 set -x
                 [ "$QT_VERSION_MAJ" = 5 ] || QT6_PLUGINS=tls/*.so
-                chrpath -k -r \$ORIGIN/../lib   platforms/*.so imageformats/*.so iconengines/*.so printsupport/*.so platformthemes/*.so plugins/*.so ${QT6_PLUGINS:-}
+                chrpath -k -r \$ORIGIN/../lib   platforms/*.so imageformats/*.so iconengines/*.so printsupport/*.so platformthemes/*.so plugins/*.so wayland-*/*.so ${QT6_PLUGINS:-}
                 chrpath -k -r \$ORIGIN          lib/libicu*.*.* lib/libtcl$TCL_VERSION_SHORT.so
                 chrpath -k -r \$ORIGIN          lib/libcoreSQLiteStudio.so lib/libguiSQLiteStudio.so
                 chrpath -k -r \$ORIGIN/lib      sqlitestudio
@@ -430,6 +433,12 @@ jobs:
                 mv SQLiteStudio-${{ env.SQLITESTUDIO_VERSION }}-linux-x64-installer.run \
                     SQLiteStudio-$PACKAGE_VERSION-installer.run
 
+            - name: SHA256 checksums
+              shell: bash
+              run: |
+                sha256sum output/portable/sqlitestudio-${{ env.SQLITESTUDIO_VERSION }}.tar.xz
+                sha256sum SQLiteStudio-${{ env.SQLITESTUDIO_VERSION }}-linux-x64-installer.run
+
             - name: Upload package artifact
               uses: actions/upload-artifact@v4
               with:

diff --git a/.github/workflows/mac_release.yml b/.github/workflows/mac_release.yml
@@ -1,8 +1,8 @@
 env:
     QT_VERSION: '5.15.2'
     TCL_VERSION: '8.6'
-    SQLITE_VERSION: '3410200'
-    SQLITE_RELEASE_YEAR: '2023'
+    SQLITE_VERSION: '3470100'
+    SQLITE_RELEASE_YEAR: '2024'
     PYTHON_VERSION: '3.9'
     ICU_VERSION: '74.2'
     PORTABLE_DIR: ${{ github.workspace }}/output/portable/SQLiteStudio
@@ -354,6 +354,12 @@ jobs:
                 mv output/SQLiteStudio/sqlitestudio-${{ env.SQLITESTUDIO_VERSION }}.dmg \
                   sqlitestudio-${{ env.SQLITESTUDIO_VERSION }}${{ matrix.dmg_postfix }}.dmg
 
+            - name: SHA256 checksums
+              shell: bash
+              run: |
+                sha256sum output/SQLiteStudio/sqlitestudio-${{ env.SQLITESTUDIO_VERSION }}${{ matrix.dmg_postfix }}.dmg
+                sha256sum SQLiteStudio-${{ env.SQLITESTUDIO_VERSION }}-osx-installer.dmg
+
             - name: Upload package artifact
               uses: actions/upload-artifact@v4
               with:

diff --git a/.github/workflows/win32_release.yml b/.github/workflows/win32_release.yml
@@ -1,6 +1,8 @@
 env:
-    SQLITE_VERSION: '3410200'
-    SQLITE_RELEASE_YEAR: '2023'
+    QT_VERSION: '5.15.2'
+    SQLITE_VERSION: '3470100'
+    SQLITE_RELEASE_YEAR: '2024'
+    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
@@ -419,6 +421,12 @@ jobs:
                 mv SQLiteStudio-${{ env.SQLITESTUDIO_VERSION }}-windows-installer.exe \
                     SQLiteStudio-$PACKAGE_VERSION-windows-installer.exe \
 
+            - name: SHA256 checksums
+              shell: bash
+              run: |
+                sha256sum output/portable/sqlitestudio-${{ env.SQLITESTUDIO_VERSION }}.zip
+                sha256sum SQLiteStudio-${{ env.SQLITESTUDIO_VERSION }}-windows-installer.exe
+
             - name: Upload package artifact
               uses: actions/upload-artifact@v4
               with:

diff --git a/.github/workflows/win64_release.yml b/.github/workflows/win64_release.yml
@@ -1,6 +1,8 @@
 env:
-    SQLITE_VERSION: '3410200'
-    SQLITE_RELEASE_YEAR: '2023'
+    QT_VERSION: '5.15.2'
+    SQLITE_VERSION: '3470100'
+    SQLITE_RELEASE_YEAR: '2024'
+    QT_ARCH: 'win64_mingw81'
     PYTHON_VERSION: '3.9'
     ICU_VER: '75'
     ICU_URL: https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-icu-75.1-2-any.pkg.tar.zst
@@ -436,6 +438,12 @@ jobs:
                 mv SQLiteStudio-${{ env.SQLITESTUDIO_VERSION }}-windows-x64-installer.exe \
                     SQLiteStudio-$PACKAGE_VERSION-windows-x64-installer.exe \
 
+            - name: SHA256 checksums
+              shell: bash
+              run: |
+                sha256sum output/portable/sqlitestudio-${{ env.SQLITESTUDIO_VERSION }}.zip
+                sha256sum SQLiteStudio-${{ env.SQLITESTUDIO_VERSION }}-windows-x64-installer.exe
+
             - name: Upload package artifact
               uses: actions/upload-artifact@v4
               with:

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,19 @@
 # ChangeLog
 
+### 3.4.7
+- CHANGE: #5131 SQLite updated to 3.47.1 (except for SQLCipher, which is still on 3.46.1 at the moment).
+- BUGFIX: #5119 Fixed very bad performance of import() function executed from SQL Editor.
+- BUGFIX: #5124 Fixed ScriptingPython plugin compilation against Python >= 3.12.
+- BUGFIX: #5134 Improved performance significantly when working with big values (~1MB per cell) in multiple columns/rows of a table data grid view.
+- BUGFIX: #5122 Fixed Linux packages to run properly under Wayland.
+- BUGFIX: #5136 Fixed application hanging at quitting when the database is in WAL journaling mode and there is another client still accessing the database.
+- BUGFIX: #5135 Counting rows in enormous tables (which can take very long time) no longer blocks the application.
+
+### 3.4.6
+- BUGFIX: #5114 Fixed black highlighting for current query on systems, where SQLiteStudio was never configured to use theme different than default.
+- BUGFIX: #5111 Applied fix for compiling with Python 3.11 (thanks to @mehw).
+- BUGFIX: #5115 Fixed smart query executor to work properly if there is an inline subquery in a SELECT result columns.
+
 ### 3.4.5
 - ADDED: #4974 Extension-based collations (like the ICU) can be now registered in databases using Collations Editor window.
 - ADDED: #5041 Added support for column list syntax in CREATE VIEW.
@@ -15,7 +29,7 @@
 - BUGFIX: #4796 Fixed Database Dialog file selection, so user has clear understanding whether new file is to be created, or existing file to open. Also fixes file selection dialog on MacOS when creating new database file.
 - BUGFIX: #4819 Fixed sorting order cached in data view when executing query with less columns than previously.
 - BUGFIX: #4846 Fixed crash when using NOT NULL DEFERRABLE INITIALLY DEFERRED.
-- BIGFIX: #3454 German translation fixes.
+- BUGFIX: #3454 German translation fixes.
 - BUGFIX: #4835 Fixed detecting cell value change (to enable commit button) when erasing cell with BLOB value starting with null byte.
 - BUGFIX: #4842 Fixed querying ROWID column from tables. It no longer causes issues with editing query result data.
 - BUGFIX: #4844 Fixed moving/copying Views from one base to another using drag&drop or copy&paste.

diff --git a/Plugins/DbAndroid/dbandroidinstance.cpp b/Plugins/DbAndroid/dbandroidinstance.cpp
@@ -124,6 +124,17 @@ Db* DbAndroidInstance::clone() const
     return new DbAndroidInstance(plugin, name, path, connOptions);
 }
 
+bool DbAndroidInstance::isTransactionActive() const
+{
+    // FIXME: Since there is no way to detect active transaction by PRAGMA or SQL function,
+    // this plugin cannot just test this state. It could potentially be implemented by tracking BEGIN/END keywords
+    // as first keywords in executed queries, but it will require more work and testing.
+    //
+    // Current consiequence of negleting this is that if user uses import() function enclosed with BEGIN & END,
+    // the query will fail due to already active transaction. In that case user needs to skip the BEGIN & END.
+    return false;
+}
+
 bool DbAndroidInstance::isOpenInternal()
 {
     return (connection && connection->isConnected());

diff --git a/Plugins/DbAndroid/dbandroidinstance.h b/Plugins/DbAndroid/dbandroidinstance.h
@@ -30,6 +30,7 @@ class DbAndroidInstance : public AbstractDb
         bool loadExtension(const QString& filePath, const QString& initFunc);
         bool isComplete(const QString& sql) const;
         Db* clone() const;
+        bool isTransactionActive() const;
 
     protected:
         bool isOpenInternal();

diff --git a/Plugins/DbSqliteCipher/DbSqliteCipher.pro b/Plugins/DbSqliteCipher/DbSqliteCipher.pro
@@ -25,7 +25,7 @@ HEADERS += dbsqlitecipher.h \
     dbsqlitecipherinstance.h
     sqlcipher.h
 
-mac: {
+macx: {
     exists( /opt/local/include/openssl-3/openssl/crypto.h ) {
         message( "Configuring OpenSSL from MacPorts" )
         INCLUDEPATH += /opt/local/include/openssl-3