Skip to content

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

refactor: simplify case sensitivity normalization with helper function (#18149)

Danny Xu04662a9a44fd
diff --git a/backend/store/model/database.go b/backend/store/model/database.go
index 77d0f82097..e32d151807 100644
--- a/backend/store/model/database.go
+++ b/backend/store/model/database.go
@@ -80,6 +80,15 @@ type IndexMetadata struct {
proto *storepb.IndexMetadata
}
+// normalizeNameByCaseSensitivity normalizes a name based on case sensitivity.
+// If caseSensitive is true, returns the name as-is; otherwise returns lowercase.
+func normalizeNameByCaseSensitivity(name string, caseSensitive bool) string {
+ if caseSensitive {
+ return name
+ }
+ return strings.ToLower(name)
+}
+
func NewDatabaseMetadata(
metadata *storepb.DatabaseSchemaMetadata,
schema []byte,
@@ -117,12 +126,7 @@ func NewDatabaseMetadata(
for _, table := range s.Tables {
tables, names := buildTablesMetadata(table, isDetailCaseSensitive)
for i, table := range tables {
- var tableID string
- if isObjectCaseSensitive {
- tableID = names[i]
- } else {
- tableID = strings.ToLower(names[i])
- }
+ tableID := normalizeNameByCaseSensitivity(names[i], isObjectCaseSensitive)
schemaMetadata.internalTables[tableID] = table
}
}
@@ -133,85 +137,40 @@ func NewDatabaseMetadata(
proto: externalTable,
}
for _, column := range externalTable.Columns {
- var columnID string
- if isDetailCaseSensitive {
- columnID = column.Name
- } else {
- columnID = strings.ToLower(column.Name)
- }
+ columnID := normalizeNameByCaseSensitivity(column.Name, isDetailCaseSensitive)
externalTableMetadata.internal[columnID] = column
externalTableMetadata.columns = append(externalTableMetadata.columns, column)
}
- var tableID string
- if isObjectCaseSensitive {
- tableID = externalTable.Name
- } else {
- tableID = strings.ToLower(externalTable.Name)
- }
+ tableID := normalizeNameByCaseSensitivity(externalTable.Name, isObjectCaseSensitive)
schemaMetadata.internalExternalTable[tableID] = externalTableMetadata
}
for _, view := range s.Views {
- var viewID string
- if isObjectCaseSensitive {
- viewID = view.Name
- } else {
- viewID = strings.ToLower(view.Name)
- }
+ viewID := normalizeNameByCaseSensitivity(view.Name, isObjectCaseSensitive)
schemaMetadata.internalViews[viewID] = view
}
for _, materializedView := range s.MaterializedViews {
- var viewID string
- if isObjectCaseSensitive {
- viewID = materializedView.Name
- } else {
- viewID = strings.ToLower(materializedView.Name)
- }
+ viewID := normalizeNameByCaseSensitivity(materializedView.Name, isObjectCaseSensitive)
schemaMetadata.internalMaterializedView[viewID] = materializedView
}
schemaMetadata.functions = s.Functions
for _, procedure := range s.Procedures {
- var procedureID string
- if isDetailCaseSensitive {
- procedureID = procedure.Name
- } else {
- procedureID = strings.ToLower(procedure.Name)
- }
+ procedureID := normalizeNameByCaseSensitivity(procedure.Name, isDetailCaseSensitive)
schemaMetadata.internalProcedures[procedureID] = procedure
}
for _, p := range s.Packages {
- var packageID string
- if isDetailCaseSensitive {
- packageID = p.Name
- } else {
- packageID = strings.ToLower(p.Name)
- }
+ packageID := normalizeNameByCaseSensitivity(p.Name, isDetailCaseSensitive)
schemaMetadata.internalPackages[packageID] = p
}
for _, sequence := range s.Sequences {
- var sequenceID string
- if isDetailCaseSensitive {
- sequenceID = sequence.Name
- } else {
- sequenceID = strings.ToLower(sequence.Name)
- }
+ sequenceID := normalizeNameByCaseSensitivity(sequence.Name, isDetailCaseSensitive)
schemaMetadata.internalSequences[sequenceID] = sequence
}
- var schemaID string
- if isObjectCaseSensitive {
- schemaID = s.Name
- } else {
- schemaID = strings.ToLower(s.Name)
- }
+ schemaID := normalizeNameByCaseSensitivity(s.Name, isObjectCaseSensitive)
dbMetadata.internal[schemaID] = schemaMetadata
}
for _, dbLink := range metadata.LinkedDatabases {
- var dbLinkID string
- if isObjectCaseSensitive {
- dbLinkID = dbLink.Name
- } else {
- dbLinkID = strings.ToLower(dbLink.Name)
- }
+ dbLinkID := normalizeNameByCaseSensitivity(dbLink.Name, isObjectCaseSensitive)
dbMetadata.linkedDatabase[dbLinkID] = dbLink
}
@@ -255,12 +214,7 @@ func (d *DatabaseMetadata) GetSearchPath() []string {
}
func (d *DatabaseMetadata) GetSchemaMetadata(name string) *SchemaMetadata {
- var schemaID string
- if d.isObjectCaseSensitive {
- schemaID = name
- } else {
- schemaID = strings.ToLower(name)
- }
+ schemaID := normalizeNameByCaseSensitivity(name, d.isObjectCaseSensitive)
return d.internal[schemaID]
}
@@ -289,12 +243,7 @@ func (d *DatabaseMetadata) ListSchemaNames() []string {
}
func (d *DatabaseMetadata) GetLinkedDatabase(name string) *storepb.LinkedDatabaseMetadata {
- var nameID string
- if d.isObjectCaseSensitive {
- nameID = name
- } else {
- nameID = strings.ToLower(name)
- }
+ nameID := normalizeNameByCaseSensitivity(name, d.isObjectCaseSensitive)
return d.linkedDatabase[nameID]
}
@@ -328,12 +277,7 @@ func (d *DatabaseMetadata) CreateSchema(schemaName string) *SchemaMetadata {
}
// Add to internal map
- var schemaID string
- if d.isObjectCaseSensitive {
- schemaID = schemaName
- } else {
- schemaID = strings.ToLower(schemaName)
- }
+ schemaID := normalizeNameByCaseSensitivity(schemaName, d.isObjectCaseSensitive)
d.internal[schemaID] = schemaMeta
return schemaMeta
@@ -346,12 +290,7 @@ func (d *DatabaseMetadata) DropSchema(schemaName string) error {
}
// Remove from internal map
- var schemaID string
- if d.isObjectCaseSensitive {
- schemaID = schemaName
- } else {
- schemaID = strings.ToLower(schemaName)
- }
+ schemaID := normalizeNameByCaseSensitivity(schemaName, d.isObjectCaseSensitive)
delete(d.internal, schemaID)
// Remove from proto's schema list
@@ -446,12 +385,7 @@ func (s *SchemaMetadata) GetTable(name string) *TableMetadata {
if s == nil {
return nil
}
- var nameID string
- if s.isObjectCaseSensitive {
- nameID = name
- } else {
- nameID = strings.ToLower(name)
- }
+ nameID := normalizeNameByCaseSensitivity(name, s.isObjectCaseSensitive)
return s.internalTables[nameID]
}
@@ -471,54 +405,29 @@ func (s *SchemaMetadata) GetIndex(name string) *IndexMetadata {
// GetView gets the view by name.
func (s *SchemaMetadata) GetView(name string) *storepb.ViewMetadata {
- var nameID string
- if s.isObjectCaseSensitive {
- nameID = name
- } else {
- nameID = strings.ToLower(name)
- }
+ nameID := normalizeNameByCaseSensitivity(name, s.isObjectCaseSensitive)
return s.internalViews[nameID]
}
func (s *SchemaMetadata) GetProcedure(name string) *storepb.ProcedureMetadata {
- var nameID string
- if s.isDetailCaseSensitive {
- nameID = name
- } else {
- nameID = strings.ToLower(name)
- }
+ nameID := normalizeNameByCaseSensitivity(name, s.isDetailCaseSensitive)
return s.internalProcedures[nameID]
}
func (s *SchemaMetadata) GetPackage(name string) *storepb.PackageMetadata {
- var nameID string
- if s.isDetailCaseSensitive {
- nameID = name
- } else {
- nameID = strings.ToLower(name)
- }
+ nameID := normalizeNameByCaseSensitivity(name, s.isDetailCaseSensitive)
return s.internalPackages[nameID]
}
// GetMaterializedView gets the materialized view by name.
func (s *SchemaMetadata) GetMaterializedView(name string) *storepb.MaterializedViewMetadata {
- var nameID string
- if s.isObjectCaseSensitive {
- nameID = name
- } else {
- nameID = strings.ToLower(name)
- }
+ nameID := normalizeNameByCaseSensitivity(name, s.isObjectCaseSensitive)
return s.internalMaterializedView[nameID]
}
// GetExternalTable gets the external table by name.
func (s *SchemaMetadata) GetExternalTable(name string) *ExternalTableMetadata {
- var nameID string
- if s.isObjectCaseSensitive {
- nameID = name
- } else {
- nameID = strings.ToLower(name)
- }
+ nameID := normalizeNameByCaseSensitivity(name, s.isObjectCaseSensitive)
return s.internalExternalTable[nameID]
}
@@ -545,12 +454,7 @@ func (s *SchemaMetadata) GetFunction(name string) *storepb.FunctionMetadata {
// GetSequence gets the sequence by name.
func (s *SchemaMetadata) GetSequence(name string) *storepb.SequenceMetadata {
- var nameID string
- if s.isDetailCaseSensitive {
- nameID = name
- } else {
- nameID = strings.ToLower(name)
- }
+ nameID := normalizeNameByCaseSensitivity(name, s.isDetailCaseSensitive)
return s.internalSequences[nameID]
}
@@ -668,12 +572,7 @@ func (s *SchemaMetadata) CreateTable(tableName string) (*TableMetadata, error) {
}
// Add to internal map
- var tableID string
- if s.isObjectCaseSensitive {
- tableID = tableName
- } else {
- tableID = strings.ToLower(tableName)
- }
+ tableID := normalizeNameByCaseSensitivity(tableName, s.isObjectCaseSensitive)
s.internalTables[tableID] = tableMeta
return tableMeta, nil
@@ -688,12 +587,7 @@ func (s *SchemaMetadata) DropTable(tableName string) error {
}
// Remove from internal map
- var tableID string
- if s.isObjectCaseSensitive {
- tableID = tableName
- } else {
- tableID = strings.ToLower(tableName)
- }
+ tableID := normalizeNameByCaseSensitivity(tableName, s.isObjectCaseSensitive)
delete(s.internalTables, tableID)
// Remove from proto's table list
@@ -733,24 +627,14 @@ func (s *SchemaMetadata) RenameTable(oldName string, newName string) error {
}
// Remove from internal map using old name
- var oldTableID string
- if s.isObjectCaseSensitive {
- oldTableID = oldName
- } else {
- oldTableID = strings.ToLower(oldName)
- }
+ oldTableID := normalizeNameByCaseSensitivity(oldName, s.isObjectCaseSensitive)
delete(s.internalTables, oldTableID)
// Update the table name in the proto
oldTable.proto.Name = newName
// Add back to internal map using new name
- var newTableID string
- if s.isObjectCaseSensitive {
- newTableID = newName
- } else {
- newTableID = strings.ToLower(newName)
- }
+ newTableID := normalizeNameByCaseSensitivity(newName, s.isObjectCaseSensitive)
s.internalTables[newTableID] = oldTable
return nil
@@ -775,12 +659,7 @@ func (s *SchemaMetadata) CreateView(viewName string, definition string, dependen
s.proto.Views = append(s.proto.Views, newViewProto)
// Add to internal map
- var viewID string
- if s.isObjectCaseSensitive {
- viewID = viewName
- } else {
- viewID = strings.ToLower(viewName)
- }
+ viewID := normalizeNameByCaseSensitivity(viewName, s.isObjectCaseSensitive)
s.internalViews[viewID] = newViewProto
return newViewProto, nil
@@ -795,12 +674,7 @@ func (s *SchemaMetadata) DropView(viewName string) error {
}
// Remove from internal map
- var viewID string
- if s.isObjectCaseSensitive {
- viewID = viewName
- } else {
- viewID = strings.ToLower(viewName)
- }
+ viewID := normalizeNameByCaseSensitivity(viewName, s.isObjectCaseSensitive)
delete(s.internalViews, viewID)
// Remove from proto's view list
@@ -840,24 +714,14 @@ func (s *SchemaMetadata) RenameView(oldName string, newName string) error {
}
// Remove from internal map using old name
- var oldViewID string
- if s.isObjectCaseSensitive {
- oldViewID = oldName
- } else {
- oldViewID = strings.ToLower(oldName)
- }
+ oldViewID := normalizeNameByCaseSensitivity(oldName, s.isObjectCaseSensitive)
delete(s.internalViews, oldViewID)
// Update the view name in the proto
oldView.Name = newName
// Add back to internal map using new name
- var newViewID string
- if s.isObjectCaseSensitive {
- newViewID = newName
- } else {
- newViewID = strings.ToLower(newName)
- }
+ newViewID := normalizeNameByCaseSensitivity(newName, s.isObjectCaseSensitive)
s.internalViews[newViewID] = oldView
return nil
@@ -918,22 +782,12 @@ func buildTablesMetadata(table *storepb.TableMetadata, isDetailCaseSensitive boo
proto: table,
}
for _, column := range table.Columns {
- var columnID string
- if isDetailCaseSensitive {
- columnID = column.Name
- } else {
- columnID = strings.ToLower(column.Name)
- }
+ columnID := normalizeNameByCaseSensitivity(column.Name, isDetailCaseSensitive)
tableMetadata.internalColumn[columnID] = column
}
indexes := buildIndexesMetadata(table)
for _, index := range indexes {
- var indexID string
- if isDetailCaseSensitive {
- indexID = index.proto.Name
- } else {
- indexID = strings.ToLower(index.proto.Name)
- }
+ indexID := normalizeNameByCaseSensitivity(index.proto.Name, isDetailCaseSensitive)
tableMetadata.internalIndexes[indexID] = index
}
result = append(result, tableMetadata)
@@ -981,12 +835,7 @@ func buildTablesMetadataRecursive(originalColumn []*storepb.ColumnMetadata, part
proto: proto,
}
for _, column := range originalColumn {
- var columnID string
- if isDetailCaseSensitive {
- columnID = column.Name
- } else {
- columnID = strings.ToLower(column.Name)
- }
+ columnID := normalizeNameByCaseSensitivity(column.Name, isDetailCaseSensitive)
partitionMetadata.internalColumn[columnID] = column
}
tables = append(tables, partitionMetadata)
@@ -1013,12 +862,7 @@ func (t *TableMetadata) GetColumn(name string) *storepb.ColumnMetadata {
if t == nil {
return nil
}
- var nameID string
- if t.isDetailCaseSensitive {
- nameID = name
- } else {
- nameID = strings.ToLower(name)
- }
+ nameID := normalizeNameByCaseSensitivity(name, t.isDetailCaseSensitive)
return t.internalColumn[nameID]
}
@@ -1026,12 +870,7 @@ func (t *TableMetadata) GetIndex(name string) *IndexMetadata {
if t == nil {
return nil
}
- var nameID string
- if t.isDetailCaseSensitive {
- nameID = name
- } else {
- nameID = strings.ToLower(name)
- }
+ nameID := normalizeNameByCaseSensitivity(name, t.isDetailCaseSensitive)
return t.internalIndexes[nameID]
}
@@ -1068,12 +907,7 @@ func (t *TableMetadata) CreateColumn(columnProto *storepb.ColumnMetadata) error
t.proto.Columns = append(t.proto.Columns, columnProto)
// Add to internal map
- var columnID string
- if t.isDetailCaseSensitive {
- columnID = columnProto.Name
- } else {
- columnID = strings.ToLower(columnProto.Name)
- }
+ columnID := normalizeNameByCaseSensitivity(columnProto.Name, t.isDetailCaseSensitive)
t.internalColumn[columnID] = columnProto
return nil
@@ -1093,12 +927,7 @@ func (t *TableMetadata) dropColumnInternal(columnName string, renumberPositions
}
// Remove from internal map
- var columnID string
- if t.isDetailCaseSensitive {
- columnID = columnName
- } else {
- columnID = strings.ToLower(columnName)
- }
+ columnID := normalizeNameByCaseSensitivity(columnName, t.isDetailCaseSensitive)
delete(t.internalColumn, columnID)
// Remove from proto's column list
@@ -1185,12 +1014,7 @@ func (t *TableMetadata) DropColumnWithoutUpdatingIndexes(columnName string) erro
}
// Remove from internal map
- var columnID string
- if t.isDetailCaseSensitive {
- columnID = columnName
- } else {
- columnID = strings.ToLower(columnName)
- }
+ columnID := normalizeNameByCaseSensitivity(columnName, t.isDetailCaseSensitive)
delete(t.internalColumn, columnID)
// Remove from proto's column list
@@ -1237,24 +1061,14 @@ func (t *TableMetadata) RenameColumn(oldName string, newName string) error {
}
// Remove from internal map using old name
- var oldColumnID string
- if t.isDetailCaseSensitive {
- oldColumnID = oldName
- } else {
- oldColumnID = strings.ToLower(oldName)
- }
+ oldColumnID := normalizeNameByCaseSensitivity(oldName, t.isDetailCaseSensitive)
delete(t.internalColumn, oldColumnID)
// Update the column name in the proto
oldColumn.Name = newName
// Add back to internal map using new name
- var newColumnID string
- if t.isDetailCaseSensitive {
- newColumnID = newName
- } else {
- newColumnID = strings.ToLower(newName)
- }
+ newColumnID := normalizeNameByCaseSensitivity(newName, t.isDetailCaseSensitive)
t.internalColumn[newColumnID] = oldColumn
// Update column references in indexes
@@ -1281,12 +1095,7 @@ func (t *ExternalTableMetadata) GetProto() *storepb.ExternalTableMetadata {
// GetColumn gets the column by name.
func (t *ExternalTableMetadata) GetColumn(name string) *storepb.ColumnMetadata {
- var nameID string
- if t.isDetailCaseSensitive {
- nameID = name
- } else {
- nameID = strings.ToLower(name)
- }
+ nameID := normalizeNameByCaseSensitivity(name, t.isDetailCaseSensitive)
return t.internal[nameID]
}
@@ -1315,12 +1124,7 @@ func (t *TableMetadata) CreateIndex(indexProto *storepb.IndexMetadata) error {
t.proto.Indexes = append(t.proto.Indexes, indexProto)
// Add to internal map
- var indexID string
- if t.isDetailCaseSensitive {
- indexID = indexProto.Name
- } else {
- indexID = strings.ToLower(indexProto.Name)
- }
+ indexID := normalizeNameByCaseSensitivity(indexProto.Name, t.isDetailCaseSensitive)
t.internalIndexes[indexID] = &IndexMetadata{
tableProto: t.proto,
proto: indexProto,
@@ -1338,12 +1142,7 @@ func (t *TableMetadata) DropIndex(indexName string) error {
}
// Remove from internal map
- var indexID string
- if t.isDetailCaseSensitive {
- indexID = indexName
- } else {
- indexID = strings.ToLower(indexName)
- }
+ indexID := normalizeNameByCaseSensitivity(indexName, t.isDetailCaseSensitive)
delete(t.internalIndexes, indexID)
// Remove from proto's index list
@@ -1383,24 +1182,14 @@ func (t *TableMetadata) RenameIndex(oldName string, newName string) error {
}
// Remove from internal map using old name
- var oldIndexID string
- if t.isDetailCaseSensitive {
- oldIndexID = oldName
- } else {
- oldIndexID = strings.ToLower(oldName)
- }
+ oldIndexID := normalizeNameByCaseSensitivity(oldName, t.isDetailCaseSensitive)
delete(t.internalIndexes, oldIndexID)
// Update the index name in the proto
oldIndex.proto.Name = newName
// Add back to internal map using new name
- var newIndexID string
- if t.isDetailCaseSensitive {
- newIndexID = newName
- } else {
- newIndexID = strings.ToLower(newName)
- }
+ newIndexID := normalizeNameByCaseSensitivity(newName, t.isDetailCaseSensitive)
t.internalIndexes[newIndexID] = oldIndex
return nil