Skip to content

Commit c6b0f80

Browse files
priyanshi-ybpriyanshi-yb
committed
nit
1 parent c178884 commit c6b0f80

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

‎yb-voyager/cmd/exportSchema.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func exportSchema() error {
9595
log.Errorf("failed to get migration UUID: %v", err)
9696
return fmt.Errorf("failed to get migration UUID: %w", err)
9797
}
98-
98+
9999
utils.PrintAndLog("export of schema for source type as '%s'\n", source.DBType)
100100
// Check connection with source database.
101101
err = source.DB().Connect()
@@ -467,7 +467,7 @@ func applyShardingRecommendationIfMatching(sqlInfo *sqlInfo, shardedTables []str
467467
}
468468

469469
// true -> oracle, false -> PG
470-
parsedObjectName := utils.GetObjectName(relation.Schemaname, relation.Relname)
470+
parsedObjectName := utils.BuildObjectName(relation.Schemaname, relation.Relname)
471471

472472
match := false
473473
switch source.DBType {

‎yb-voyager/src/query/queryparser/ddl_processor.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ type TableColumn struct {
312312
}
313313

314314
func (tc *TableColumn) GetFullTypeName() string {
315-
return utils.GetObjectName(tc.TypeSchema, tc.TypeName)
315+
return utils.BuildObjectName(tc.TypeSchema, tc.TypeName)
316316
}
317317

318318
type TableConstraint struct {
@@ -346,7 +346,7 @@ func (c *TableConstraint) generateConstraintName(tableName string) string {
346346
}
347347

348348
func (t *Table) GetObjectName() string {
349-
return utils.GetObjectName(t.SchemaName, t.TableName)
349+
return utils.BuildObjectName(t.SchemaName, t.TableName)
350350
}
351351
func (t *Table) GetSchemaName() string { return t.SchemaName }
352352

@@ -381,7 +381,7 @@ func (t *Table) addConstraint(conType pg_query.ConstrType, columns []string, spe
381381
conName := lo.Ternary(specifiedConName == "", generatedConName, specifiedConName)
382382
tc.ConstraintName = conName
383383
if conType == FOREIGN_CONSTR_TYPE {
384-
tc.ReferencedTable = utils.GetObjectName(referencedTable.Schemaname, referencedTable.Relname)
384+
tc.ReferencedTable = utils.BuildObjectName(referencedTable.Schemaname, referencedTable.Relname)
385385
}
386386
t.Constraints = append(t.Constraints, tc)
387387
}
@@ -433,7 +433,7 @@ type ForeignTable struct {
433433
}
434434

435435
func (f *ForeignTable) GetObjectName() string {
436-
return utils.GetObjectName(f.SchemaName, f.TableName)
436+
return utils.BuildObjectName(f.SchemaName, f.TableName)
437437
}
438438
func (f *ForeignTable) GetSchemaName() string { return f.SchemaName }
439439

@@ -524,7 +524,7 @@ type IndexParam struct {
524524
}
525525

526526
func (indexParam *IndexParam) GetFullExprCastTypeName() string {
527-
return utils.GetObjectName(indexParam.ExprCastTypeSchema, indexParam.ExprCastTypeName)
527+
return utils.BuildObjectName(indexParam.ExprCastTypeSchema, indexParam.ExprCastTypeName)
528528
}
529529

530530
func (i *Index) GetObjectName() string {
@@ -533,7 +533,7 @@ func (i *Index) GetObjectName() string {
533533
func (i *Index) GetSchemaName() string { return i.SchemaName }
534534

535535
func (i *Index) GetTableName() string {
536-
return utils.GetObjectName(i.SchemaName, i.TableName)
536+
return utils.BuildObjectName(i.SchemaName, i.TableName)
537537
}
538538

539539
func (i *Index) GetObjectType() string { return INDEX_OBJECT_TYPE }
@@ -611,7 +611,7 @@ func (atProcessor *AlterTableProcessor) Process(parseTree *pg_query.ParseResult)
611611
In case of FKs the reference table is in PKTable field and columns are in FkAttrs
612612
*/
613613
alter.ConstraintColumns = parseColumnsFromKeys(constraint.FkAttrs)
614-
alter.ConstraintReferencedTable = utils.GetObjectName(constraint.Pktable.Schemaname, constraint.Pktable.Relname)
614+
alter.ConstraintReferencedTable = utils.BuildObjectName(constraint.Pktable.Schemaname, constraint.Pktable.Relname)
615615
}
616616

617617
case pg_query.AlterTableType_AT_DisableRule:
@@ -651,7 +651,7 @@ type AlterTable struct {
651651
}
652652

653653
func (a *AlterTable) GetObjectName() string {
654-
return utils.GetObjectName(a.SchemaName, a.TableName)
654+
return utils.BuildObjectName(a.SchemaName, a.TableName)
655655
}
656656
func (a *AlterTable) GetSchemaName() string { return a.SchemaName }
657657

@@ -716,7 +716,7 @@ type Policy struct {
716716
}
717717

718718
func (p *Policy) GetObjectName() string {
719-
qualifiedTable := utils.GetObjectName(p.SchemaName, p.TableName)
719+
qualifiedTable := utils.BuildObjectName(p.SchemaName, p.TableName)
720720
return fmt.Sprintf("%s ON %s", p.PolicyName, qualifiedTable)
721721
}
722722
func (p *Policy) GetSchemaName() string { return p.SchemaName }
@@ -792,7 +792,7 @@ func (t *Trigger) GetObjectName() string {
792792
}
793793

794794
func (t *Trigger) GetTableName() string {
795-
return utils.GetObjectName(t.SchemaName, t.TableName)
795+
return utils.BuildObjectName(t.SchemaName, t.TableName)
796796
}
797797

798798
func (t *Trigger) GetSchemaName() string { return t.SchemaName }
@@ -869,7 +869,7 @@ type CreateType struct {
869869
}
870870

871871
func (c *CreateType) GetObjectName() string {
872-
return utils.GetObjectName(c.SchemaName, c.TypeName)
872+
return utils.BuildObjectName(c.SchemaName, c.TypeName)
873873
}
874874
func (c *CreateType) GetSchemaName() string { return c.SchemaName }
875875

@@ -891,7 +891,7 @@ func (v *ViewProcessor) Process(parseTree *pg_query.ParseResult) (DDLObject, err
891891

892892
viewSchemaName := viewNode.ViewStmt.View.Schemaname
893893
viewName := viewNode.ViewStmt.View.Relname
894-
qualifiedViewName := utils.GetObjectName(viewSchemaName, viewName)
894+
qualifiedViewName := utils.BuildObjectName(viewSchemaName, viewName)
895895

896896
/*
897897
view_stmt:{view:{schemaname:"public" relname:"invoker_view" inh:true relpersistence:"p" location:12}
@@ -924,7 +924,7 @@ type View struct {
924924
}
925925

926926
func (v *View) GetObjectName() string {
927-
return utils.GetObjectName(v.SchemaName, v.ViewName)
927+
return utils.BuildObjectName(v.SchemaName, v.ViewName)
928928
}
929929
func (v *View) GetSchemaName() string { return v.SchemaName }
930930

@@ -956,7 +956,7 @@ type MView struct {
956956
}
957957

958958
func (mv *MView) GetObjectName() string {
959-
return utils.GetObjectName(mv.SchemaName, mv.ViewName)
959+
return utils.BuildObjectName(mv.SchemaName, mv.ViewName)
960960
}
961961
func (mv *MView) GetSchemaName() string { return mv.SchemaName }
962962

‎yb-voyager/src/query/queryparser/helpers_struct.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func GetObjectTypeAndObjectName(parseTree *pg_query.ParseResult) (string, string
6969
}
7070
funcNameList := stmt.GetFuncname()
7171
funcSchemaName, funcName := getFunctionObjectName(funcNameList)
72-
return objectType, utils.GetObjectName(funcSchemaName, funcName)
72+
return objectType, utils.BuildObjectName(funcSchemaName, funcName)
7373
case isViewStmt:
7474
viewName := viewNode.ViewStmt.View
7575
return "VIEW", getObjectNameFromRangeVar(viewName)
@@ -84,7 +84,7 @@ func GetObjectTypeAndObjectName(parseTree *pg_query.ParseResult) (string, string
8484
indexName := createIndexNode.IndexStmt.Idxname
8585
schemaName := createIndexNode.IndexStmt.Relation.GetSchemaname()
8686
tableName := createIndexNode.IndexStmt.Relation.GetRelname()
87-
fullyQualifiedName := utils.GetObjectName(schemaName, tableName)
87+
fullyQualifiedName := utils.BuildObjectName(schemaName, tableName)
8888
displayObjName := fmt.Sprintf("%s ON %s", indexName, fullyQualifiedName)
8989
return "INDEX", displayObjName
9090
default:
@@ -100,7 +100,7 @@ func isArrayType(typeName *pg_query.TypeName) bool {
100100
func getObjectNameFromRangeVar(obj *pg_query.RangeVar) string {
101101
schema := obj.Schemaname
102102
name := obj.Relname
103-
return utils.GetObjectName(schema, name)
103+
return utils.BuildObjectName(schema, name)
104104
}
105105

106106
func getFunctionObjectName(funcNameList []*pg_query.Node) (string, string) {

‎yb-voyager/src/query/queryparser/object_collector.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func (c *ObjectCollector) Collect(msg protoreflect.Message) {
7878
case PG_QUERY_RANGEVAR_NODE:
7979
schemaName := GetStringField(msg, "schemaname")
8080
relName := GetStringField(msg, "relname")
81-
objectName := utils.GetObjectName(schemaName, relName)
81+
objectName := utils.BuildObjectName(schemaName, relName)
8282
log.Debugf("[RangeVar] fetched schemaname=%s relname=%s objectname=%s field\n", schemaName, relName, objectName)
8383
// it will be either table or view, considering objectType=table for both
8484
if c.predicate(schemaName, relName, constants.TABLE) {
@@ -91,7 +91,7 @@ func (c *ObjectCollector) Collect(msg protoreflect.Message) {
9191
if relationMsg != nil {
9292
schemaName := GetStringField(relationMsg, "schemaname")
9393
relName := GetStringField(relationMsg, "relname")
94-
objectName := utils.GetObjectName(schemaName, relName)
94+
objectName := utils.BuildObjectName(schemaName, relName)
9595
log.Debugf("[IUD] fetched schemaname=%s relname=%s objectname=%s field\n", schemaName, relName, objectName)
9696
if c.predicate(schemaName, relName, "table") {
9797
c.addObject(objectName)
@@ -105,7 +105,7 @@ func (c *ObjectCollector) Collect(msg protoreflect.Message) {
105105
return
106106
}
107107

108-
objectName := utils.GetObjectName(schemaName, functionName)
108+
objectName := utils.BuildObjectName(schemaName, functionName)
109109
log.Debugf("[Funccall] fetched schemaname=%s objectname=%s field\n", schemaName, objectName)
110110
if c.predicate(schemaName, functionName, constants.FUNCTION) {
111111
c.addObject(objectName)

‎yb-voyager/src/utils/utils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,6 @@ func CheckTools(tools ...string) []string {
741741
return missingTools
742742
}
743743

744-
func GetObjectName(schemaName, objName string) string {
744+
func BuildObjectName(schemaName, objName string) string {
745745
return lo.Ternary(schemaName != "", schemaName+"."+objName, objName)
746746
}

0 commit comments

Comments
 (0)