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/OPAIF provider] Take into account page size, max feature count, … #50236

Merged
merged 1 commit into from
Sep 19, 2022

Conversation

rouault
Copy link
Contributor

@rouault rouault commented Sep 17, 2022

…etc. from the connection into the URI of the added layer (fixes #49404)

…etc. from the connection into the URI of the added layer (fixes qgis#49404)

The issue was that the service name should be passed in lower case.
The regression likely dates back to 4790f92 with the migration to
the new settings infrastructure.
@github-actions github-actions bot added this to the 3.28.0 milestone Sep 17, 2022
@troopa81 troopa81 merged commit 9eedb44 into qgis:master Sep 19, 2022
@troopa81 troopa81 added Bug Either a bug report, or a bug fix. Let's hope for the latter! backport release-3_22 labels Sep 19, 2022
@qgis-bot
Copy link
Collaborator

The backport to release-3_22 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply d1182330f0... [WFS/OPAIF provider] Take into account page size, max feature count, etc. from the connection into the URI of the added layer (fixes #49404)
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/providers/wfs/qgswfsconnection.cpp
CONFLICT (content): Merge conflict in src/providers/wfs/qgswfsconnection.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-release-3_22 release-3_22
# Navigate to the new working tree
cd .worktrees/backport-release-3_22
# Create a new branch
git switch --create backport-50236-to-release-3_22
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick d1182330f010fe805608214119529d268568da1b
# Push it to GitHub
git push --set-upstream origin backport-50236-to-release-3_22
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_22

Then, create a pull request where the base branch is release-3_22 and the compare/head branch is backport-50236-to-release-3_22.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Sep 19, 2022
@rouault
Copy link
Contributor Author

rouault commented Sep 19, 2022

I don't think this applies to 3.22 branch. The new settings infrastructure was added afterwards

@troopa81 troopa81 removed backport release-3_22 failed backport The automated backport attempt failed, needs a manual backport labels Sep 19, 2022
@troopa81
Copy link
Contributor

I don't think this applies to 3.22 branch. The new settings infrastructure was added afterwards

Yes, you're right

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Either a bug report, or a bug fix. Let's hope for the latter!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

WFS/QgsOapifProvider does not take the pageSize from the dialog into account
3 participants