Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

refactor: rename UsePostgresDatabaseOwner to TenantMode and optimize project fetching (#18598)

Danny Xu1457133c9554
diff --git a/backend/api/v1/release_service.go b/backend/api/v1/release_service.go
index fef8249519..3888c745ff 100644
--- a/backend/api/v1/release_service.go
+++ b/backend/api/v1/release_service.go
@@ -19,7 +19,6 @@ import (
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
"github.com/bytebase/bytebase/backend/generated-go/v1/v1connect"
- "github.com/bytebase/bytebase/backend/runner/schemasync"
"github.com/bytebase/bytebase/backend/store"
"github.com/bytebase/bytebase/backend/store/model"
)
@@ -28,7 +27,6 @@ type ReleaseService struct {
v1connect.UnimplementedReleaseServiceHandler
store *store.Store
sheetManager *sheet.Manager
- schemaSyncer *schemasync.Syncer
dbFactory *dbfactory.DBFactory
iamManager *iam.Manager
}
@@ -36,14 +34,12 @@ type ReleaseService struct {
func NewReleaseService(
store *store.Store,
sheetManager *sheet.Manager,
- schemaSyncer *schemasync.Syncer,
dbFactory *dbfactory.DBFactory,
iamManager *iam.Manager,
) *ReleaseService {
return &ReleaseService{
store: store,
sheetManager: sheetManager,
- schemaSyncer: schemaSyncer,
dbFactory: dbFactory,
iamManager: iamManager,
}
diff --git a/backend/api/v1/release_service_check.go b/backend/api/v1/release_service_check.go
index 4bd36aeec5..abffae8eb4 100644
--- a/backend/api/v1/release_service_check.go
+++ b/backend/api/v1/release_service_check.go
@@ -128,7 +128,7 @@ func (s *ReleaseService) CheckRelease(ctx context.Context, req *connect.Request[
}
response = resp
case v1pb.Release_File_VERSIONED:
- resp, err := s.checkReleaseVersioned(ctx, sanitizedFiles, targetDatabases, request.CustomRules)
+ resp, err := s.checkReleaseVersioned(ctx, project, sanitizedFiles, targetDatabases, request.CustomRules)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to check release versioned"))
}
@@ -140,7 +140,7 @@ func (s *ReleaseService) CheckRelease(ctx context.Context, req *connect.Request[
return connect.NewResponse(response), nil
}
-func (s *ReleaseService) checkReleaseVersioned(ctx context.Context, files []*v1pb.Release_File, databases []*store.DatabaseMessage, customRules string) (*v1pb.CheckReleaseResponse, error) {
+func (s *ReleaseService) checkReleaseVersioned(ctx context.Context, project *store.ProjectMessage, files []*v1pb.Release_File, databases []*store.DatabaseMessage, customRules string) (*v1pb.CheckReleaseResponse, error) {
resp := &v1pb.CheckReleaseResponse{}
var errorAdviceCount, warningAdviceCount int
@@ -280,7 +280,7 @@ loop:
resp.AffectedRows += summaryReport.AffectedRows
}
if common.EngineSupportSQLReview(engine) {
- adviceStatus, sqlReviewAdvices, err := s.runSQLReviewCheckForFile(ctx, originMetadata, finalMetadata, instance, database, false /* enableSDL */, statement)
+ adviceStatus, sqlReviewAdvices, err := s.runSQLReviewCheckForFile(ctx, project, originMetadata, finalMetadata, instance, database, false /* enableSDL */, statement)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to check SQL review"))
}
@@ -629,6 +629,7 @@ func (s *ReleaseService) checkReleaseDeclarative(ctx context.Context, files []*v
func (s *ReleaseService) runSQLReviewCheckForFile(
ctx context.Context,
+ project *store.ProjectMessage,
originMetadata *model.DatabaseMetadata,
finalMetadata *model.DatabaseMetadata,
instance *store.InstanceMessage,
@@ -644,26 +645,10 @@ func (s *ReleaseService) runSQLReviewCheckForFile(
return storepb.Advice_ERROR, nil, errors.Wrapf(err, "failed to fetch database schema for database %s", database.String())
}
if dbMetadata == nil {
- if err := s.schemaSyncer.SyncDatabaseSchema(ctx, database); err != nil {
- return storepb.Advice_ERROR, nil, errors.Wrapf(err, "failed to sync database schema for database %s", database.String())
- }
- dbMetadata, err = s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{
- InstanceID: database.InstanceID,
- DatabaseName: database.DatabaseName,
- })
- if err != nil {
- return storepb.Advice_ERROR, nil, errors.Wrapf(err, "failed to fetch database schema for database %s", database.String())
- }
- if dbMetadata == nil {
- return storepb.Advice_ERROR, nil, errors.Wrapf(err, "cannot found schema for database %s", database.String())
- }
+ return storepb.Advice_ERROR, nil, errors.Wrapf(err, "cannot found schema for database %s", database.String())
}
dbMetadataProto := dbMetadata.GetProto()
- useDatabaseOwner, err := getUseDatabaseOwner(ctx, s.store, instance, database)
- if err != nil {
- return storepb.Advice_ERROR, nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get use database owner"))
- }
driver, err := s.dbFactory.GetAdminDatabaseDriver(ctx, instance, database, db.ConnectionContext{})
if err != nil {
return storepb.Advice_ERROR, nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get database driver"))
@@ -672,17 +657,17 @@ func (s *ReleaseService) runSQLReviewCheckForFile(
connection := driver.GetDB()
context := advisor.Context{
- EnableSDL: enableSDL,
- DBSchema: dbMetadataProto,
- DBType: instance.Metadata.GetEngine(),
- OriginalMetadata: originMetadata,
- FinalMetadata: finalMetadata,
- Driver: connection,
- CurrentDatabase: database.DatabaseName,
- UsePostgresDatabaseOwner: useDatabaseOwner,
- ListDatabaseNamesFunc: BuildListDatabaseNamesFunc(s.store),
- InstanceID: instance.ResourceID,
- IsObjectCaseSensitive: store.IsObjectCaseSensitive(instance),
+ EnableSDL: enableSDL,
+ DBSchema: dbMetadataProto,
+ DBType: instance.Metadata.GetEngine(),
+ OriginalMetadata: originMetadata,
+ FinalMetadata: finalMetadata,
+ Driver: connection,
+ CurrentDatabase: database.DatabaseName,
+ TenantMode: project.Setting.GetPostgresDatabaseTenantMode(),
+ ListDatabaseNamesFunc: BuildListDatabaseNamesFunc(s.store),
+ InstanceID: instance.ResourceID,
+ IsObjectCaseSensitive: store.IsObjectCaseSensitive(instance),
}
reviewConfig, err := s.store.GetReviewConfigForDatabase(ctx, database)
diff --git a/backend/api/v1/sql_service.go b/backend/api/v1/sql_service.go
index 745bd32d16..b9047de8fc 100644
--- a/backend/api/v1/sql_service.go
+++ b/backend/api/v1/sql_service.go
@@ -1683,24 +1683,6 @@ func (*SQLService) getUser(ctx context.Context) (*store.UserMessage, error) {
return user, nil
}
-func getUseDatabaseOwner(ctx context.Context, stores *store.Store, instance *store.InstanceMessage, database *store.DatabaseMessage) (bool, error) {
- if instance.Metadata.GetEngine() != storepb.Engine_POSTGRES {
- return false, nil
- }
-
- // Check the project setting to see if we should use the database owner.
- project, err := stores.GetProject(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID})
- if err != nil {
- return false, errors.Wrapf(err, "failed to get project")
- }
-
- if project.Setting == nil {
- return false, nil
- }
-
- return project.Setting.PostgresDatabaseTenantMode, nil
-}
-
func (*SQLService) DiffMetadata(_ context.Context, req *connect.Request[v1pb.DiffMetadataRequest]) (*connect.Response[v1pb.DiffMetadataResponse], error) {
request := req.Msg
switch request.Engine {
diff --git a/backend/plugin/advisor/advisor.go b/backend/plugin/advisor/advisor.go
index b1afad459e..e00a9070b3 100644
--- a/backend/plugin/advisor/advisor.go
+++ b/backend/plugin/advisor/advisor.go
@@ -57,8 +57,8 @@ type Context struct {
// StatementsTotalSize is the total size of all statements in bytes.
// Used for size limit checks without needing the full statement text.
StatementsTotalSize int
- // UsePostgresDatabaseOwner is true if the advisor should use the database owner as default role.
- UsePostgresDatabaseOwner bool
+ // TenantMode indicates whether to use database owner role for PostgreSQL tenant mode.
+ TenantMode bool
// SQL review level fields.
DBType storepb.Engine
diff --git a/backend/plugin/advisor/pg/advisor_insert_row_limit.go b/backend/plugin/advisor/pg/advisor_insert_row_limit.go
index 06294cf6b8..c364509966 100644
--- a/backend/plugin/advisor/pg/advisor_insert_row_limit.go
+++ b/backend/plugin/advisor/pg/advisor_insert_row_limit.go
@@ -60,11 +60,11 @@ func (*InsertRowLimitAdvisor) Check(ctx context.Context, checkCtx advisor.Contex
level: level,
title: checkCtx.Rule.Type.String(),
},
- maxRow: int(numberPayload.Number),
- driver: checkCtx.Driver,
- ctx: ctx,
- tokens: antlrAST.Tokens,
- UsePostgresDatabaseOwner: checkCtx.UsePostgresDatabaseOwner,
+ maxRow: int(numberPayload.Number),
+ driver: checkCtx.Driver,
+ ctx: ctx,
+ tokens: antlrAST.Tokens,
+ TenantMode: checkCtx.TenantMode,
}
rule.SetBaseLine(stmtInfo.BaseLine)
@@ -79,13 +79,13 @@ func (*InsertRowLimitAdvisor) Check(ctx context.Context, checkCtx advisor.Contex
type insertRowLimitRule struct {
BaseRule
- maxRow int
- driver *sql.DB
- ctx context.Context
- tokens *antlr.CommonTokenStream
- explainCount int
- setRoles []string
- UsePostgresDatabaseOwner bool
+ maxRow int
+ driver *sql.DB
+ ctx context.Context
+ tokens *antlr.CommonTokenStream
+ explainCount int
+ setRoles []string
+ TenantMode bool
}
func (*insertRowLimitRule) Name() string {
@@ -154,8 +154,8 @@ func (r *insertRowLimitRule) handleInsertstmt(ctx *parser.InsertstmtContext) {
r.explainCount++
res, err := advisor.Query(r.ctx, advisor.QueryContext{
- UsePostgresDatabaseOwner: r.UsePostgresDatabaseOwner,
- PreExecutions: r.setRoles,
+ TenantMode: r.TenantMode,
+ PreExecutions: r.setRoles,
}, r.driver, storepb.Engine_POSTGRES, fmt.Sprintf("EXPLAIN %s", statementText))
if err != nil {
diff --git a/backend/plugin/advisor/pg/advisor_statement_affected_row_limit.go b/backend/plugin/advisor/pg/advisor_statement_affected_row_limit.go
index 1481f53012..7cedfbbd74 100644
--- a/backend/plugin/advisor/pg/advisor_statement_affected_row_limit.go
+++ b/backend/plugin/advisor/pg/advisor_statement_affected_row_limit.go
@@ -60,11 +60,11 @@ func (*StatementAffectedRowLimitAdvisor) Check(ctx context.Context, checkCtx adv
level: level,
title: checkCtx.Rule.Type.String(),
},
- maxRow: int(numberPayload.Number),
- ctx: ctx,
- driver: checkCtx.Driver,
- usePostgresDatabaseOwner: checkCtx.UsePostgresDatabaseOwner,
- tokens: antlrAST.Tokens,
+ maxRow: int(numberPayload.Number),
+ ctx: ctx,
+ driver: checkCtx.Driver,
+ tenantMode: checkCtx.TenantMode,
+ tokens: antlrAST.Tokens,
}
rule.SetBaseLine(stmtInfo.BaseLine)
@@ -78,13 +78,13 @@ func (*StatementAffectedRowLimitAdvisor) Check(ctx context.Context, checkCtx adv
type statementAffectedRowLimitRule struct {
BaseRule
- maxRow int
- driver *sql.DB
- ctx context.Context
- explainCount int
- setRoles []string
- usePostgresDatabaseOwner bool
- tokens *antlr.CommonTokenStream
+ maxRow int
+ driver *sql.DB
+ ctx context.Context
+ explainCount int
+ setRoles []string
+ tenantMode bool
+ tokens *antlr.CommonTokenStream
}
func (*statementAffectedRowLimitRule) Name() string {
@@ -160,8 +160,8 @@ func (r *statementAffectedRowLimitRule) checkAffectedRows(ctx antlr.ParserRuleCo
// Run EXPLAIN to get estimated row count
res, err := advisor.Query(r.ctx, advisor.QueryContext{
- UsePostgresDatabaseOwner: r.usePostgresDatabaseOwner,
- PreExecutions: r.setRoles,
+ TenantMode: r.tenantMode,
+ PreExecutions: r.setRoles,
}, r.driver, storepb.Engine_POSTGRES, fmt.Sprintf("EXPLAIN %s", statementText))
if err != nil {
diff --git a/backend/plugin/advisor/pg/advisor_statement_dml_dry_run.go b/backend/plugin/advisor/pg/advisor_statement_dml_dry_run.go
index 77159b4579..6a67562539 100644
--- a/backend/plugin/advisor/pg/advisor_statement_dml_dry_run.go
+++ b/backend/plugin/advisor/pg/advisor_statement_dml_dry_run.go
@@ -53,10 +53,10 @@ func (*StatementDMLDryRunAdvisor) Check(ctx context.Context, checkCtx advisor.Co
level: level,
title: checkCtx.Rule.Type.String(),
},
- ctx: ctx,
- driver: checkCtx.Driver,
- usePostgresDatabaseOwner: checkCtx.UsePostgresDatabaseOwner,
- tokens: antlrAST.Tokens,
+ ctx: ctx,
+ driver: checkCtx.Driver,
+ tenantMode: checkCtx.TenantMode,
+ tokens: antlrAST.Tokens,
}
rule.SetBaseLine(stmtInfo.BaseLine)
@@ -70,12 +70,12 @@ func (*StatementDMLDryRunAdvisor) Check(ctx context.Context, checkCtx advisor.Co
type statementDMLDryRunRule struct {
BaseRule
- driver *sql.DB
- ctx context.Context
- explainCount int
- setRoles []string
- usePostgresDatabaseOwner bool
- tokens *antlr.CommonTokenStream
+ driver *sql.DB
+ ctx context.Context
+ explainCount int
+ setRoles []string
+ tenantMode bool
+ tokens *antlr.CommonTokenStream
}
// Name returns the rule name.
@@ -157,8 +157,8 @@ func (r *statementDMLDryRunRule) checkDMLDryRun(ctx antlr.ParserRuleContext) {
// Run EXPLAIN to perform dry run
_, err := advisor.Query(r.ctx, advisor.QueryContext{
- UsePostgresDatabaseOwner: r.usePostgresDatabaseOwner,
- PreExecutions: r.setRoles,
+ TenantMode: r.tenantMode,
+ PreExecutions: r.setRoles,
}, r.driver, storepb.Engine_POSTGRES, fmt.Sprintf("EXPLAIN %s", statementText))
if err != nil {
diff --git a/backend/plugin/advisor/pg/advisor_statement_object_owner_check.go b/backend/plugin/advisor/pg/advisor_statement_object_owner_check.go
index 5e35db9cd6..153c33e044 100644
--- a/backend/plugin/advisor/pg/advisor_statement_object_owner_check.go
+++ b/backend/plugin/advisor/pg/advisor_statement_object_owner_check.go
@@ -41,7 +41,7 @@ func (*StatementObjectOwnerCheckAdvisor) Check(ctx context.Context, checkCtx adv
dbMetadata := model.NewDatabaseMetadata(checkCtx.DBSchema, nil, nil, storepb.Engine_POSTGRES, checkCtx.IsObjectCaseSensitive)
currentRole := checkCtx.DBSchema.Owner
- if !checkCtx.UsePostgresDatabaseOwner {
+ if !checkCtx.TenantMode {
currentRole, err = getCurrentUser(ctx, checkCtx.Driver)
if err != nil {
slog.Debug("Failed to get current user", log.BBError(err))
diff --git a/backend/plugin/advisor/utils.go b/backend/plugin/advisor/utils.go
index f6a42fa634..14b1a994e5 100644
--- a/backend/plugin/advisor/utils.go
+++ b/backend/plugin/advisor/utils.go
@@ -23,8 +23,8 @@ func NormalizeStatement(statement string) string {
}
type QueryContext struct {
- UsePostgresDatabaseOwner bool
- PreExecutions []string
+ TenantMode bool
+ PreExecutions []string
}
// Query runs the EXPLAIN or SELECT statements for advisors.
@@ -35,7 +35,7 @@ func Query(ctx context.Context, qCtx QueryContext, connection *sql.DB, engine st
}
defer tx.Rollback()
- if engine == storepb.Engine_POSTGRES && qCtx.UsePostgresDatabaseOwner {
+ if engine == storepb.Engine_POSTGRES && qCtx.TenantMode {
const query = `
SELECT
u.rolname
diff --git a/backend/plugin/advisor/utils_for_tests.go b/backend/plugin/advisor/utils_for_tests.go
index 80e993543a..82b66e2317 100644
--- a/backend/plugin/advisor/utils_for_tests.go
+++ b/backend/plugin/advisor/utils_for_tests.go
@@ -216,16 +216,16 @@ func RunSQLReviewRuleTest(t *testing.T, rule *storepb.SQLReviewRule, dbType stor
ruleList := []*storepb.SQLReviewRule{rule}
checkCtx := Context{
- DBType: dbType,
- OriginalMetadata: originalMetadata,
- FinalMetadata: finalMetadata,
- Driver: nil,
- CurrentDatabase: curDB,
- DBSchema: schemaMetadata,
- EnableSDL: tc.EnableSDL,
- EnablePriorBackup: true, // Enable backup for testing
- NoAppendBuiltin: true,
- UsePostgresDatabaseOwner: true,
+ DBType: dbType,
+ OriginalMetadata: originalMetadata,
+ FinalMetadata: finalMetadata,
+ Driver: nil,
+ CurrentDatabase: curDB,
+ DBSchema: schemaMetadata,
+ EnableSDL: tc.EnableSDL,
+ EnablePriorBackup: true, // Enable backup for testing
+ NoAppendBuiltin: true,
+ TenantMode: true,
}
adviceList, err := SQLReviewCheck(t.Context(), sm, tc.Statement, ruleList, checkCtx)
diff --git a/backend/plugin/db/cockroachdb/cockroachdb.go b/backend/plugin/db/cockroachdb/cockroachdb.go
index 2052816377..32d5ae14ba 100644
--- a/backend/plugin/db/cockroachdb/cockroachdb.go
+++ b/backend/plugin/db/cockroachdb/cockroachdb.go
@@ -60,7 +60,7 @@ func newDriver() db.Driver {
}
// Open opens a Postgres driver.
-func (d *Driver) Open(ctx context.Context, _ storepb.Engine, config db.ConnectionConfig) (db.Driver, error) {
+func (d *Driver) Open(_ context.Context, _ storepb.Engine, config db.ConnectionConfig) (db.Driver, error) {
pgxConnConfig, err := getCockroachConnectionConfig(config)
if err != nil {
return nil, err
@@ -98,18 +98,6 @@ func (d *Driver) Open(ctx context.Context, _ storepb.Engine, config db.Connectio
return nil, err
}
d.db = db
- if config.ConnectionContext.UseDatabaseOwner {
- owner, err := d.GetCurrentDatabaseOwner(ctx)
- if err != nil {
- return nil, errors.Wrapf(err, "failed to get database owner")
- }
- if err := crdb.Execute(func() error {
- _, err := d.db.ExecContext(ctx, fmt.Sprintf("SET ROLE \"%s\";", owner))
- return err
- }); err != nil {
- return nil, errors.Wrapf(err, "failed to set role to database owner %q", owner)
- }
- }
d.connectionCtx = config.ConnectionContext
return d, nil
}
diff --git a/backend/plugin/db/driver.go b/backend/plugin/db/driver.go
index 7c2aca49a9..cdc47970db 100644
--- a/backend/plugin/db/driver.go
+++ b/backend/plugin/db/driver.go
@@ -94,9 +94,9 @@ type ConnectionContext struct {
EnvironmentID string
InstanceID string
EngineVersion string
- // UseDatabaseOwner is used by Postgres for using role of database owner.
- UseDatabaseOwner bool
- DatabaseName string
+ // TenantMode indicates whether to use database owner role for PostgreSQL tenant mode.
+ TenantMode bool
+ DatabaseName string
// It's only set for Redshift datashare database.
DataShare bool
// ReadOnly is only supported for Postgres at the moment.
diff --git a/backend/plugin/db/pg/pg.go b/backend/plugin/db/pg/pg.go
index eff1b35253..f3a79fe471 100644
--- a/backend/plugin/db/pg/pg.go
+++ b/backend/plugin/db/pg/pg.go
@@ -115,7 +115,7 @@ func (d *Driver) Open(ctx context.Context, _ storepb.Engine, config db.Connectio
return nil, err
}
d.db = db
- if config.ConnectionContext.UseDatabaseOwner {
+ if config.ConnectionContext.TenantMode {
owner, err := d.GetCurrentDatabaseOwner(ctx)
if err != nil {
return nil, errors.Wrapf(err, "failed to get database owner")
@@ -407,7 +407,7 @@ func (d *Driver) Execute(ctx context.Context, statement string, opts db.ExecuteO
case IsNonTransactionStatement(command.Text):
nonTransactionAndSetRoleStmts = append(nonTransactionAndSetRoleStmts, command)
continue
- case isSuperuserStatement(command.Text) && d.connectionCtx.UseDatabaseOwner:
+ case isSuperuserStatement(command.Text) && d.connectionCtx.TenantMode:
// Use superuser privilege to run privileged statements.
slog.Info("Use superuser privilege to run privileged statements", slog.String("statement", command.Text))
ct := command.Text
@@ -502,7 +502,7 @@ func (d *Driver) executeInTransactionMode(
}
if isPlsql {
- if d.connectionCtx.UseDatabaseOwner {
+ if d.connectionCtx.TenantMode {
// USE SET SESSION ROLE to set the role for the current session.
if _, err := conn.ExecContext(ctx, fmt.Sprintf("SET SESSION ROLE '%s'", owner)); err != nil {
return 0, errors.Wrapf(err, "failed to set role to database owner %q", owner)
@@ -545,7 +545,7 @@ func (d *Driver) executeInTransactionMode(
opts.LogTransactionControl(storepb.TaskRunLog_TransactionControl_ROLLBACK, rerr)
}()
- if d.connectionCtx.UseDatabaseOwner {
+ if d.connectionCtx.TenantMode {
// Set the current transaction role to the database owner so that the owner of created objects will be the same as the database owner.
if _, err := tx.Exec(ctx, fmt.Sprintf("SET LOCAL ROLE '%s'", owner)); err != nil {
return err
@@ -598,7 +598,7 @@ func (d *Driver) executeInTransactionMode(
}
}
- if d.connectionCtx.UseDatabaseOwner {
+ if d.connectionCtx.TenantMode {
// USE SET SESSION ROLE to set the role for the current session.
if _, err := conn.ExecContext(ctx, fmt.Sprintf("SET SESSION ROLE '%s'", owner)); err != nil {
return 0, errors.Wrapf(err, "failed to set role to database owner %q", owner)
@@ -646,7 +646,7 @@ func (d *Driver) executeInAutoCommitMode(
}
}
- if d.connectionCtx.UseDatabaseOwner {
+ if d.connectionCtx.TenantMode {
// USE SET SESSION ROLE to set the role for the current session.
if _, err := conn.ExecContext(ctx, fmt.Sprintf("SET SESSION ROLE '%s'", owner)); err != nil {
return 0, errors.Wrapf(err, "failed to set role to database owner %q", owner)
diff --git a/backend/runner/plancheck/statement_advise_executor.go b/backend/runner/plancheck/statement_advise_executor.go
index 8c06c545cd..f5b729f315 100644
--- a/backend/runner/plancheck/statement_advise_executor.go
+++ b/backend/runner/plancheck/statement_advise_executor.go
@@ -169,11 +169,11 @@ func (e *StatementAdviseExecutor) runReview(
}
finalMetadata := model.NewDatabaseMetadata(clonedMetadata, nil, nil, instance.Metadata.GetEngine(), store.IsObjectCaseSensitive(instance))
- useDatabaseOwner, err := getUseDatabaseOwner(ctx, e.store, instance, database)
+ project, err := e.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID})
if err != nil {
- return nil, common.Wrapf(err, common.Internal, "failed to get use database owner")
+ return nil, common.Wrapf(err, common.Internal, "failed to get project")
}
- driver, err := e.dbFactory.GetAdminDatabaseDriver(ctx, instance, database, db.ConnectionContext{UseDatabaseOwner: useDatabaseOwner})
+ driver, err := e.dbFactory.GetAdminDatabaseDriver(ctx, instance, database, db.ConnectionContext{TenantMode: project.Setting.GetPostgresDatabaseTenantMode()})
if err != nil {
return nil, err
}
@@ -181,18 +181,18 @@ func (e *StatementAdviseExecutor) runReview(
connection := driver.GetDB()
adviceList, err := advisor.SQLReviewCheck(ctx, e.sheetManager, statement, reviewConfig.SqlReviewRules, advisor.Context{
- DBSchema: dbMetadata.GetProto(),
- EnableSDL: enableSDL,
- DBType: instance.Metadata.GetEngine(),
- OriginalMetadata: originMetadata,
- FinalMetadata: finalMetadata,
- Driver: connection,
- EnablePriorBackup: enablePriorBackup,
- EnableGhost: enableGhost,
- UsePostgresDatabaseOwner: useDatabaseOwner,
- ListDatabaseNamesFunc: e.buildListDatabaseNamesFunc(),
- InstanceID: instance.ResourceID,
- IsObjectCaseSensitive: store.IsObjectCaseSensitive(instance),
+ DBSchema: dbMetadata.GetProto(),
+ EnableSDL: enableSDL,
+ DBType: instance.Metadata.GetEngine(),
+ OriginalMetadata: originMetadata,
+ FinalMetadata: finalMetadata,
+ Driver: connection,
+ EnablePriorBackup: enablePriorBackup,
+ EnableGhost: enableGhost,
+ TenantMode: project.Setting.GetPostgresDatabaseTenantMode(),
+ ListDatabaseNamesFunc: e.buildListDatabaseNamesFunc(),
+ InstanceID: instance.ResourceID,
+ IsObjectCaseSensitive: store.IsObjectCaseSensitive(instance),
})
if err != nil {
return nil, err
diff --git a/backend/runner/plancheck/statement_report_executor.go b/backend/runner/plancheck/statement_report_executor.go
index f4653a617f..b39514706b 100644
--- a/backend/runner/plancheck/statement_report_executor.go
+++ b/backend/runner/plancheck/statement_report_executor.go
@@ -177,12 +177,12 @@ func GetSQLSummaryReport(ctx context.Context, stores *store.Store, sheetManager
var explainCalculator getAffectedRowsFromExplain
var sqlTypes []string
var defaultSchema string
- useDatabaseOwner, err := getUseDatabaseOwner(ctx, stores, instance, database)
+ project, err := stores.GetProject(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID})
if err != nil {
return nil, err
}
driver, err := dbFactory.GetAdminDatabaseDriver(ctx, instance, database, db.ConnectionContext{
- UseDatabaseOwner: useDatabaseOwner,
+ TenantMode: project.Setting.GetPostgresDatabaseTenantMode(),
})
if err != nil {
return nil, err
@@ -290,24 +290,6 @@ func GetSQLSummaryReport(ctx context.Context, stores *store.Store, sheetManager
}, nil
}
-func getUseDatabaseOwner(ctx context.Context, stores *store.Store, instance *store.InstanceMessage, database *store.DatabaseMessage) (bool, error) {
- if instance.Metadata.GetEngine() != storepb.Engine_POSTGRES {
- return false, nil
- }
-
- // Check the project setting to see if we should use the database owner.
- project, err := stores.GetProject(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID})
- if err != nil {
- return false, errors.Wrapf(err, "failed to get project")
- }
-
- if project.Setting == nil {
- return false, nil
- }
-
- return project.Setting.PostgresDatabaseTenantMode, nil
-}
-
type getAffectedRowsFromExplain func(context.Context, string) (int64, error)
func calculateAffectedRows(ctx context.Context, changeSummary *parserbase.ChangeSummary, explainCalculator getAffectedRowsFromExplain) int64 {
diff --git a/backend/runner/taskrun/database_migrate_executor.go b/backend/runner/taskrun/database_migrate_executor.go
index 1af45fd0e3..0e0af3a96d 100644
--- a/backend/runner/taskrun/database_migrate_executor.go
+++ b/backend/runner/taskrun/database_migrate_executor.go
@@ -294,12 +294,12 @@ func (exec *DatabaseMigrateExecutor) backupData(
defer backupDriver.Close(driverCtx)
}
- useDatabaseOwner, err := getUseDatabaseOwner(ctx, exec.store, instance, database)
+ project, err := exec.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID})
if err != nil {
- return nil, errors.Wrap(err, "failed to check use database owner")
+ return nil, errors.Wrap(err, "failed to get project")
}
driver, err := exec.dbFactory.GetAdminDatabaseDriver(driverCtx, instance, database, db.ConnectionContext{
- UseDatabaseOwner: useDatabaseOwner,
+ TenantMode: project.Setting.GetPostgresDatabaseTenantMode(),
})
if err != nil {
return nil, errors.Wrap(err, "failed to get database driver")
diff --git a/backend/runner/taskrun/executor.go b/backend/runner/taskrun/executor.go
index 5d8def156a..21f2f8f40c 100644
--- a/backend/runner/taskrun/executor.go
+++ b/backend/runner/taskrun/executor.go
@@ -96,24 +96,6 @@ func getCreateTaskRunLog(ctx context.Context, taskRunUID int, s *store.Store, pr
}
}
-func getUseDatabaseOwner(ctx context.Context, stores *store.Store, instance *store.InstanceMessage, database *store.DatabaseMessage) (bool, error) {
- if instance.Metadata.GetEngine() != storepb.Engine_POSTGRES {
- return false, nil
- }
-
- // Check the project setting to see if we should use the database owner.
- project, err := stores.GetProject(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID})
- if err != nil {
- return false, errors.Wrapf(err, "failed to get project")
- }
-
- if project.Setting == nil {
- return false, nil
- }
-
- return project.Setting.PostgresDatabaseTenantMode, nil
-}
-
func runMigration(ctx context.Context, driverCtx context.Context, store *store.Store, dbFactory *dbfactory.DBFactory, stateCfg *state.State, syncer *schemasync.Syncer, profile *config.Profile, task *store.TaskMessage, taskRunUID int, sheet *store.SheetMessage, schemaVersion string) (terminated bool, result *storepb.TaskRunResult, err error) {
return runMigrationWithFunc(ctx, driverCtx, store, dbFactory, stateCfg, syncer, profile, task, taskRunUID, sheet, schemaVersion, nil /* default */)
}
@@ -221,12 +203,12 @@ func doMigrationWithFunc(
instance := mc.instance
database := mc.database
- useDBOwner, err := getUseDatabaseOwner(ctx, stores, instance, database)
+ project, err := stores.GetProject(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID})
if err != nil {
- return false, errors.Wrapf(err, "failed to check if we should use database owner")
+ return false, errors.Wrapf(err, "failed to get project")
}
driver, err := mc.dbFactory.GetAdminDatabaseDriver(ctx, instance, database, db.ConnectionContext{
- UseDatabaseOwner: useDBOwner,
+ TenantMode: project.Setting.GetPostgresDatabaseTenantMode(),
})
if err != nil {
return false, errors.Wrapf(err, "failed to get driver connection for instance %q", instance.ResourceID)
@@ -243,10 +225,6 @@ func doMigrationWithFunc(
opts := db.ExecuteOptions{}
- project, err := stores.GetProject(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID})
- if err != nil {
- return false, errors.Wrapf(err, "failed to get project %v for database %v", database.ProjectID, database.DatabaseName)
- }
if project != nil && project.Setting != nil {
opts.MaximumRetries = int(project.Setting.GetExecutionRetryPolicy().GetMaximumRetries())
}
diff --git a/backend/server/grpc_routes.go b/backend/server/grpc_routes.go
index 98fbd6cac0..9c33e7b238 100644
--- a/backend/server/grpc_routes.go
+++ b/backend/server/grpc_routes.go
@@ -84,7 +84,7 @@ func configureGrpcRouters(
orgPolicyService := apiv1.NewOrgPolicyService(stores, licenseService)
planService := apiv1.NewPlanService(stores, sheetManager, licenseService, dbFactory, stateCfg, profile, iamManager)
projectService := apiv1.NewProjectService(stores, profile, iamManager, licenseService)
- releaseService := apiv1.NewReleaseService(stores, sheetManager, schemaSyncer, dbFactory, iamManager)
+ releaseService := apiv1.NewReleaseService(stores, sheetManager, dbFactory, iamManager)
reviewConfigService := apiv1.NewReviewConfigService(stores, licenseService)
revisionService := apiv1.NewRevisionService(stores)
roleService := apiv1.NewRoleService(stores, iamManager, licenseService)