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

[TASK] Hint using multiple join conditions #5062

Merged
merged 2 commits into from
Nov 19, 2024
Merged

Conversation

garvinhicking
Copy link
Contributor

This shows how string casting can turn an expression into a string that can be used as a combined join condition.

Context: https://forge.typo3.org/issues/105615#change-532631

Releases: main, 13.4, 12.4

This shows how string casting can turn an expression into a string that can be used as a combined join condition.

Context: https://forge.typo3.org/issues/105615#change-532631

Releases: main, 13.4, 12.4
@garvinhicking garvinhicking added backport 12.4 Backport to TYPO3v12 backport 13.4 Backport to TYPO3v13 labels Nov 19, 2024
@garvinhicking garvinhicking self-assigned this Nov 19, 2024
Copy link

@Moongazer Moongazer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its good, thanks

@linawolf linawolf merged commit 4a61676 into main Nov 19, 2024
10 checks passed
@linawolf linawolf deleted the garvinhicking-patch-1 branch November 19, 2024 16:04
Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 489360e66... [TASK] Hint using multiple join conditions
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 Documentation/ApiOverview/Database/QueryBuilder/Index.rst
CONFLICT (content): Merge conflict in Documentation/ApiOverview/Database/QueryBuilder/Index.rst

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-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-5062-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 489360e6615c344d71eb96db8199c13875287d8c,501b585b1f06055ca26f4dc188cd31193c8acf74
# Push it to GitHub
git push --set-upstream origin backport-5062-to-12.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-12.4

Then, create a pull request where the base branch is 12.4 and the compare/head branch is backport-5062-to-12.4.

garvinhicking added a commit that referenced this pull request Nov 19, 2024
* [TASK] Hint using multiple join conditions

This shows how string casting can turn an expression into a string that can be used as a combined join condition.

Context: https://forge.typo3.org/issues/105615#change-532631

Releases: main, 13.4, 12.4

* Update Documentation/ApiOverview/Database/QueryBuilder/Index.rst

Co-authored-by: Lina Wolf <[email protected]>

---------

Co-authored-by: Lina Wolf <[email protected]>
garvinhicking added a commit that referenced this pull request Nov 19, 2024
* [TASK] Hint using multiple join conditions

This shows how string casting can turn an expression into a string that can be used as a combined join condition.

Context: https://forge.typo3.org/issues/105615#change-532631

Releases: main, 13.4, 12.4

* Update Documentation/ApiOverview/Database/QueryBuilder/Index.rst



---------

Co-authored-by: Lina Wolf <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 12.4 Backport to TYPO3v12 backport 13.4 Backport to TYPO3v13 backport-done
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants