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

Fix unreported MSSQL bug with connections API #50194

Merged

Conversation

elpaso
Copy link
Contributor

@elpaso elpaso commented Sep 14, 2022

Fix unreported MSSQL bug with connections API, the DB was destroyed and the next row was returning nothing.

@elpaso elpaso added Data Provider Related to specific vector, raster or mesh data providers Bug Either a bug report, or a bug fix. Let's hope for the latter! MS SQL data provider labels Sep 14, 2022
@github-actions github-actions bot added this to the 3.28.0 milestone Sep 14, 2022
@elpaso
Copy link
Contributor Author

elpaso commented Sep 14, 2022

Spotted by running the tests locally, mssql test is not running on CI unfortunately.

@nyalldawson nyalldawson merged commit 03ad7df into qgis:master Sep 14, 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 0e3cd143fd... Fix unreported MSSQL bug with connections API
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/mssql/qgsmssqlproviderconnection.cpp
CONFLICT (content): Merge conflict in src/providers/mssql/qgsmssqlproviderconnection.cpp
Auto-merging src/providers/mssql/qgsmssqlproviderconnection.h

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

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Sep 14, 2022
@elpaso elpaso deleted the mssql-connections-api-fixes-api-only branch October 4, 2022 08:14
elpaso added a commit to elpaso/QGIS that referenced this pull request Oct 4, 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! Data Provider Related to specific vector, raster or mesh data providers failed backport The automated backport attempt failed, needs a manual backport MS SQL data provider
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants