Skip to content

fix(expression): concat return Empty string instead of Null - #66618

Merged
lbartoletti merged 2 commits into
qgis:masterfrom
lbartoletti:fix_expression_concat_null
Jul 3, 2026
Merged

fix(expression): concat return Empty string instead of Null#66618
lbartoletti merged 2 commits into
qgis:masterfrom
lbartoletti:fix_expression_concat_null

Conversation

@lbartoletti

Copy link
Copy Markdown
Member

Description

Fixes #65808 initializing concat variable.

After:

image image image image

@agiudiceandrea may I ask you to review/test this one?

AI tool usage

  • AI tool(s) (Copilot, Claude, or something similar) supported my development of this PR. See our policy about AI tool use. Use of AI tools must be indicated. Failure to be honest might result in banning.
@lbartoletti lbartoletti self-assigned this Jun 30, 2026
@github-actions github-actions Bot added the Expressions Related to the QGIS expression engine or specific expression functions label Jun 30, 2026
@github-actions github-actions Bot added this to the 4.2.0 milestone Jun 30, 2026
@lbartoletti lbartoletti added Requires Tests! Waiting on the submitter to add unit tests before eligible for merging Expressions Related to the QGIS expression engine or specific expression functions and removed Expressions Related to the QGIS expression engine or specific expression functions labels Jun 30, 2026
@github-actions

github-actions Bot commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

🍎 MacOS Qt6 builds

Download MacOS Qt6 builds of this PR for testing.
This app is not notarized, run sudo xattr -d com.apple.quarantine /Applications/QGIS*.app to avoid the warning
(Built from commit d7b2381)

🪟 Windows Qt6 builds

Download Windows Qt6 builds of this PR for testing.
To execute locally, unzip the downloaded zip file and run bin\qgis-bin.exe in the extracted directory.
You might be prompted by Windows Defender click "Run anyway"
(Built from commit d7b2381)

Comment thread src/core/expression/qgsexpressionfunction.cpp
@lbartoletti lbartoletti added backport queued_ltr_backports Queued Backports and removed Requires Tests! Waiting on the submitter to add unit tests before eligible for merging labels Jul 2, 2026
@lbartoletti
lbartoletti merged commit be416a5 into qgis:master Jul 3, 2026
32 checks passed
@qgis-bot

qgis-bot commented Jul 3, 2026

Copy link
Copy Markdown
Collaborator

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply d7b23815ffa... test(expression): add concat NULL test against empty string
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
Auto-merging src/core/expression/qgsexpressionfunction.cpp
[backport-66618-to-queued_ltr_backports 8c0791dd13b] fix(expression): concat return Empty string instead of Null
 Author: Loïc Bartoletti <loic.bartoletti@oslandia.com>
 Date: Tue Jun 30 09:20:30 2026 +0200
 1 file changed, 1 insertion(+), 1 deletion(-)
Auto-merging tests/src/core/testqgsexpression.cpp
CONFLICT (content): Merge conflict in tests/src/core/testqgsexpression.cpp

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-queued_ltr_backports queued_ltr_backports
# Navigate to the new working tree
cd .worktrees/backport-queued_ltr_backports
# Create a new branch
git switch --create backport-66618-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 64d90a571140984356cf3044c3ca6e9108f9ffb0 d7b23815ffa5a20b2869c21df540ccf08d194710
# Push it to GitHub
git push --set-upstream origin backport-66618-to-queued_ltr_backports
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-queued_ltr_backports

Then, create a pull request where the base branch is queued_ltr_backports and the compare/head branch is backport-66618-to-queued_ltr_backports.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Jul 3, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport queued_ltr_backports Queued Backports Expressions Related to the QGIS expression engine or specific expression functions failed backport The automated backport attempt failed, needs a manual backport

4 participants