8000 Use regular CREATE TABLE instead of CREATE TEMPORARY by mike-pt · Pull Request #30669 · keycloak/keycloak · GitHub
[go: up one dir, main page]
Skip to content

Use regular CREATE TABLE instead of CREATE TEMPORARY - #30669

Merged
pedroigor merged 1 commit into
keycloak:mainfrom
mike-pt:patch-1
Nov 28, 2024
Merged

Use regular CREATE TABLE instead of CREATE TEMPORARY#30669
pedroigor merged 1 commit into
keycloak:mainfrom
mike-pt:patch-1

Conversation

@mike-pt
@mike-pt mike-pt commented Jun 22, 2024 •
edited
Loading
Copy link
Copy Markdown
Contributor

Some hosted/managed environments like google CloudSQL, might not support this type of statement (i.e. when using replication and GTID) as seen in #30631

Since we are dropping the table anyway it seems a regular CREATE statement should work fine here.

Closes #30631

Signed-off-by: mike-pt mike-pt@users.noreply.github.com

@mike-pt
mike-pt requested a review from a team as a code owner June 22, 2024 08:11
@mike-pt
mike-pt force-pushed the patch-1 branch 2 times, most recently from 50cbf2d to 0b9c43f Compare June 24, 2024 12:34
@mike-pt
mike-pt commented Jun 24, 2024
Copy link
Copy Markdown
Contributor Author

rebased with main

@pedroigor
pedroigor commented Jul 1, 2024
Copy link
Copy Markdown
Contributor

@mike-pt Please, see https://github.com/keycloak/keycloak/actions/runs/9645408727/job/26890406244?pr=30669#step:4:2086.

This was referenced Jul 1, 2024
Closed
Closed
@mike-pt
mike-pt commented Jul 1, 2024
Copy link
Copy Markdown
Contributor Author

@mike-pt Please, see https://github.com/keycloak/keycloak/actions/runs/9645408727/job/26890406244?pr=30669#step:4:2086.

I see the issue now, I missed one more DROP statement still using TEMPORARY.
Should be good now

@mike-pt
mike-pt requested a review from pedroigor July 2, 2024 15:03
@mike-pt
mike-pt commented Jul 17, 2024
Copy link
Copy Markdown
Contributor Author

@pedroigor is there any other pending action from me on this?

@codespearhead
codespearhead commented Oct 3, 2024 •
edited
Loading
Copy link
Copy Markdown

It sounds like a reasonable fix.

Could you remove the merge commit to maintain a linear Git history?

To do so, run:

git clone --single-branch --branch patch-1 git@github.com:mike-pt/keycloak.git
cd keycloak

# Remove the merge commit from your local branch
git reset --hard HEAD~1

# Rebase your local branch onto main
git remote add upstream git@github.com:keycloak/keycloak.git
git pull --rebase upstream main

# Make sure the only commit in it is signed
git commit --amend --signoff

# Force push your local branch to remove the previously pushed merge commit by resetting the remote branch
git push --force

Additionally, I suggest adding the following line at the end of the PR, as it hints that you haven’t overlooked this requirement in the commit message.

Signed-off-by: mike-pt <mike-pt@users.noreply.github.com>

@mike-pt
Use regular CREATE TABLE instead of CREATE TEMPORARY
c4793d2 
Some hosted/managed environments like google CloudSQL, might not support this type of statement (i.e. when using replication and GTID)

Since we are dropping the table anyway it seems a regular CREATE statement should work fine here.

Signed-off-by: mike-pt <mike-pt@users.noreply.github.com>
@mike-pt
mike-pt commented Oct 3, 2024
8000 Copy link
Copy Markdown
Contributor Author

@codespearhead recommendations addressed

@ahus1 ahus1 self-assigned this Oct 18, 2024
keycloak-github-bot[bot]
keycloak-github-bot Bot reviewed Oct 18, 2024
View reviewed changes
@keycloak-github-bot keycloak-github-bot Bot left a comment
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Unreported flaky test detected, please review

@keycloak-github-bot
keycloak-github-bot Bot commented Oct 18, 2024
Copy link
Copy Markdown

Unreported flaky test detected

If the flaky tests below are affected by the changes, please review and update the changes accordingly. Otherwise, a maintainer should report the flaky tests prior to merging the PR.

org.keycloak.testsuite.webauthn.WebAuthnIdlessTest#testWebAuthnIDLessAndWebAuthnAndWebAuthnPasswordlessLogin

Keycloak CI - WebAuthn IT (chrome)

java.lang.AssertionError: Expected SelectAuthenticatorPage but was Sign in to test (https://localhost:8543/auth/realms/test/protocol/openid-connect/auth?response_type=code&client_id=test-app&redirect_uri=https%3A%2F%2Flocalhost%3A8543%2Fauth%2Frealms%2Fmaster%2Fapp%2Fauth&state=9f44a0d7-b582-446d-8253-968cd37122c2&scope=openid)
	at org.junit.Assert.fail(Assert.java:89)
	at org.junit.Assert.assertTrue(Assert.java:42)
	at org.keycloak.testsuite.pages.AbstractPage.assertCurrent(AbstractPage.java:47)
	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
...

Report flaky test

ahus1
ahus1 approved these changes Oct 18, 2024
View reviewed changes
@ahus1 ahus1 left a comment
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, thank you for the change.
@pedroigor - are you ok if we merge this?

@codespearhead codespearhead mentioned this pull request Oct 18, 2024
Merged
@mike-pt
mike-pt commented Nov 1, 2024
Copy link
Copy Markdown
Contributor Author

@pedroigor is there anything blocking this on my side?

@mike-pt
mike-pt commented Nov 27, 2024
Copy link
Copy Markdown
Contributor Author

@pedroigor sorry for the re ping but its been a month since my last comment and I'm not sure if there is something blocking this or now? It seems it was already approved just needs to be merged in?

@pedroigor
pedroigor commented Nov 28, 2024
Copy link
Copy Markdown
Contributor

Sorry for the delay. Thanks!

@pedroigor
pedroigor merged commit 195ace8 into keycloak:main Nov 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pedroigor pedroigor pedroigor approved these changes
@ahus1 ahus1 ahus1 approved these changes
+2 more reviewers
@keycloak-github-bot keycloak-github-bot[bot] keycloak-github-bot[bot] left review comments
@codespearhead codespearhead codespearhead approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@pedroigor pedroigor

@ahus1 ahus1

Labels

flaky-test

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Upgrade to 25 throws: Statement violates GTID consistency

4 participants

@mike-pt @pedroigor @codespearhead @ahus1
0