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

PG: fix ogr2ogr scenarios to PostgreSQL when there are several input … #10327

Merged
merged 1 commit into from
Jul 6, 2024

Conversation

rouault
Copy link
Member

@rouault rouault commented Jun 27, 2024

…layer names like schema_name.layer_name (3.9.0 regression)

Fixes #10311

…layer names like schema_name.layer_name (3.9.0 regression)

Fixes OSGeo#10311
@rouault rouault merged commit 4b0a7ad into OSGeo:master Jul 6, 2024
36 checks passed
@rouault
Copy link
Member Author

rouault commented Jul 6, 2024

The backport to release/3.9 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 01d25df6f1... PG: fix ogr2ogr scenarios to PostgreSQL when there are several input layer names like schema_name.layer_name (3.9.0 regression)
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 advice.mergeConflict false"

stdout
Auto-merging autotest/ogr/ogr_pg.py
CONFLICT (content): Merge conflict in autotest/ogr/ogr_pg.py
Auto-merging ogr/ogrsf_frmts/pg/ogrpgdatasource.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.9 release/3.9
# Navigate to the new working tree
cd .worktrees/backport-release/3.9
# Create a new branch
git switch --create backport-10327-to-release/3.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 01d25df6f1cae57a6b83c1bd88e63e78a239730a
# Push it to GitHub
git push --set-upstream origin backport-10327-to-release/3.9
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/3.9

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

@rouault
Copy link
Member Author

rouault commented Jul 6, 2024

backported in #10371

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ogr2ogr does not see Postgresql schemas on gdal 3.9.0
2 participants