Skip to content

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

refactor: simplify NewDatabaseMetadata to accept engineType parameter (#18134)

Danny Xue57ecb8ffd53
diff --git a/backend/api/v1/release_service_check.go b/backend/api/v1/release_service_check.go
index 7ed45e44ce..1513028df1 100644
--- a/backend/api/v1/release_service_check.go
+++ b/backend/api/v1/release_service_check.go
@@ -8,11 +8,12 @@ import (
"connectrpc.com/connect"
"github.com/pkg/errors"
+ "google.golang.org/protobuf/proto"
+
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
"github.com/bytebase/bytebase/backend/plugin/advisor"
- "github.com/bytebase/bytebase/backend/plugin/advisor/catalog"
"github.com/bytebase/bytebase/backend/plugin/advisor/code"
advisorpg "github.com/bytebase/bytebase/backend/plugin/advisor/pg"
"github.com/bytebase/bytebase/backend/plugin/db"
@@ -172,10 +173,15 @@ loop:
if dbSchema == nil {
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database schema not found for %s", database.DatabaseName))
}
- originMetadata, finalMetadata, err := catalog.NewCatalogWithMetadata(dbSchema.GetMetadata(), engine, store.IsObjectCaseSensitive(instance))
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create catalog"))
+ // Create original metadata as read-only
+ originMetadata := model.NewDatabaseMetadata(dbSchema.GetMetadata(), engine, store.IsObjectCaseSensitive(instance))
+
+ // Clone metadata for final to avoid modifying the original
+ clonedMetadata, ok := proto.Clone(dbSchema.GetMetadata()).(*storepb.DatabaseSchemaMetadata)
+ if !ok {
+ return nil, connect.NewError(connect.CodeInternal, errors.New("failed to clone database schema metadata"))
}
+ finalMetadata := model.NewDatabaseMetadata(clonedMetadata, engine, store.IsObjectCaseSensitive(instance))
// Batch fetch all revisions for this database
revisions, err := s.store.ListRevisions(ctx, &store.FindRevisionMessage{
InstanceID: &database.InstanceID,
diff --git a/backend/plugin/advisor/catalog/catalog.go b/backend/plugin/advisor/catalog/catalog.go
deleted file mode 100644
index 67d52b0a78..0000000000
--- a/backend/plugin/advisor/catalog/catalog.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// Package catalog provides API definition for catalog service.
-package catalog
-
-import (
- "errors"
-
- "google.golang.org/protobuf/proto"
-
- storepb "github.com/bytebase/bytebase/backend/generated-go/store"
- "github.com/bytebase/bytebase/backend/store/model"
-)
-
-// NewCatalogWithMetadata creates original and final database catalogs from schema metadata.
-// Both are DatabaseMetadata - original is the starting state, final is mutable for walk-through.
-func NewCatalogWithMetadata(metadata *storepb.DatabaseSchemaMetadata, engineType storepb.Engine, isObjectCaseSensitive bool) (originalMetadata *model.DatabaseMetadata, final *model.DatabaseMetadata, err error) {
- // Determine detail case sensitivity based on engine type
- isDetailCaseSensitive := getIsDetailCaseSensitive(engineType)
-
- // Create original metadata as read-only
- originalMetadata = model.NewDatabaseMetadata(metadata, isObjectCaseSensitive, isDetailCaseSensitive)
-
- // Clone metadata for final to avoid modifying the original
- cloned := proto.Clone(metadata)
- clonedMetadata, ok := cloned.(*storepb.DatabaseSchemaMetadata)
- if !ok {
- return nil, nil, errors.New("failed to clone database schema metadata")
- }
-
- // Create final as mutable for walk-through
- final = model.NewDatabaseMetadata(clonedMetadata, isObjectCaseSensitive, isDetailCaseSensitive)
-
- return originalMetadata, final, nil
-}
-
-// getIsDetailCaseSensitive determines if detail names (columns, indexes) are case-sensitive
-// based on the database engine type.
-func getIsDetailCaseSensitive(engine storepb.Engine) bool {
- switch engine {
- case storepb.Engine_MYSQL, storepb.Engine_MARIADB, storepb.Engine_TIDB, storepb.Engine_MSSQL, storepb.Engine_OCEANBASE:
- return false
- default:
- return true
- }
-}
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 a10d825a98..24a07173c1 100644
--- a/backend/plugin/advisor/pg/advisor_statement_object_owner_check.go
+++ b/backend/plugin/advisor/pg/advisor_statement_object_owner_check.go
@@ -43,7 +43,7 @@ func (*StatementObjectOwnerCheckAdvisor) Check(ctx context.Context, checkCtx adv
return nil, err
}
- dbMetadata := model.NewDatabaseMetadata(checkCtx.DBSchema, checkCtx.IsObjectCaseSensitive, true /* IsDetailCaseSensitive */)
+ dbMetadata := model.NewDatabaseMetadata(checkCtx.DBSchema, storepb.Engine_POSTGRES, checkCtx.IsObjectCaseSensitive)
currentRole := checkCtx.DBSchema.Owner
if !checkCtx.UsePostgresDatabaseOwner {
currentRole, err = getCurrentUser(ctx, checkCtx.Driver)
diff --git a/backend/plugin/advisor/pg/test_helper.go b/backend/plugin/advisor/pg/test_helper.go
index 95c28865d1..47c7dada17 100644
--- a/backend/plugin/advisor/pg/test_helper.go
+++ b/backend/plugin/advisor/pg/test_helper.go
@@ -71,7 +71,7 @@ func RunANTLRAdvisorRuleTest(t *testing.T, rule advisor.SQLReviewRuleType, dbTyp
// Clone to avoid mutations affecting future test cases
finalCatalogClone, ok := proto.Clone(schemaMetadata).(*storepb.DatabaseSchemaMetadata)
require.True(t, ok, "failed to clone schema metadata")
- finalMetadata := model.NewDatabaseMetadata(finalCatalogClone, true /* isCaseSensitive for PostgreSQL */, true /* isDetailCaseSensitive */)
+ finalMetadata := model.NewDatabaseMetadata(finalCatalogClone, storepb.Engine_POSTGRES, true /* isCaseSensitive for PostgreSQL */)
// Get default payload, or use empty string for test-only rules
payload, err := advisor.SetDefaultSQLReviewRulePayload(rule, dbType)
diff --git a/backend/plugin/advisor/utils_for_tests.go b/backend/plugin/advisor/utils_for_tests.go
index f36040363d..b590002d5f 100644
--- a/backend/plugin/advisor/utils_for_tests.go
+++ b/backend/plugin/advisor/utils_for_tests.go
@@ -223,7 +223,7 @@ func RunSQLReviewRuleTest(t *testing.T, rule SQLReviewRuleType, dbType storepb.E
// Clone to avoid mutations affecting future test cases
finalCatalogClone, ok := proto.Clone(catalogMetadata).(*storepb.DatabaseSchemaMetadata)
require.True(t, ok, "failed to clone catalog metadata")
- finalMetadata := model.NewDatabaseMetadata(finalCatalogClone, isCaseSensitive, isCaseSensitive)
+ finalMetadata := model.NewDatabaseMetadata(finalCatalogClone, dbType, isCaseSensitive)
payload, err := SetDefaultSQLReviewRulePayload(rule, dbType)
require.NoError(t, err)
diff --git a/backend/plugin/parser/bigquery/query_span_test.go b/backend/plugin/parser/bigquery/query_span_test.go
index 9903560623..bce21cc4f6 100644
--- a/backend/plugin/parser/bigquery/query_span_test.go
+++ b/backend/plugin/parser/bigquery/query_span_test.go
@@ -81,7 +81,7 @@ func buildMockDatabaseMetadataGetter(databaseMetadata []*storepb.DatabaseSchemaM
return func(_ context.Context, _, databaseName string) (string, *model.DatabaseMetadata, error) {
m := make(map[string]*model.DatabaseMetadata)
for _, metadata := range databaseMetadata {
- m[metadata.Name] = model.NewDatabaseMetadata(metadata, true /* isObjectCaseSensitive */, true /* isDetailCaseSensitive */)
+ m[metadata.Name] = model.NewDatabaseMetadata(metadata, storepb.Engine_BIGQUERY, true /* isObjectCaseSensitive */)
}
if databaseMetadata, ok := m[databaseName]; ok {
diff --git a/backend/plugin/parser/doris/query_span_extractor_system_table_test.go b/backend/plugin/parser/doris/query_span_extractor_system_table_test.go
index a0db052938..9d348b624f 100644
--- a/backend/plugin/parser/doris/query_span_extractor_system_table_test.go
+++ b/backend/plugin/parser/doris/query_span_extractor_system_table_test.go
@@ -77,7 +77,7 @@ func buildMockDatabaseMetadataGetter(databaseMetadata []*storepb.DatabaseSchemaM
m := make(map[string]*model.DatabaseMetadata)
for _, metadata := range databaseMetadata {
// Doris is case-insensitive for most objects
- m[metadata.Name] = model.NewDatabaseMetadata(metadata, false /* isObjectCaseSensitive */, false /* isDetailCaseSensitive */)
+ m[metadata.Name] = model.NewDatabaseMetadata(metadata, storepb.Engine_MYSQL, false /* isObjectCaseSensitive */)
}
if databaseMetadata, ok := m[databaseName]; ok {
diff --git a/backend/plugin/parser/mysql/backup_test.go b/backend/plugin/parser/mysql/backup_test.go
index a9d8dd721e..7dd6203367 100644
--- a/backend/plugin/parser/mysql/backup_test.go
+++ b/backend/plugin/parser/mysql/backup_test.go
@@ -196,7 +196,7 @@ func buildFixedMockDatabaseMetadataGetterAndLister() (base.GetDatabaseMetadataFu
return database, model.NewDatabaseMetadata(&store.DatabaseSchemaMetadata{
Name: database,
Schemas: schemaMetadata,
- }, true /* isObjectCaseSensitive */, true /* isDetailCaseSensitive */), nil
+ }, store.Engine_MYSQL, true /* isObjectCaseSensitive */), nil
}, func(_ context.Context, _ string) ([]string, error) {
return []string{"db", "db1", "db2"}, nil
}
diff --git a/backend/plugin/parser/mysql/completion_test.go b/backend/plugin/parser/mysql/completion_test.go
index e1b36c02c6..c99f4a09ff 100644
--- a/backend/plugin/parser/mysql/completion_test.go
+++ b/backend/plugin/parser/mysql/completion_test.go
@@ -139,7 +139,7 @@ func getMetadataForTest(_ context.Context, _, databaseName string) (string, *mod
},
},
},
- }, true /* isObjectCaseSensitive */, true /* isDetailCaseSensitive */), nil
+ }, storepb.Engine_MYSQL, true /* isObjectCaseSensitive */), nil
}
func catchCaret(s string) (string, int) {
diff --git a/backend/plugin/parser/mysql/query_span_test.go b/backend/plugin/parser/mysql/query_span_test.go
index 721c37eb5a..fca2cec88a 100644
--- a/backend/plugin/parser/mysql/query_span_test.go
+++ b/backend/plugin/parser/mysql/query_span_test.go
@@ -89,7 +89,7 @@ func buildMockDatabaseMetadataGetter(databaseMetadata []*storepb.DatabaseSchemaM
return func(_ context.Context, _, databaseName string) (string, *model.DatabaseMetadata, error) {
m := make(map[string]*model.DatabaseMetadata)
for _, metadata := range databaseMetadata {
- m[metadata.Name] = model.NewDatabaseMetadata(metadata, true /* isObjectCaseSensitive */, true /* isDetailCaseSensitive */)
+ m[metadata.Name] = model.NewDatabaseMetadata(metadata, storepb.Engine_MYSQL, true /* isObjectCaseSensitive */)
}
if databaseMetadata, ok := m[databaseName]; ok {
diff --git a/backend/plugin/parser/partiql/completion_test.go b/backend/plugin/parser/partiql/completion_test.go
index 8797ba719a..af21efa9f0 100644
--- a/backend/plugin/parser/partiql/completion_test.go
+++ b/backend/plugin/parser/partiql/completion_test.go
@@ -126,7 +126,7 @@ func buildMockDatabaseMetadataGetterLister() (base.GetDatabaseMetadataFunc, base
return func(_ context.Context, _, databaseName string) (string, *model.DatabaseMetadata, error) {
m := make(map[string]*model.DatabaseMetadata)
for _, metadata := range databaseMetadatas {
- m[metadata.Name] = model.NewDatabaseMetadata(metadata, true /* isObjectCaseSensitive */, true /* isDetailCaseSensitive */)
+ m[metadata.Name] = model.NewDatabaseMetadata(metadata, storepb.Engine_DYNAMODB, true /* isObjectCaseSensitive */)
}
if databaseMetadata, ok := m[databaseName]; ok {
diff --git a/backend/plugin/parser/pg/completion_test.go b/backend/plugin/parser/pg/completion_test.go
index db80ac9a21..05403f818f 100644
--- a/backend/plugin/parser/pg/completion_test.go
+++ b/backend/plugin/parser/pg/completion_test.go
@@ -173,7 +173,7 @@ func getMetadataForTest(_ context.Context, _, databaseName string) (string, *mod
},
},
},
- }, true /* isObjectCaseSensitive */, true /* isDetailCaseSensitive */), nil
+ }, storepb.Engine_POSTGRES, true /* isObjectCaseSensitive */), nil
}
func catchCaret(s string) (string, int) {
diff --git a/backend/plugin/parser/pg/query_span_test.go b/backend/plugin/parser/pg/query_span_test.go
index 76953eeb04..e78d5d4f80 100644
--- a/backend/plugin/parser/pg/query_span_test.go
+++ b/backend/plugin/parser/pg/query_span_test.go
@@ -76,7 +76,7 @@ func buildMockDatabaseMetadataGetter(databaseMetadata []*storepb.DatabaseSchemaM
return func(_ context.Context, _, databaseName string) (string, *model.DatabaseMetadata, error) {
m := make(map[string]*model.DatabaseMetadata)
for _, metadata := range databaseMetadata {
- m[metadata.Name] = model.NewDatabaseMetadata(metadata, true /* isObjectCaseSensitive */, true /* isDetailCaseSensitive */)
+ m[metadata.Name] = model.NewDatabaseMetadata(metadata, storepb.Engine_POSTGRES, true /* isObjectCaseSensitive */)
}
if databaseMetadata, ok := m[databaseName]; ok {
diff --git a/backend/plugin/parser/pg/restore_test.go b/backend/plugin/parser/pg/restore_test.go
index 70397c7996..263c377528 100644
--- a/backend/plugin/parser/pg/restore_test.go
+++ b/backend/plugin/parser/pg/restore_test.go
@@ -210,5 +210,5 @@ func fixedMockDatabaseMetadataGetter(_ context.Context, _ string, database strin
},
},
},
- }, true /* isObjectCaseSensitive */, true /* isDetailCaseSensitive */), nil
+ }, store.Engine_POSTGRES, true /* isObjectCaseSensitive */), nil
}
diff --git a/backend/plugin/parser/plsql/completion_test.go b/backend/plugin/parser/plsql/completion_test.go
index 1b8e51c74d..dcde663c81 100644
--- a/backend/plugin/parser/plsql/completion_test.go
+++ b/backend/plugin/parser/plsql/completion_test.go
@@ -141,7 +141,7 @@ func getMetadataForTest(_ context.Context, _, databaseName string) (string, *mod
},
},
},
- }, true /* isObjectCaseSensitive */, true /* isDetailCaseSensitive */), nil
+ }, storepb.Engine_ORACLE, true /* isObjectCaseSensitive */), nil
case "SCHEMA2":
return "SCHEMA2", model.NewDatabaseMetadata(&storepb.DatabaseSchemaMetadata{
Name: databaseName,
@@ -183,7 +183,7 @@ func getMetadataForTest(_ context.Context, _, databaseName string) (string, *mod
},
},
},
- }, true /* isObjectCaseSensitive */, true /* isDetailCaseSensitive */), nil
+ }, storepb.Engine_ORACLE, true /* isObjectCaseSensitive */), nil
case "SCHEMA3":
return "SCHEMA3", model.NewDatabaseMetadata(&storepb.DatabaseSchemaMetadata{
Name: databaseName,
@@ -225,7 +225,7 @@ func getMetadataForTest(_ context.Context, _, databaseName string) (string, *mod
},
},
},
- }, true /* isObjectCaseSensitive */, true /* isDetailCaseSensitive */), nil
+ }, storepb.Engine_ORACLE, true /* isObjectCaseSensitive */), nil
default:
return "", nil, nil
}
diff --git a/backend/plugin/parser/plsql/query_span_test.go b/backend/plugin/parser/plsql/query_span_test.go
index 71c008c197..588b4d85e6 100644
--- a/backend/plugin/parser/plsql/query_span_test.go
+++ b/backend/plugin/parser/plsql/query_span_test.go
@@ -90,7 +90,7 @@ func buildMockDatabaseMetadataGetter(defaultMetadata []*storepb.DatabaseSchemaMe
}
m := make(map[string]*model.DatabaseMetadata)
for _, metadata := range databaseMetadata {
- m[metadata.Name] = model.NewDatabaseMetadata(metadata, true /* isObjectCaseSensitive */, true /* isDetailCaseSensitive */)
+ m[metadata.Name] = model.NewDatabaseMetadata(metadata, storepb.Engine_ORACLE, true /* isObjectCaseSensitive */)
}
if databaseMetadata, ok := m[databaseName]; ok {
@@ -128,7 +128,7 @@ func buildMockDatabaseMetadataGetter(defaultMetadata []*storepb.DatabaseSchemaMe
for _, metadata := range getLinkedDatabaseMetadata() {
if metadata.Name == linkedDBInfo.Username {
- return instanceIDB, metadata.Name, model.NewDatabaseMetadata(metadata, true /* isObjectCaseSensitive */, true /* isDetailCaseSensitive */), nil
+ return instanceIDB, metadata.Name, model.NewDatabaseMetadata(metadata, storepb.Engine_ORACLE, true /* isObjectCaseSensitive */), nil
}
}
diff --git a/backend/plugin/parser/plsql/restore_test.go b/backend/plugin/parser/plsql/restore_test.go
index 914c83db32..08eb8dffa7 100644
--- a/backend/plugin/parser/plsql/restore_test.go
+++ b/backend/plugin/parser/plsql/restore_test.go
@@ -178,5 +178,5 @@ func fixedMockDatabaseMetadataGetter(_ context.Context, _ string, database strin
},
},
},
- }, true /* isObjectCaseSensitive */, true /* isDetailCaseSensitive */), nil
+ }, store.Engine_ORACLE, true /* isObjectCaseSensitive */), nil
}
diff --git a/backend/plugin/parser/snowflake/query_span_test.go b/backend/plugin/parser/snowflake/query_span_test.go
index b9f4debdc4..ebe0d3c92c 100644
--- a/backend/plugin/parser/snowflake/query_span_test.go
+++ b/backend/plugin/parser/snowflake/query_span_test.go
@@ -82,7 +82,7 @@ func buildMockDatabaseMetadataGetter(databaseMetadata []*storepb.DatabaseSchemaM
return func(_ context.Context, _, databaseName string) (string, *model.DatabaseMetadata, error) {
m := make(map[string]*model.DatabaseMetadata)
for _, metadata := range databaseMetadata {
- m[metadata.Name] = model.NewDatabaseMetadata(metadata, true /* isObjectCaseSensitive */, true /* isDetailCaseSensitive */)
+ m[metadata.Name] = model.NewDatabaseMetadata(metadata, storepb.Engine_SNOWFLAKE, true /* isObjectCaseSensitive */)
}
if databaseMetadata, ok := m[databaseName]; ok {
diff --git a/backend/plugin/parser/spanner/query_span_test.go b/backend/plugin/parser/spanner/query_span_test.go
index 16576ced80..6446075bc5 100644
--- a/backend/plugin/parser/spanner/query_span_test.go
+++ b/backend/plugin/parser/spanner/query_span_test.go
@@ -81,7 +81,7 @@ func buildMockDatabaseMetadataGetter(databaseMetadata []*storepb.DatabaseSchemaM
return func(_ context.Context, _, databaseName string) (string, *model.DatabaseMetadata, error) {
m := make(map[string]*model.DatabaseMetadata)
for _, metadata := range databaseMetadata {
- m[metadata.Name] = model.NewDatabaseMetadata(metadata, true /* isObjectCaseSensitive */, true /* isDetailCaseSensitive */)
+ m[metadata.Name] = model.NewDatabaseMetadata(metadata, storepb.Engine_SPANNER, true /* isObjectCaseSensitive */)
}
if databaseMetadata, ok := m[databaseName]; ok {
diff --git a/backend/plugin/parser/tidb/backup_test.go b/backend/plugin/parser/tidb/backup_test.go
index 937b10fe96..ad6897091f 100644
--- a/backend/plugin/parser/tidb/backup_test.go
+++ b/backend/plugin/parser/tidb/backup_test.go
@@ -166,7 +166,7 @@ func buildFixedMockDatabaseMetadataGetterAndLister() (base.GetDatabaseMetadataFu
return database, model.NewDatabaseMetadata(&store.DatabaseSchemaMetadata{
Name: database,
Schemas: schemaMetadata,
- }, false /* isObjectCaseSensitive */, true /* isDetailCaseSensitive */), nil
+ }, store.Engine_TIDB, false /* isObjectCaseSensitive */), nil
}, func(_ context.Context, _ string) ([]string, error) {
return []string{"db", "db1", "db2"}, nil
}
diff --git a/backend/plugin/parser/tidb/query_span_test.go b/backend/plugin/parser/tidb/query_span_test.go
index 051e800d5d..089d1e2c13 100644
--- a/backend/plugin/parser/tidb/query_span_test.go
+++ b/backend/plugin/parser/tidb/query_span_test.go
@@ -80,7 +80,7 @@ func buildMockDatabaseMetadataGetter(databaseMetadata []*storepb.DatabaseSchemaM
return func(_ context.Context, _, databaseName string) (string, *model.DatabaseMetadata, error) {
m := make(map[string]*model.DatabaseMetadata)
for _, metadata := range databaseMetadata {
- m[metadata.Name] = model.NewDatabaseMetadata(metadata, false /* isObjectCaseSensitive */, true /* isDetailCaseSensitive */)
+ m[metadata.Name] = model.NewDatabaseMetadata(metadata, storepb.Engine_TIDB, false /* isObjectCaseSensitive */)
}
if databaseMetadata, ok := m[databaseName]; ok {
diff --git a/backend/plugin/parser/trino/completion_test.go b/backend/plugin/parser/trino/completion_test.go
index 8d38fb862a..5928427f64 100644
--- a/backend/plugin/parser/trino/completion_test.go
+++ b/backend/plugin/parser/trino/completion_test.go
@@ -207,7 +207,7 @@ func buildMockDatabaseMetadataGetterLister() (base.GetDatabaseMetadataFunc, base
return func(_ context.Context, _, databaseName string) (string, *model.DatabaseMetadata, error) {
m := make(map[string]*model.DatabaseMetadata)
for _, metadata := range databaseMetadatas {
- m[metadata.Name] = model.NewDatabaseMetadata(metadata, false /* isObjectCaseSensitive */, false /* isDetailCaseSensitive */)
+ m[metadata.Name] = model.NewDatabaseMetadata(metadata, storepb.Engine_MYSQL, false /* isObjectCaseSensitive */)
}
if databaseMetadata, ok := m[databaseName]; ok {
diff --git a/backend/plugin/parser/trino/query_span_test.go b/backend/plugin/parser/trino/query_span_test.go
index c38234121f..bcdd2610e9 100644
--- a/backend/plugin/parser/trino/query_span_test.go
+++ b/backend/plugin/parser/trino/query_span_test.go
@@ -212,7 +212,7 @@ func buildMockDatabaseMetadataGetter(databaseMetadata []*storepb.DatabaseSchemaM
return func(_ context.Context, _, databaseName string) (string, *model.DatabaseMetadata, error) {
m := make(map[string]*model.DatabaseMetadata)
for _, metadata := range databaseMetadata {
- m[metadata.Name] = model.NewDatabaseMetadata(metadata, true /* isObjectCaseSensitive */, true /* isDetailCaseSensitive */)
+ m[metadata.Name] = model.NewDatabaseMetadata(metadata, storepb.Engine_POSTGRES, true /* isObjectCaseSensitive */)
}
if databaseMetadata, ok := m[databaseName]; ok {
diff --git a/backend/plugin/parser/tsql/completion_test.go b/backend/plugin/parser/tsql/completion_test.go
index a078432e27..8495e40af4 100644
--- a/backend/plugin/parser/tsql/completion_test.go
+++ b/backend/plugin/parser/tsql/completion_test.go
@@ -204,7 +204,7 @@ func buildMockDatabaseMetadataGetterLister() (base.GetDatabaseMetadataFunc, base
return func(_ context.Context, _, databaseName string) (string, *model.DatabaseMetadata, error) {
m := make(map[string]*model.DatabaseMetadata)
for _, metadata := range databaseMetadatas {
- m[metadata.Name] = model.NewDatabaseMetadata(metadata, false /* isObjectCaseSensitive */, false /* isDetailCaseSensitive */)
+ m[metadata.Name] = model.NewDatabaseMetadata(metadata, storepb.Engine_MSSQL, false /* isObjectCaseSensitive */)
}
if databaseMetadata, ok := m[databaseName]; ok {
diff --git a/backend/plugin/parser/tsql/query_span_test.go b/backend/plugin/parser/tsql/query_span_test.go
index 990c073d24..efc6935700 100644
--- a/backend/plugin/parser/tsql/query_span_test.go
+++ b/backend/plugin/parser/tsql/query_span_test.go
@@ -86,7 +86,7 @@ func buildMockDatabaseMetadataGetter(databaseMetadata []*storepb.DatabaseSchemaM
return func(_ context.Context, _, databaseName string) (string, *model.DatabaseMetadata, error) {
m := make(map[string]*model.DatabaseMetadata)
for _, metadata := range databaseMetadata {
- m[metadata.Name] = model.NewDatabaseMetadata(metadata, false /* isObjectCaseSensitive */, false /* isDetailCaseSensitive */)
+ m[metadata.Name] = model.NewDatabaseMetadata(metadata, storepb.Engine_MSSQL, false /* isObjectCaseSensitive */)
}
if databaseMetadata, ok := m[databaseName]; ok {
diff --git a/backend/plugin/parser/tsql/restore_test.go b/backend/plugin/parser/tsql/restore_test.go
index 01843c5316..ade47b78c4 100644
--- a/backend/plugin/parser/tsql/restore_test.go
+++ b/backend/plugin/parser/tsql/restore_test.go
@@ -64,7 +64,7 @@ func TestRestoreIdentityHandling(t *testing.T) {
},
},
},
- }, false, false), nil
+ }, store.Engine_MSSQL, false), nil
}
// Test DELETE rollback with IDENTITY column
@@ -255,5 +255,5 @@ func fixedMockDatabaseMetadataGetter(_ context.Context, _ string, database strin
},
},
},
- }, false /* isObjectCaseSensitive */, false /* isDetailCaseSensitive */), nil
+ }, store.Engine_MSSQL, false /* isObjectCaseSensitive */), nil
}
diff --git a/backend/plugin/schema/mssql/generate_migration.go b/backend/plugin/schema/mssql/generate_migration.go
index 4497f76d1d..bce51e374c 100644
--- a/backend/plugin/schema/mssql/generate_migration.go
+++ b/backend/plugin/schema/mssql/generate_migration.go
@@ -1111,7 +1111,7 @@ func getViewDependencies(viewDef string, schemaName string) ([]string, error) {
},
},
}
- dbMetadata := model.NewDatabaseMetadata(metadata, false, false)
+ dbMetadata := model.NewDatabaseMetadata(metadata, storepb.Engine_MSSQL, false)
return databaseName, dbMetadata, nil
},
ListDatabaseNamesFunc: func(_ context.Context, _ string) ([]string, error) {
diff --git a/backend/plugin/schema/mysql/walk_through_test.go b/backend/plugin/schema/mysql/walk_through_test.go
index d7d24b8755..640cbf62f2 100644
--- a/backend/plugin/schema/mysql/walk_through_test.go
+++ b/backend/plugin/schema/mysql/walk_through_test.go
@@ -49,7 +49,7 @@ func TestWalkThrough(t *testing.T) {
require.True(t, ok)
// Create DatabaseMetadata for walk-through
- state := model.NewDatabaseMetadata(protoData, !test.IgnoreCaseSensitive, !test.IgnoreCaseSensitive)
+ state := model.NewDatabaseMetadata(protoData, storepb.Engine_MYSQL, !test.IgnoreCaseSensitive)
asts, _ := sm.GetASTsForChecks(storepb.Engine_MYSQL, test.Statement)
advice := WalkThrough(state, asts)
diff --git a/backend/plugin/schema/pg/get_database_metadata.go b/backend/plugin/schema/pg/get_database_metadata.go
index db5b13f690..38eeda16a5 100644
--- a/backend/plugin/schema/pg/get_database_metadata.go
+++ b/backend/plugin/schema/pg/get_database_metadata.go
@@ -2873,7 +2873,7 @@ func getViewDependencies(viewDef string, schemaName string, fullSchemaMetadata *
base.GetQuerySpanContext{
GetDatabaseMetadataFunc: func(_ context.Context, _, databaseName string) (string, *model.DatabaseMetadata, error) {
// Return the full schema metadata so GetQuerySpan can resolve references
- dbMetadata := model.NewDatabaseMetadata(fullSchemaMetadata, false, false)
+ dbMetadata := model.NewDatabaseMetadata(fullSchemaMetadata, storepb.Engine_POSTGRES, false)
return databaseName, dbMetadata, nil
},
ListDatabaseNamesFunc: func(_ context.Context, _ string) ([]string, error) {
diff --git a/backend/plugin/schema/pg/walk_through_test.go b/backend/plugin/schema/pg/walk_through_test.go
index 5b18109dc2..712ff8a92d 100644
--- a/backend/plugin/schema/pg/walk_through_test.go
+++ b/backend/plugin/schema/pg/walk_through_test.go
@@ -92,7 +92,7 @@ func TestWalkThrough(t *testing.T) {
require.True(t, ok)
// Create DatabaseMetadata for walk-through
- state := model.NewDatabaseMetadata(protoData, !test.IgnoreCaseSensitive, !test.IgnoreCaseSensitive)
+ state := model.NewDatabaseMetadata(protoData, storepb.Engine_POSTGRES, !test.IgnoreCaseSensitive)
asts, _ := sm.GetASTsForChecks(storepb.Engine_POSTGRES, test.Statement)
advice := WalkThrough(state, asts)
@@ -183,7 +183,7 @@ func TestWalkThroughANTLR(t *testing.T) {
require.True(t, ok)
// Create DatabaseMetadata for walk-through
- state := model.NewDatabaseMetadata(protoData, !test.IgnoreCaseSensitive, !test.IgnoreCaseSensitive)
+ state := model.NewDatabaseMetadata(protoData, storepb.Engine_POSTGRES, !test.IgnoreCaseSensitive)
// Parse using ANTLR parser instead of legacy parser
parseResult, parseErr := pgparser.ParsePostgreSQL(test.Statement)
diff --git a/backend/plugin/schema/tidb/walk_through_test.go b/backend/plugin/schema/tidb/walk_through_test.go
index ee19881075..4e30683788 100644
--- a/backend/plugin/schema/tidb/walk_through_test.go
+++ b/backend/plugin/schema/tidb/walk_through_test.go
@@ -49,7 +49,7 @@ func TestWalkThrough(t *testing.T) {
require.True(t, ok)
// Create DatabaseMetadata for walk-through
- state := model.NewDatabaseMetadata(protoData, !test.IgnoreCaseSensitive, !test.IgnoreCaseSensitive)
+ state := model.NewDatabaseMetadata(protoData, storepb.Engine_TIDB, !test.IgnoreCaseSensitive)
asts, _ := sm.GetASTsForChecks(storepb.Engine_TIDB, test.Statement)
advice := WalkThrough(state, asts)
diff --git a/backend/runner/plancheck/statement_advise_executor.go b/backend/runner/plancheck/statement_advise_executor.go
index f46b8a935e..fbaccc3ec7 100644
--- a/backend/runner/plancheck/statement_advise_executor.go
+++ b/backend/runner/plancheck/statement_advise_executor.go
@@ -6,6 +6,7 @@ import (
"log/slog"
"github.com/pkg/errors"
+ "google.golang.org/protobuf/proto"
"github.com/bytebase/bytebase/backend/common"
"github.com/bytebase/bytebase/backend/common/log"
@@ -15,10 +16,10 @@ import (
"github.com/bytebase/bytebase/backend/enterprise"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
- "github.com/bytebase/bytebase/backend/plugin/advisor/catalog"
"github.com/bytebase/bytebase/backend/plugin/db"
parserbase "github.com/bytebase/bytebase/backend/plugin/parser/base"
"github.com/bytebase/bytebase/backend/store"
+ "github.com/bytebase/bytebase/backend/store/model"
)
// NewStatementAdviseExecutor creates a plan check statement advise executor.
@@ -149,10 +150,15 @@ func (e *StatementAdviseExecutor) runReview(
}
}
- originMetadata, finalMetadata, err := catalog.NewCatalogWithMetadata(dbSchema.GetMetadata(), instance.Metadata.GetEngine(), store.IsObjectCaseSensitive(instance))
- if err != nil {
- return nil, common.Wrapf(err, common.Internal, "failed to create a catalog")
+ // Create original metadata as read-only
+ originMetadata := model.NewDatabaseMetadata(dbSchema.GetMetadata(), instance.Metadata.GetEngine(), store.IsObjectCaseSensitive(instance))
+
+ // Clone metadata for final to avoid modifying the original
+ clonedMetadata, ok := proto.Clone(dbSchema.GetMetadata()).(*storepb.DatabaseSchemaMetadata)
+ if !ok {
+ return nil, common.Wrapf(errors.New("failed to clone database schema metadata"), common.Internal, "failed to create a catalog")
}
+ finalMetadata := model.NewDatabaseMetadata(clonedMetadata, instance.Metadata.GetEngine(), store.IsObjectCaseSensitive(instance))
useDatabaseOwner, err := getUseDatabaseOwner(ctx, e.store, instance, database)
if err != nil {
diff --git a/backend/store/model/database.go b/backend/store/model/database.go
index ec5dca347a..2dc3760296 100644
--- a/backend/store/model/database.go
+++ b/backend/store/model/database.go
@@ -30,7 +30,7 @@ func NewDatabaseSchema(
engine storepb.Engine,
isObjectCaseSensitive bool,
) *DatabaseSchema {
- databaseMetadata := NewDatabaseMetadata(metadata, isObjectCaseSensitive, getIsDetailCaseSensitive(engine))
+ databaseMetadata := NewDatabaseMetadata(metadata, engine, isObjectCaseSensitive)
databaseConfig := NewDatabaseConfig(config)
return &DatabaseSchema{
metadata: metadata,
@@ -244,7 +244,8 @@ type DatabaseMetadata struct {
}
// NewDatabaseMetadata creates a new database metadata.
-func NewDatabaseMetadata(metadata *storepb.DatabaseSchemaMetadata, isObjectCaseSensitive bool, isDetailCaseSensitive bool) *DatabaseMetadata {
+func NewDatabaseMetadata(metadata *storepb.DatabaseSchemaMetadata, engineType storepb.Engine, isObjectCaseSensitive bool) *DatabaseMetadata {
+ isDetailCaseSensitive := getIsDetailCaseSensitive(engineType)
databaseMetadata := &DatabaseMetadata{
proto: metadata,
name: metadata.Name,