Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WFS provider] Include namespace prefix and URI in FILTER ... #50249

Merged
merged 1 commit into from
Sep 26, 2022

Conversation

rouault
Copy link
Contributor

@rouault rouault commented Sep 19, 2022

computed from setSubsetString() when a namespace is declared on <wfs:FeatureType in GetCapabilities response

Fixes #49121

Follow-up to #43957 / PR #45043

computed from setSubsetString() when a namespace is declared on <<wfs:FeatureType> in GetCapabilities response

Fixes qgis#49121

Follow-up to qgis#43957 / PR qgis#45043
@rouault rouault added Bug Either a bug report, or a bug fix. Let's hope for the latter! backport queued_ltr_backports Queued Backports labels Sep 19, 2022
@github-actions github-actions bot added this to the 3.28.0 milestone Sep 19, 2022
@pathmapper
Copy link
Contributor

pathmapper commented Sep 21, 2022

Confirmed this fixes #49121, thanks!

@nyalldawson nyalldawson merged commit 2fc10b0 into qgis:master Sep 26, 2022
@qgis-bot
Copy link
Collaborator

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply f9cd2aab76... [WFS provider] Include namespace prefix and URI in FILTER ...
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".

stdout
Auto-merging src/core/qgsogcutils.cpp
CONFLICT (content): Merge conflict in src/core/qgsogcutils.cpp
Auto-merging src/core/qgsogcutils.h
Auto-merging src/providers/wfs/qgswfsfeatureiterator.cpp
CONFLICT (content): Merge conflict in src/providers/wfs/qgswfsfeatureiterator.cpp
Auto-merging src/providers/wfs/qgswfsprovider.cpp
Auto-merging src/providers/wfs/qgswfsprovider.h
Auto-merging src/providers/wfs/qgswfsshareddata.cpp
Auto-merging tests/src/python/test_provider_wfs.py
CONFLICT (content): Merge conflict in tests/src/python/test_provider_wfs.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-50249-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick f9cd2aab76809a5591fc54cf41c880af231d100d
# Push it to GitHub
git push --set-upstream origin backport-50249-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-50249-to-queued_ltr_backports.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Sep 26, 2022
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

WFS: missing namespace prefix on geometry and attribute elements in FILTER for WFS GetFeature request
4 participants