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

OpenFileGDB: fix attribute filter when an equality comparison is involved… #10346

Merged
merged 2 commits into from
Jul 6, 2024

Conversation

rouault
Copy link
Member

@rouault rouault commented Jul 1, 2024

… with a field with an index created with a LOWER(field_name) expression

Fixes #10345

…lved with a field with an index created with a LOWER(field_name) expression

Fixes OSGeo#10345
@coveralls
Copy link
Collaborator

Coverage Status

coverage: 69.262% (-0.001%) from 69.263%
when pulling efe4a6e on rouault:fix_10345
into e179609 on OSGeo:master.

@coveralls
Copy link
Collaborator

Coverage Status

coverage: 69.263%. remained the same
when pulling d60294f on rouault:fix_10345
into e179609 on OSGeo:master.

ogr/ogrsf_frmts/openfilegdb/filegdbindex.cpp Outdated Show resolved Hide resolved
ogr/ogrsf_frmts/openfilegdb/filegdbindex.cpp Outdated Show resolved Hide resolved
Co-authored-by: Alessandro Pasotti <elpaso@itopen.it>
@rouault rouault merged commit b73e49e into OSGeo:master Jul 6, 2024
31 of 33 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 d60294fcf7... OpenFileGDB: fix attribute filter when an equality comparison is involved with a field with an index created with a LOWER(field_name) expression
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_openfilegdb.py
CONFLICT (content): Merge conflict in autotest/ogr/ogr_openfilegdb.py
Auto-merging ogr/ogrsf_frmts/openfilegdb/filegdbindex.cpp
Auto-merging ogr/ogrsf_frmts/openfilegdb/filegdbtable.h
Auto-merging ogr/ogrsf_frmts/openfilegdb/ogropenfilegdblayer.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-10346-to-release/3.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick d60294fcf721a9aa934db7e792be63cbc49021be,8ef298f2c1289093dae5da60d2f12a482a405a70
# Push it to GitHub
git push --set-upstream origin backport-10346-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-10346-to-release/3.9.

@coveralls
Copy link
Collaborator

Coverage Status

coverage: 69.27% (+0.007%) from 69.263%
when pulling 8ef298f on rouault:fix_10345
into e179609 on OSGeo:master.

@rouault
Copy link
Member Author

rouault commented Jul 6, 2024

backported to 3.9 per #10373

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.

ESRI FileGDB Driver 3.9.1 ERROR 1
3 participants