Skip to content

Fix spatialite wrong data type on SQL layers - #66538

Merged
nyalldawson merged 1 commit into
qgis:masterfrom
elpaso:bugfix-gh66329-spatialite-query-layer-wrong-datatype
Jun 25, 2026
Merged

Fix spatialite wrong data type on SQL layers#66538
nyalldawson merged 1 commit into
qgis:masterfrom
elpaso:bugfix-gh66329-spatialite-query-layer-wrong-datatype

Conversation

@elpaso

@elpaso elpaso commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

Fix #66329

@elpaso elpaso added Bug Either a bug report, or a bug fix. Let's hope for the latter! backport queued_ltr_backports Queued Backports Spatialite data provider labels Jun 23, 2026
@github-actions github-actions Bot added this to the 4.2.0 milestone Jun 23, 2026
@elpaso

elpaso commented Jun 24, 2026

Copy link
Copy Markdown
Contributor Author

unrelated test failure

@nyalldawson
nyalldawson merged commit 80ca061 into qgis:master Jun 25, 2026
51 of 53 checks passed
@qgis-bot

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 91e9ca2f07c... Fix spatialite wrong data type on SQL layers
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/providers/spatialite/qgsspatialiteprovider.cpp
CONFLICT (content): Merge conflict in src/providers/spatialite/qgsspatialiteprovider.cpp
Auto-merging tests/src/python/test_provider_spatialite.py
CONFLICT (content): Merge conflict in tests/src/python/test_provider_spatialite.py

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-66538-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 91e9ca2f07ca1c6a571545f67bee411c72ad93b0
# Push it to GitHub
git push --set-upstream origin backport-66538-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-66538-to-queued_ltr_backports.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Jun 25, 2026
@tannenfreund87

Copy link
Copy Markdown

Should also fix this really old report: #15690

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 Bug Either a bug report, or a bug fix. Let's hope for the latter! failed backport The automated backport attempt failed, needs a manual backport Spatialite data provider

5 participants