Merge branch 'main' into james/views2

James Cor · James Cor · commit 6d303541a5b3 · 2024-11-05T20:46:39.000-08:00
diff --git a/sql/planbuilder/select.go b/sql/planbuilder/select.go
@@ -211,12 +211,11 @@ func (b *Builder) currentDb() sql.Database {
 		if err != nil {
 			b.handleErr(err)
 		}
-
-		if privilegedDatabase, ok := database.(mysql_db.PrivilegedDatabase); ok {
-			database = privilegedDatabase.Unwrap()
-		}
 		b.currentDatabase = database
 	}
+	if privilegedDatabase, ok := b.currentDatabase.(mysql_db.PrivilegedDatabase); ok {
+		b.currentDatabase = privilegedDatabase.Unwrap()
+	}
 	return b.currentDatabase
 }
 

Original file line number	Diff line number	Diff line change
`@@ -211,12 +211,11 @@ func (b *Builder) currentDb() sql.Database {`
`211`	`211`	`if err != nil {`
`212`	`212`	`b.handleErr(err)`
`213`	`213`	`}`
`214`		`-`
`215`		`- if privilegedDatabase, ok := database.(mysql_db.PrivilegedDatabase); ok {`
`216`		`- database = privilegedDatabase.Unwrap()`
`217`		`- }`
`218`	`214`	`b.currentDatabase = database`
`219`	`215`	`}`
	`216`	`+ if privilegedDatabase, ok := b.currentDatabase.(mysql_db.PrivilegedDatabase); ok {`
	`217`	`+ b.currentDatabase = privilegedDatabase.Unwrap()`
	`218`	`+ }`
`220`	`219`	`return b.currentDatabase`
`221`	`220`	`}`
`222`	`221`