Vinai/dbeaver fixes #338
Merged
Vinai/dbeaver fixes #338
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zachmu
approved these changes
Mar 18, 2021
server/handler.go
Outdated
| queriedDatabase := ctx.GetQueriedDatabase() | ||
|
|
||
| if queriedDatabase != "" { | ||
| ctx.SetQueriedDatabase("") // reset the queried database variable |
There was a problem hiding this comment.
This should happen every statement, regardless of the logic at the call site for this function. Clients have access to this variable too, so we need to be setting it consistently on every query.
| @@ -124,17 +124,27 @@ func applyTriggers(ctx *sql.Context, a *Analyzer, n sql.Node, scope *Scope) (sql | |||
|
|
|||
| var affectedTables []string | |||
| var triggerEvent plan.TriggerEvent | |||
| db := ctx.GetCurrentDatabase() | |||
| plan.Inspect(n, func(n sql.Node) bool { | |||
There was a problem hiding this comment.
Need to add some engine tests for triggers on inserts that specify a non-current DB for inserts / updates / deletes. Just copy and tweak some existing trigger tests.
There was a problem hiding this comment.
I don't think mysql supports cross-db trigger queries. Following up in messages.
sql/session.go
Outdated
| @@ -82,6 +82,10 @@ type Session interface { | |||
| DelLock(lockName string) error | |||
| // IterLocks iterates through all locks owned by this user | |||
| IterLocks(cb func(name string) error) error | |||
| // GetQueriedDatabase represents the database the user is running a query on that is NOT the current database. | |||
| GetQueriedDatabase() string | |||
| // SetQueriedDatabase sets the queried database. | |||
There was a problem hiding this comment.
Note that this should only be used internally by the engine
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pr allows for queries like
CREATE TABLE x.table(pk int)when the mysql client is not set to x.