Skip to content

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

refactor: use storepb types directly for View, MaterializedView, Package, and Sequence metadata (#18144)

Danny Xuaf2b5cd91e69
diff --git a/backend/api/v1/database_service.go b/backend/api/v1/database_service.go
index 95809a4178..c2d58f73e5 100644
--- a/backend/api/v1/database_service.go
+++ b/backend/api/v1/database_service.go
@@ -1158,11 +1158,7 @@ func (s *DatabaseService) GetSchemaString(ctx context.Context, req *connect.Requ
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("table %q not found", req.Msg.Object))
}
sequences := schemaMetadata.GetSequencesByOwnerTable(req.Msg.Object)
- var sequencesProto []*storepb.SequenceMetadata
- for _, sequence := range sequences {
- sequencesProto = append(sequencesProto, sequence.GetProto())
- }
- s, err := schema.GetTableDefinition(instance.Metadata.Engine, req.Msg.Schema, tableMetadata.GetProto(), sequencesProto)
+ s, err := schema.GetTableDefinition(instance.Metadata.Engine, req.Msg.Schema, tableMetadata.GetProto(), sequences)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("Failed to get table schema: %v", err))
}
@@ -1176,7 +1172,7 @@ func (s *DatabaseService) GetSchemaString(ctx context.Context, req *connect.Requ
if viewMetadata == nil {
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("view %q not found", req.Msg.Object))
}
- s, err := schema.GetViewDefinition(instance.Metadata.Engine, req.Msg.Schema, viewMetadata.GetProto())
+ s, err := schema.GetViewDefinition(instance.Metadata.Engine, req.Msg.Schema, viewMetadata)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("Failed to get view schema: %v", err))
}
@@ -1190,7 +1186,7 @@ func (s *DatabaseService) GetSchemaString(ctx context.Context, req *connect.Requ
if materializedViewMetadata == nil {
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("materialized view %q not found", req.Msg.Object))
}
- s, err := schema.GetMaterializedViewDefinition(instance.Metadata.Engine, req.Msg.Schema, materializedViewMetadata.GetProto())
+ s, err := schema.GetMaterializedViewDefinition(instance.Metadata.Engine, req.Msg.Schema, materializedViewMetadata)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("Failed to get materialized view schema: %v", err))
}
@@ -1218,7 +1214,7 @@ func (s *DatabaseService) GetSchemaString(ctx context.Context, req *connect.Requ
if procedureMetadata == nil {
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("procedure %q not found", req.Msg.Object))
}
- s, err := schema.GetProcedureDefinition(instance.Metadata.Engine, req.Msg.Schema, procedureMetadata.GetProto())
+ s, err := schema.GetProcedureDefinition(instance.Metadata.Engine, req.Msg.Schema, procedureMetadata)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("Failed to get procedure schema: %v", err))
}
@@ -1232,7 +1228,7 @@ func (s *DatabaseService) GetSchemaString(ctx context.Context, req *connect.Requ
if sequenceMetadata == nil {
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("sequence %q not found", req.Msg.Object))
}
- s, err := schema.GetSequenceDefinition(instance.Metadata.Engine, req.Msg.Schema, sequenceMetadata.GetProto())
+ s, err := schema.GetSequenceDefinition(instance.Metadata.Engine, req.Msg.Schema, sequenceMetadata)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("Failed to get sequence schema: %v", err))
}
diff --git a/backend/plugin/parser/mysql/query_span_extractor.go b/backend/plugin/parser/mysql/query_span_extractor.go
index 153e86caa8..4033088d16 100644
--- a/backend/plugin/parser/mysql/query_span_extractor.go
+++ b/backend/plugin/parser/mysql/query_span_extractor.go
@@ -1385,7 +1385,7 @@ func (q *querySpanExtractor) findTableSchema(databaseName, tableName string) (ba
}, nil
}
- var viewSchema *model.ViewMetadata
+ var viewSchema *storepb.ViewMetadata
if q.ignoreCaseSensitive {
for _, view := range schema.ListViewNames() {
if strings.EqualFold(view, tableName) {
@@ -1402,7 +1402,7 @@ func (q *querySpanExtractor) findTableSchema(databaseName, tableName string) (ba
return nil, errors.Wrapf(err, "failed to get columns for view %q", tableName)
}
return &base.PhysicalView{
- Name: viewSchema.GetProto().Name,
+ Name: viewSchema.Name,
Schema: emptySchema,
Database: dbMetadata.GetProto().GetName(),
Server: "",
diff --git a/backend/plugin/parser/pg/query_span_extractor.go b/backend/plugin/parser/pg/query_span_extractor.go
index 5eeb6b28ac..bd2ed632ae 100644
--- a/backend/plugin/parser/pg/query_span_extractor.go
+++ b/backend/plugin/parser/pg/query_span_extractor.go
@@ -1254,7 +1254,7 @@ func (q *querySpanExtractor) findTableSchema(schemaName string, tableName string
Server: "",
Database: q.defaultDatabase,
Schema: viewSchemaName,
- Name: view.GetProto().Name,
+ Name: view.Name,
Columns: columns,
}, nil
}
@@ -1268,7 +1268,7 @@ func (q *querySpanExtractor) findTableSchema(schemaName string, tableName string
Server: "",
Database: q.defaultDatabase,
Schema: materializedViewSchemaName,
- Name: materializedView.GetProto().Name,
+ Name: materializedView.Name,
Columns: columns,
}, nil
}
@@ -1280,7 +1280,7 @@ func (q *querySpanExtractor) findTableSchema(schemaName string, tableName string
Server: "",
Database: q.defaultDatabase,
Schema: sequenceSchemaName,
- Name: sequence.GetProto().Name,
+ Name: sequence.Name,
Columns: columns,
}, nil
}
diff --git a/backend/plugin/parser/plsql/query_span_extractor.go b/backend/plugin/parser/plsql/query_span_extractor.go
index d950f52cf7..06317c0dbd 100644
--- a/backend/plugin/parser/plsql/query_span_extractor.go
+++ b/backend/plugin/parser/plsql/query_span_extractor.go
@@ -1365,7 +1365,7 @@ func (q *querySpanExtractor) findTableSchemaInMetadata(instanceID string, dbMeta
return nil, err
}
return &base.PseudoTable{
- Name: view.GetProto().Name,
+ Name: view.Name,
Columns: columns,
}, nil
}
@@ -1377,7 +1377,7 @@ func (q *querySpanExtractor) findTableSchemaInMetadata(instanceID string, dbMeta
return nil, err
}
return &base.PseudoTable{
- Name: materializedView.GetProto().Name,
+ Name: materializedView.Name,
Columns: columns,
}, nil
}
diff --git a/backend/plugin/parser/tidb/query_span_extractor.go b/backend/plugin/parser/tidb/query_span_extractor.go
index 4b31385d49..c98bef7dd3 100644
--- a/backend/plugin/parser/tidb/query_span_extractor.go
+++ b/backend/plugin/parser/tidb/query_span_extractor.go
@@ -842,7 +842,7 @@ func (q *querySpanExtractor) findTableSchema(databaseName string, tableName stri
}
return &base.PhysicalView{
Database: databaseName,
- Name: viewMeta.GetProto().Name,
+ Name: viewMeta.Name,
Columns: columns,
}, nil
}
diff --git a/backend/plugin/parser/trino/query_span_extractor.go b/backend/plugin/parser/trino/query_span_extractor.go
index 2958459318..2fc8a07483 100644
--- a/backend/plugin/parser/trino/query_span_extractor.go
+++ b/backend/plugin/parser/trino/query_span_extractor.go
@@ -8,6 +8,7 @@ import (
parser "github.com/bytebase/parser/trino"
"github.com/pkg/errors"
+ storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/parser/base"
parsererror "github.com/bytebase/bytebase/backend/plugin/parser/errors"
"github.com/bytebase/bytebase/backend/store/model"
@@ -314,7 +315,7 @@ func (q *querySpanExtractor) findTableSchema(db, schema, name string) (*model.Ta
}
// Look for view
- var viewMeta *model.ViewMetadata
+ var viewMeta *storepb.ViewMetadata
if q.ignoreCaseSensitive {
for _, viewName := range schemaMeta.ListViewNames() {
if strings.EqualFold(viewName, name) {
diff --git a/backend/plugin/parser/tsql/query_span_extractor.go b/backend/plugin/parser/tsql/query_span_extractor.go
index 432040a44c..09c78965e8 100644
--- a/backend/plugin/parser/tsql/query_span_extractor.go
+++ b/backend/plugin/parser/tsql/query_span_extractor.go
@@ -732,7 +732,7 @@ func (q *querySpanExtractor) tsqlFindTableSchema(fullTableName parser.IFull_tabl
Server: "",
Database: databaseName,
Schema: schemaName,
- Name: view.GetProto().Name,
+ Name: view.Name,
Columns: columns,
}
return tableSource, nil
diff --git a/backend/plugin/schema/differ.go b/backend/plugin/schema/differ.go
index 705047d794..42eb010ce3 100644
--- a/backend/plugin/schema/differ.go
+++ b/backend/plugin/schema/differ.go
@@ -392,12 +392,12 @@ func addNewSchemaObjects(diff *MetadataDiff, schemaName string, schema *model.Sc
// Add all views
for _, viewName := range schema.ListViewNames() {
view := schema.GetView(viewName)
- if view != nil && !view.GetProto().GetSkipDump() {
+ if view != nil && !view.SkipDump {
diff.ViewChanges = append(diff.ViewChanges, &ViewDiff{
Action: MetadataDiffActionCreate,
SchemaName: schemaName,
ViewName: viewName,
- NewView: view.GetProto(),
+ NewView: view,
OldASTNode: nil,
NewASTNode: nil,
})
@@ -407,12 +407,12 @@ func addNewSchemaObjects(diff *MetadataDiff, schemaName string, schema *model.Sc
// Add all materialized views
for _, mvName := range schema.ListMaterializedViewNames() {
mv := schema.GetMaterializedView(mvName)
- if mv != nil && !mv.GetProto().GetSkipDump() {
+ if mv != nil && !mv.SkipDump {
diff.MaterializedViewChanges = append(diff.MaterializedViewChanges, &MaterializedViewDiff{
Action: MetadataDiffActionCreate,
SchemaName: schemaName,
MaterializedViewName: mvName,
- NewMaterializedView: mv.GetProto(),
+ NewMaterializedView: mv,
})
}
}
@@ -437,12 +437,12 @@ func addNewSchemaObjects(diff *MetadataDiff, schemaName string, schema *model.Sc
// Add all procedures
for _, procName := range schema.ListProcedureNames() {
proc := schema.GetProcedure(procName)
- if proc != nil && !proc.GetProto().GetSkipDump() {
+ if proc != nil && !proc.SkipDump {
diff.ProcedureChanges = append(diff.ProcedureChanges, &ProcedureDiff{
Action: MetadataDiffActionCreate,
SchemaName: schemaName,
ProcedureName: procName,
- NewProcedure: proc.GetProto(),
+ NewProcedure: proc,
})
}
}
@@ -1523,12 +1523,12 @@ func compareViews(engine storepb.Engine, diff *MetadataDiff, schemaName string,
for _, viewName := range oldSchema.ListViewNames() {
if newSchema.GetView(viewName) == nil {
oldView := oldSchema.GetView(viewName)
- if oldView != nil && !oldView.GetProto().GetSkipDump() {
+ if oldView != nil && !oldView.SkipDump {
diff.ViewChanges = append(diff.ViewChanges, &ViewDiff{
Action: MetadataDiffActionDrop,
SchemaName: schemaName,
ViewName: viewName,
- OldView: oldView.GetProto(),
+ OldView: oldView,
OldASTNode: nil,
NewASTNode: nil,
})
@@ -1539,7 +1539,7 @@ func compareViews(engine storepb.Engine, diff *MetadataDiff, schemaName string,
// Check for new and modified views
for _, viewName := range newSchema.ListViewNames() {
newView := newSchema.GetView(viewName)
- if newView == nil || newView.GetProto().GetSkipDump() {
+ if newView == nil || newView.SkipDump {
continue
}
@@ -1549,11 +1549,11 @@ func compareViews(engine storepb.Engine, diff *MetadataDiff, schemaName string,
Action: MetadataDiffActionCreate,
SchemaName: schemaName,
ViewName: viewName,
- NewView: newView.GetProto(),
+ NewView: newView,
OldASTNode: nil,
NewASTNode: nil,
})
- } else if !oldView.GetProto().GetSkipDump() {
+ } else if !oldView.SkipDump {
// Use engine-specific comparison
changes, err := comparer.CompareView(oldView, newView)
if err != nil {
@@ -1563,8 +1563,8 @@ func compareViews(engine storepb.Engine, diff *MetadataDiff, schemaName string,
Action: MetadataDiffActionAlter,
SchemaName: schemaName,
ViewName: viewName,
- OldView: oldView.GetProto(),
- NewView: newView.GetProto(),
+ OldView: oldView,
+ NewView: newView,
OldASTNode: nil,
NewASTNode: nil,
})
@@ -1584,8 +1584,8 @@ func compareViews(engine storepb.Engine, diff *MetadataDiff, schemaName string,
Action: MetadataDiffActionAlter,
SchemaName: schemaName,
ViewName: viewName,
- OldView: oldView.GetProto(),
- NewView: newView.GetProto(),
+ OldView: oldView,
+ NewView: newView,
OldASTNode: nil,
NewASTNode: nil,
})
@@ -1604,12 +1604,12 @@ func compareMaterializedViews(engine storepb.Engine, diff *MetadataDiff, schemaN
for _, mvName := range oldSchema.ListMaterializedViewNames() {
if newSchema.GetMaterializedView(mvName) == nil {
oldMV := oldSchema.GetMaterializedView(mvName)
- if oldMV != nil && !oldMV.GetProto().GetSkipDump() {
+ if oldMV != nil && !oldMV.SkipDump {
diff.MaterializedViewChanges = append(diff.MaterializedViewChanges, &MaterializedViewDiff{
Action: MetadataDiffActionDrop,
SchemaName: schemaName,
MaterializedViewName: mvName,
- OldMaterializedView: oldMV.GetProto(),
+ OldMaterializedView: oldMV,
})
}
}
@@ -1618,7 +1618,7 @@ func compareMaterializedViews(engine storepb.Engine, diff *MetadataDiff, schemaN
// Check for new and modified materialized views
for _, mvName := range newSchema.ListMaterializedViewNames() {
newMV := newSchema.GetMaterializedView(mvName)
- if newMV == nil || newMV.GetProto().GetSkipDump() {
+ if newMV == nil || newMV.SkipDump {
continue
}
@@ -1628,9 +1628,9 @@ func compareMaterializedViews(engine storepb.Engine, diff *MetadataDiff, schemaN
Action: MetadataDiffActionCreate,
SchemaName: schemaName,
MaterializedViewName: mvName,
- NewMaterializedView: newMV.GetProto(),
+ NewMaterializedView: newMV,
})
- } else if !oldMV.GetProto().GetSkipDump() {
+ } else if !oldMV.SkipDump {
// Use engine-specific comparison
changes, err := comparer.CompareMaterializedView(oldMV, newMV)
if err != nil {
@@ -1640,8 +1640,8 @@ func compareMaterializedViews(engine storepb.Engine, diff *MetadataDiff, schemaN
Action: MetadataDiffActionAlter,
SchemaName: schemaName,
MaterializedViewName: mvName,
- OldMaterializedView: oldMV.GetProto(),
- NewMaterializedView: newMV.GetProto(),
+ OldMaterializedView: oldMV,
+ NewMaterializedView: newMV,
})
}
} else if len(changes) > 0 {
@@ -1659,8 +1659,8 @@ func compareMaterializedViews(engine storepb.Engine, diff *MetadataDiff, schemaN
Action: MetadataDiffActionAlter,
SchemaName: schemaName,
MaterializedViewName: mvName,
- OldMaterializedView: oldMV.GetProto(),
- NewMaterializedView: newMV.GetProto(),
+ OldMaterializedView: oldMV,
+ NewMaterializedView: newMV,
})
}
// TODO: Handle non-recreating changes like comment updates or index-only changes
@@ -1833,12 +1833,12 @@ func compareProcedures(diff *MetadataDiff, schemaName string, oldSchema, newSche
for _, procName := range oldSchema.ListProcedureNames() {
if newSchema.GetProcedure(procName) == nil {
oldProc := oldSchema.GetProcedure(procName)
- if oldProc != nil && !oldProc.GetProto().GetSkipDump() {
+ if oldProc != nil && !oldProc.SkipDump {
diff.ProcedureChanges = append(diff.ProcedureChanges, &ProcedureDiff{
Action: MetadataDiffActionDrop,
SchemaName: schemaName,
ProcedureName: procName,
- OldProcedure: oldProc.GetProto(),
+ OldProcedure: oldProc,
})
}
}
@@ -1847,7 +1847,7 @@ func compareProcedures(diff *MetadataDiff, schemaName string, oldSchema, newSche
// Check for new and modified procedures
for _, procName := range newSchema.ListProcedureNames() {
newProc := newSchema.GetProcedure(procName)
- if newProc == nil || newProc.GetProto().GetSkipDump() {
+ if newProc == nil || newProc.SkipDump {
continue
}
@@ -1857,15 +1857,15 @@ func compareProcedures(diff *MetadataDiff, schemaName string, oldSchema, newSche
Action: MetadataDiffActionCreate,
SchemaName: schemaName,
ProcedureName: procName,
- NewProcedure: newProc.GetProto(),
+ NewProcedure: newProc,
})
- } else if !oldProc.GetProto().GetSkipDump() && !procedureDefinitionsEqual(oldProc.Definition, newProc.Definition, procName) {
+ } else if !oldProc.SkipDump && !procedureDefinitionsEqual(oldProc.Definition, newProc.Definition, procName) {
diff.ProcedureChanges = append(diff.ProcedureChanges, &ProcedureDiff{
Action: MetadataDiffActionAlter,
SchemaName: schemaName,
ProcedureName: procName,
- OldProcedure: oldProc.GetProto(),
- NewProcedure: newProc.GetProto(),
+ OldProcedure: oldProc,
+ NewProcedure: newProc,
})
}
}
diff --git a/backend/plugin/schema/pg/view_comparer.go b/backend/plugin/schema/pg/view_comparer.go
index 7bdf48bf98..f6c2c7d24a 100644
--- a/backend/plugin/schema/pg/view_comparer.go
+++ b/backend/plugin/schema/pg/view_comparer.go
@@ -9,7 +9,6 @@ import (
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/schema"
"github.com/bytebase/bytebase/backend/plugin/schema/pg/ast"
- "github.com/bytebase/bytebase/backend/store/model"
)
func init() {
@@ -23,7 +22,7 @@ type PostgreSQLViewComparer struct {
}
// CompareView compares two views with PostgreSQL-specific logic using AST semantic analysis.
-func (c *PostgreSQLViewComparer) CompareView(oldView, newView *model.ViewMetadata) ([]schema.ViewChange, error) {
+func (c *PostgreSQLViewComparer) CompareView(oldView, newView *storepb.ViewMetadata) ([]schema.ViewChange, error) {
if oldView == nil || newView == nil {
return nil, nil
}
@@ -43,23 +42,21 @@ func (c *PostgreSQLViewComparer) CompareView(oldView, newView *model.ViewMetadat
}
// Compare comment from proto
- oldProto := oldView.GetProto()
- newProto := newView.GetProto()
- if oldProto != nil && newProto != nil {
- if oldProto.Comment != newProto.Comment {
- changes = append(changes, schema.ViewChange{
- Type: schema.ViewChangeComment,
- Description: "View comment changed",
- RequiresRecreation: false,
- })
- }
+ oldComment := oldView.Comment
+ newComment := newView.Comment
+ if oldComment != newComment {
+ changes = append(changes, schema.ViewChange{
+ Type: schema.ViewChangeComment,
+ Description: "View comment changed",
+ RequiresRecreation: false,
+ })
}
return changes, nil
}
// CompareMaterializedView compares two materialized views with PostgreSQL-specific logic.
-func (c *PostgreSQLViewComparer) CompareMaterializedView(oldMV, newMV *model.MaterializedViewMetadata) ([]schema.MaterializedViewChange, error) {
+func (c *PostgreSQLViewComparer) CompareMaterializedView(oldMV, newMV *storepb.MaterializedViewMetadata) ([]schema.MaterializedViewChange, error) {
if oldMV == nil || newMV == nil {
return nil, nil
}
@@ -78,34 +75,32 @@ func (c *PostgreSQLViewComparer) CompareMaterializedView(oldMV, newMV *model.Mat
}
// Compare comment from proto
- oldProto := oldMV.GetProto()
- newProto := newMV.GetProto()
- if oldProto != nil && newProto != nil {
- if oldProto.Comment != newProto.Comment {
- changes = append(changes, schema.MaterializedViewChange{
- Type: schema.MaterializedViewChangeComment,
- Description: "Materialized view comment changed",
- RequiresRecreation: false,
- })
- }
+ oldComment := oldMV.Comment
+ newComment := newMV.Comment
+ if oldComment != newComment {
+ changes = append(changes, schema.MaterializedViewChange{
+ Type: schema.MaterializedViewChangeComment,
+ Description: "Materialized view comment changed",
+ RequiresRecreation: false,
+ })
+ }
- // Compare indexes - PostgreSQL can add/drop indexes without recreating materialized views
- if !c.compareIndexes(oldProto.Indexes, newProto.Indexes) {
- changes = append(changes, schema.MaterializedViewChange{
- Type: schema.MaterializedViewChangeIndex,
- Description: "Materialized view indexes changed",
- RequiresRecreation: false, // PostgreSQL can modify indexes separately
- })
- }
+ // Compare indexes - PostgreSQL can add/drop indexes without recreating materialized views
+ if !c.compareIndexes(oldMV.Indexes, newMV.Indexes) {
+ changes = append(changes, schema.MaterializedViewChange{
+ Type: schema.MaterializedViewChangeIndex,
+ Description: "Materialized view indexes changed",
+ RequiresRecreation: false, // PostgreSQL can modify indexes separately
+ })
+ }
- // Compare triggers
- if !c.compareTriggers(oldProto.Triggers, newProto.Triggers) {
- changes = append(changes, schema.MaterializedViewChange{
- Type: schema.MaterializedViewChangeTrigger,
- Description: "Materialized view triggers changed",
- RequiresRecreation: false,
- })
- }
+ // Compare triggers
+ if !c.compareTriggers(oldMV.Triggers, newMV.Triggers) {
+ changes = append(changes, schema.MaterializedViewChange{
+ Type: schema.MaterializedViewChangeTrigger,
+ Description: "Materialized view triggers changed",
+ RequiresRecreation: false,
+ })
}
return changes, nil
diff --git a/backend/plugin/schema/view_comparer.go b/backend/plugin/schema/view_comparer.go
index 9c358d72a8..7acced1b95 100644
--- a/backend/plugin/schema/view_comparer.go
+++ b/backend/plugin/schema/view_comparer.go
@@ -2,7 +2,6 @@ package schema
import (
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
- "github.com/bytebase/bytebase/backend/store/model"
)
// ViewChangeType represents the type of change detected in a view.
@@ -60,17 +59,17 @@ type MaterializedViewChange struct {
// ViewComparer provides engine-specific view comparison logic.
type ViewComparer interface {
// CompareView compares two views and returns the detected changes.
- CompareView(oldView, newView *model.ViewMetadata) ([]ViewChange, error)
+ CompareView(oldView, newView *storepb.ViewMetadata) ([]ViewChange, error)
// CompareMaterializedView compares two materialized views and returns the detected changes.
- CompareMaterializedView(oldMV, newMV *model.MaterializedViewMetadata) ([]MaterializedViewChange, error)
+ CompareMaterializedView(oldMV, newMV *storepb.MaterializedViewMetadata) ([]MaterializedViewChange, error)
}
// DefaultViewComparer provides default view comparison logic that can be used by most engines.
type DefaultViewComparer struct{}
// CompareView compares two views using default logic.
-func (*DefaultViewComparer) CompareView(oldView, newView *model.ViewMetadata) ([]ViewChange, error) {
+func (*DefaultViewComparer) CompareView(oldView, newView *storepb.ViewMetadata) ([]ViewChange, error) {
if oldView == nil || newView == nil {
return nil, nil
}
@@ -86,24 +85,20 @@ func (*DefaultViewComparer) CompareView(oldView, newView *model.ViewMetadata) ([
})
}
- // Compare comment from proto
- oldProto := oldView.GetProto()
- newProto := newView.GetProto()
- if oldProto != nil && newProto != nil {
- if oldProto.Comment != newProto.Comment {
- changes = append(changes, ViewChange{
- Type: ViewChangeComment,
- Description: "View comment changed",
- RequiresRecreation: false,
- })
- }
+ // Compare comment
+ if oldView.Comment != newView.Comment {
+ changes = append(changes, ViewChange{
+ Type: ViewChangeComment,
+ Description: "View comment changed",
+ RequiresRecreation: false,
+ })
}
return changes, nil
}
// CompareMaterializedView compares two materialized views using default logic.
-func (*DefaultViewComparer) CompareMaterializedView(oldMV, newMV *model.MaterializedViewMetadata) ([]MaterializedViewChange, error) {
+func (*DefaultViewComparer) CompareMaterializedView(oldMV, newMV *storepb.MaterializedViewMetadata) ([]MaterializedViewChange, error) {
if oldMV == nil || newMV == nil {
return nil, nil
}
@@ -119,17 +114,13 @@ func (*DefaultViewComparer) CompareMaterializedView(oldMV, newMV *model.Material
})
}
- // Compare comment from proto
- oldProto := oldMV.GetProto()
- newProto := newMV.GetProto()
- if oldProto != nil && newProto != nil {
- if oldProto.Comment != newProto.Comment {
- changes = append(changes, MaterializedViewChange{
- Type: MaterializedViewChangeComment,
- Description: "Materialized view comment changed",
- RequiresRecreation: false,
- })
- }
+ // Compare comment
+ if oldMV.Comment != newMV.Comment {
+ changes = append(changes, MaterializedViewChange{
+ Type: MaterializedViewChangeComment,
+ Description: "Materialized view comment changed",
+ RequiresRecreation: false,
+ })
}
return changes, nil
diff --git a/backend/store/model/database.go b/backend/store/model/database.go
index a53036c54e..d60e916383 100644
--- a/backend/store/model/database.go
+++ b/backend/store/model/database.go
@@ -34,13 +34,13 @@ type SchemaMetadata struct {
isDetailCaseSensitive bool
internalTables map[string]*TableMetadata
internalExternalTable map[string]*ExternalTableMetadata
- internalViews map[string]*ViewMetadata
- internalMaterializedView map[string]*MaterializedViewMetadata
+ internalViews map[string]*storepb.ViewMetadata
+ internalMaterializedView map[string]*storepb.MaterializedViewMetadata
// Store internal functions by list to take care of the overloadings.
functions []*storepb.FunctionMetadata
- internalProcedures map[string]*ProcedureMetadata
- internalSequences map[string]*SequenceMetadata
- internalPackages map[string]*PackageMetadata
+ internalProcedures map[string]*storepb.ProcedureMetadata
+ internalSequences map[string]*storepb.SequenceMetadata
+ internalPackages map[string]*storepb.PackageMetadata
proto *storepb.SchemaMetadata
}
@@ -82,30 +82,6 @@ type IndexMetadata struct {
proto *storepb.IndexMetadata
}
-// ViewMetadata is the metadata for a view.
-type ViewMetadata struct {
- Definition string
- proto *storepb.ViewMetadata
-}
-
-type MaterializedViewMetadata struct {
- Definition string
- proto *storepb.MaterializedViewMetadata
-}
-
-type ProcedureMetadata struct {
- Definition string
- proto *storepb.ProcedureMetadata
-}
-type PackageMetadata struct {
- Definition string
- proto *storepb.PackageMetadata
-}
-
-type SequenceMetadata struct {
- proto *storepb.SequenceMetadata
-}
-
func NewDatabaseMetadata(
metadata *storepb.DatabaseSchemaMetadata,
schema []byte,
@@ -133,11 +109,11 @@ func NewDatabaseMetadata(
isDetailCaseSensitive: isDetailCaseSensitive,
internalTables: make(map[string]*TableMetadata),
internalExternalTable: make(map[string]*ExternalTableMetadata),
- internalViews: make(map[string]*ViewMetadata),
- internalMaterializedView: make(map[string]*MaterializedViewMetadata),
- internalProcedures: make(map[string]*ProcedureMetadata),
- internalPackages: make(map[string]*PackageMetadata),
- internalSequences: make(map[string]*SequenceMetadata),
+ internalViews: make(map[string]*storepb.ViewMetadata),
+ internalMaterializedView: make(map[string]*storepb.MaterializedViewMetadata),
+ internalProcedures: make(map[string]*storepb.ProcedureMetadata),
+ internalPackages: make(map[string]*storepb.PackageMetadata),
+ internalSequences: make(map[string]*storepb.SequenceMetadata),
proto: s,
}
for _, table := range s.Tables {
@@ -183,10 +159,7 @@ func NewDatabaseMetadata(
} else {
viewID = strings.ToLower(view.Name)
}
- schemaMetadata.internalViews[viewID] = &ViewMetadata{
- Definition: view.Definition,
- proto: view,
- }
+ schemaMetadata.internalViews[viewID] = view
}
for _, materializedView := range s.MaterializedViews {
var viewID string
@@ -195,10 +168,7 @@ func NewDatabaseMetadata(
} else {
viewID = strings.ToLower(materializedView.Name)
}
- schemaMetadata.internalMaterializedView[viewID] = &MaterializedViewMetadata{
- Definition: materializedView.Definition,
- proto: materializedView,
- }
+ schemaMetadata.internalMaterializedView[viewID] = materializedView
}
schemaMetadata.functions = s.Functions
for _, procedure := range s.Procedures {
@@ -208,10 +178,7 @@ func NewDatabaseMetadata(
} else {
procedureID = strings.ToLower(procedure.Name)
}
- schemaMetadata.internalProcedures[procedureID] = &ProcedureMetadata{
- Definition: procedure.Definition,
- proto: procedure,
- }
+ schemaMetadata.internalProcedures[procedureID] = procedure
}
for _, p := range s.Packages {
var packageID string
@@ -220,10 +187,7 @@ func NewDatabaseMetadata(
} else {
packageID = strings.ToLower(p.Name)
}
- schemaMetadata.internalPackages[packageID] = &PackageMetadata{
- Definition: p.Definition,
- proto: p,
- }
+ schemaMetadata.internalPackages[packageID] = p
}
for _, sequence := range s.Sequences {
var sequenceID string
@@ -232,9 +196,7 @@ func NewDatabaseMetadata(
} else {
sequenceID = strings.ToLower(sequence.Name)
}
- schemaMetadata.internalSequences[sequenceID] = &SequenceMetadata{
- proto: sequence,
- }
+ schemaMetadata.internalSequences[sequenceID] = sequence
}
var schemaID string
if isObjectCaseSensitive {
@@ -396,11 +358,11 @@ func (d *DatabaseMetadata) CreateSchema(schemaName string) *SchemaMetadata {
isDetailCaseSensitive: d.isDetailCaseSensitive,
internalTables: make(map[string]*TableMetadata),
internalExternalTable: make(map[string]*ExternalTableMetadata),
- internalViews: make(map[string]*ViewMetadata),
- internalMaterializedView: make(map[string]*MaterializedViewMetadata),
- internalProcedures: make(map[string]*ProcedureMetadata),
- internalPackages: make(map[string]*PackageMetadata),
- internalSequences: make(map[string]*SequenceMetadata),
+ internalViews: make(map[string]*storepb.ViewMetadata),
+ internalMaterializedView: make(map[string]*storepb.MaterializedViewMetadata),
+ internalProcedures: make(map[string]*storepb.ProcedureMetadata),
+ internalPackages: make(map[string]*storepb.PackageMetadata),
+ internalSequences: make(map[string]*storepb.SequenceMetadata),
proto: newSchemaProto,
}
@@ -554,7 +516,7 @@ func (s *SchemaMetadata) GetIndex(name string) *IndexMetadata {
}
// GetView gets the view by name.
-func (s *SchemaMetadata) GetView(name string) *ViewMetadata {
+func (s *SchemaMetadata) GetView(name string) *storepb.ViewMetadata {
var nameID string
if s.isObjectCaseSensitive {
nameID = name
@@ -564,7 +526,7 @@ func (s *SchemaMetadata) GetView(name string) *ViewMetadata {
return s.internalViews[nameID]
}
-func (s *SchemaMetadata) GetProcedure(name string) *ProcedureMetadata {
+func (s *SchemaMetadata) GetProcedure(name string) *storepb.ProcedureMetadata {
var nameID string
if s.isDetailCaseSensitive {
nameID = name
@@ -574,7 +536,7 @@ func (s *SchemaMetadata) GetProcedure(name string) *ProcedureMetadata {
return s.internalProcedures[nameID]
}
-func (s *SchemaMetadata) GetPackage(name string) *PackageMetadata {
+func (s *SchemaMetadata) GetPackage(name string) *storepb.PackageMetadata {
var nameID string
if s.isDetailCaseSensitive {
nameID = name
@@ -585,7 +547,7 @@ func (s *SchemaMetadata) GetPackage(name string) *PackageMetadata {
}
// GetMaterializedView gets the materialized view by name.
-func (s *SchemaMetadata) GetMaterializedView(name string) *MaterializedViewMetadata {
+func (s *SchemaMetadata) GetMaterializedView(name string) *storepb.MaterializedViewMetadata {
var nameID string
if s.isObjectCaseSensitive {
nameID = name
@@ -628,7 +590,7 @@ func (s *SchemaMetadata) GetFunction(name string) *storepb.FunctionMetadata {
}
// GetSequence gets the sequence by name.
-func (s *SchemaMetadata) GetSequence(name string) *SequenceMetadata {
+func (s *SchemaMetadata) GetSequence(name string) *storepb.SequenceMetadata {
var nameID string
if s.isDetailCaseSensitive {
nameID = name
@@ -638,15 +600,15 @@ func (s *SchemaMetadata) GetSequence(name string) *SequenceMetadata {
return s.internalSequences[nameID]
}
-func (s *SchemaMetadata) GetSequencesByOwnerTable(name string) []*SequenceMetadata {
- var result []*SequenceMetadata
+func (s *SchemaMetadata) GetSequencesByOwnerTable(name string) []*storepb.SequenceMetadata {
+ var result []*storepb.SequenceMetadata
for _, sequence := range s.internalSequences {
if s.isObjectCaseSensitive {
- if sequence.GetProto().OwnerTable == name {
+ if sequence.OwnerTable == name {
result = append(result, sequence)
}
} else {
- if strings.EqualFold(sequence.GetProto().OwnerTable, name) {
+ if strings.EqualFold(sequence.OwnerTable, name) {
result = append(result, sequence)
}
}
@@ -674,7 +636,7 @@ func (s *SchemaMetadata) ListTableNames() []string {
func (s *SchemaMetadata) ListProcedureNames() []string {
var result []string
for _, procedure := range s.internalProcedures {
- result = append(result, procedure.GetProto().GetName())
+ result = append(result, procedure.GetName())
}
slices.Sort(result)
@@ -696,7 +658,7 @@ func (s *SchemaMetadata) ListFunctionNames() []string {
func (s *SchemaMetadata) ListViewNames() []string {
var result []string
for _, view := range s.internalViews {
- result = append(result, view.GetProto().GetName())
+ result = append(result, view.GetName())
}
slices.Sort(result)
@@ -718,7 +680,7 @@ func (s *SchemaMetadata) ListForeignTableNames() []string {
func (s *SchemaMetadata) ListMaterializedViewNames() []string {
var result []string
for _, view := range s.internalMaterializedView {
- result = append(result, view.GetProto().GetName())
+ result = append(result, view.GetName())
}
slices.Sort(result)
@@ -843,7 +805,7 @@ func (s *SchemaMetadata) RenameTable(oldName string, newName string) error {
// CreateView creates a new view in the schema.
// Returns an error if the view already exists.
-func (s *SchemaMetadata) CreateView(viewName string, definition string, dependencyColumns []*storepb.DependencyColumn) (*ViewMetadata, error) {
+func (s *SchemaMetadata) CreateView(viewName string, definition string, dependencyColumns []*storepb.DependencyColumn) (*storepb.ViewMetadata, error) {
// Check if view already exists
if s.GetView(viewName) != nil {
return nil, errors.Errorf("view %q already exists in schema %q", viewName, s.proto.Name)
@@ -859,12 +821,6 @@ func (s *SchemaMetadata) CreateView(viewName string, definition string, dependen
// Add to proto's view list
s.proto.Views = append(s.proto.Views, newViewProto)
- // Create ViewMetadata wrapper
- viewMeta := &ViewMetadata{
- Definition: definition,
- proto: newViewProto,
- }
-
// Add to internal map
var viewID string
if s.isObjectCaseSensitive {
@@ -872,9 +828,9 @@ func (s *SchemaMetadata) CreateView(viewName string, definition string, dependen
} else {
viewID = strings.ToLower(viewName)
}
- s.internalViews[viewID] = viewMeta
+ s.internalViews[viewID] = newViewProto
- return viewMeta, nil
+ return newViewProto, nil
}
// DropView drops a view from the schema.
@@ -940,7 +896,7 @@ func (s *SchemaMetadata) RenameView(oldName string, newName string) error {
delete(s.internalViews, oldViewID)
// Update the view name in the proto
- oldView.proto.Name = newName
+ oldView.Name = newName
// Add back to internal map using new name
var newViewID string
@@ -960,7 +916,7 @@ func (s *SchemaMetadata) GetDependentViews(tableName string, columnName string)
var dependentViews []string
for _, view := range s.internalViews {
- viewProto := view.GetProto()
+ viewProto := view
for _, dep := range viewProto.DependencyColumns {
// Schema is implicitly the same schema, or explicitly matches
tableMatches := false
@@ -1542,26 +1498,6 @@ func (t *TableMetadata) RenameIndex(oldName string, newName string) error {
return nil
}
-func (v *ViewMetadata) GetProto() *storepb.ViewMetadata {
- return v.proto
-}
-
-func (m *MaterializedViewMetadata) GetProto() *storepb.MaterializedViewMetadata {
- return m.proto
-}
-
-func (p *ProcedureMetadata) GetProto() *storepb.ProcedureMetadata {
- return p.proto
-}
-
-func (p *PackageMetadata) GetProto() *storepb.PackageMetadata {
- return p.proto
-}
-
-func (p *SequenceMetadata) GetProto() *storepb.SequenceMetadata {
- return p.proto
-}
-
// getIsDetailCaseSensitive is a special case for MySQL, MariaDB, and TiDB.
// From MySQL documentation:
// Partition, subpartition, column, index, stored routine, event, and resource group names are not case-sensitive on any platform, nor are column aliases.
diff --git a/backend/store/model/pg_searcher.go b/backend/store/model/pg_searcher.go
index 10bdca36a0..67494b595b 100644
--- a/backend/store/model/pg_searcher.go
+++ b/backend/store/model/pg_searcher.go
@@ -66,7 +66,7 @@ func (s *DatabaseSearcher) SearchIndex(name string) (string, *IndexMetadata) {
// SearchView searches for a view in the search path.
// NOTE: This is primarily designed for PostgreSQL's search_path concept.
-func (s *DatabaseSearcher) SearchView(name string) (string, *ViewMetadata) {
+func (s *DatabaseSearcher) SearchView(name string) (string, *storepb.ViewMetadata) {
for _, schemaName := range s.searchPath {
schema := s.db.GetSchemaMetadata(schemaName)
if schema == nil {
@@ -98,7 +98,7 @@ func (s *DatabaseSearcher) SearchExternalTable(name string) (string, *ExternalTa
// SearchSequence searches for a sequence in the search path.
// NOTE: This is primarily designed for PostgreSQL's search_path concept.
-func (s *DatabaseSearcher) SearchSequence(name string) (string, *SequenceMetadata) {
+func (s *DatabaseSearcher) SearchSequence(name string) (string, *storepb.SequenceMetadata) {
for _, schemaName := range s.searchPath {
schema := s.db.GetSchemaMetadata(schemaName)
if schema == nil {
@@ -114,7 +114,7 @@ func (s *DatabaseSearcher) SearchSequence(name string) (string, *SequenceMetadat
// SearchMaterializedView searches for a materialized view in the search path.
// NOTE: This is primarily designed for PostgreSQL's search_path concept.
-func (s *DatabaseSearcher) SearchMaterializedView(name string) (string, *MaterializedViewMetadata) {
+func (s *DatabaseSearcher) SearchMaterializedView(name string) (string, *storepb.MaterializedViewMetadata) {
for _, schemaName := range s.searchPath {
schema := s.db.GetSchemaMetadata(schemaName)
if schema == nil {
@@ -204,7 +204,7 @@ func (d *DatabaseMetadata) SearchIndex(searchPath []string, name string) (string
// SearchView searches for a view in the search path.
// NOTE: This is primarily designed for PostgreSQL's search_path concept.
-func (d *DatabaseMetadata) SearchView(searchPath []string, name string) (string, *ViewMetadata) {
+func (d *DatabaseMetadata) SearchView(searchPath []string, name string) (string, *storepb.ViewMetadata) {
for _, schemaName := range searchPath {
schema := d.GetSchemaMetadata(schemaName)
if schema == nil {
@@ -236,7 +236,7 @@ func (d *DatabaseMetadata) SearchExternalTable(searchPath []string, name string)
// SearchSequence searches for a sequence in the search path.
// NOTE: This is primarily designed for PostgreSQL's search_path concept.
-func (d *DatabaseMetadata) SearchSequence(searchPath []string, name string) (string, *SequenceMetadata) {
+func (d *DatabaseMetadata) SearchSequence(searchPath []string, name string) (string, *storepb.SequenceMetadata) {
for _, schemaName := range searchPath {
schema := d.GetSchemaMetadata(schemaName)
if schema == nil {
@@ -252,7 +252,7 @@ func (d *DatabaseMetadata) SearchSequence(searchPath []string, name string) (str
// SearchMaterializedView searches for a materialized view in the search path.
// NOTE: This is primarily designed for PostgreSQL's search_path concept.
-func (d *DatabaseMetadata) SearchMaterializedView(searchPath []string, name string) (string, *MaterializedViewMetadata) {
+func (d *DatabaseMetadata) SearchMaterializedView(searchPath []string, name string) (string, *storepb.MaterializedViewMetadata) {
for _, schemaName := range searchPath {
schema := d.GetSchemaMetadata(schemaName)
if schema == nil {