From 1e9788dae44ab301fa17c707beb997600b20590a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= Date: Thu, 30 Jan 2025 13:06:06 +0100 Subject: [PATCH] UNION types boolean and integer cannot be matched --- .github/workflows/rubyonrails.yml | 6 ++++++ app/models/dmsf_query.rb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rubyonrails.yml b/.github/workflows/rubyonrails.yml index dcb0cfef..a2c08898 100644 --- a/.github/workflows/rubyonrails.yml +++ b/.github/workflows/rubyonrails.yml @@ -173,3 +173,9 @@ jobs: if [[ "${{matrix.database_service}}" ]]; then sudo systemctl stop ${{matrix.engine}} fi + - name: Archive test.log + if: always() + uses: actions/upload-artifact@v4 + with: + name: test.log + path: log/test.log diff --git a/app/models/dmsf_query.rb b/app/models/dmsf_query.rb index b51222e5..c11ab4a8 100644 --- a/app/models/dmsf_query.rb +++ b/app/models/dmsf_query.rb @@ -341,7 +341,7 @@ class DmsfQuery < Query projects.description AS description, '' AS comment, 0 AS locked, - 0 AS `system`, + 0 AS "system", 0 AS sort#{cf_columns}}).visible if dmsf_folder_id || deleted scope.none