Fix Upsert Statements With External Ids

Fix formatting of upsert statements containing external ids.
octoberswimmer · Mar 7, 2024 · 4df11fd · 4df11fd
1 parent 9546f21
commit 4df11fd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/formatter/format_test.go b/formatter/format_test.go
@@ -228,6 +228,9 @@ Name = 'My Opportunity',
 			{
 				`Error__c[] errorLogs = new Error__c[0];`,
 				`Error__c[] errorLogs = new Error__c[0];`},
+			{
+				`upsert myAccount External_Id__c;`,
+				`upsert myAccount External_Id__c;`},
 		}
 	for _, tt := range tests {
 		input := antlr.NewInputStream(tt.input)

diff --git a/formatter/visitors.go b/formatter/visitors.go
@@ -386,7 +386,11 @@ func (v *FormatVisitor) VisitUpdateStatement(ctx *parser.UpdateStatementContext)
 }
 
 func (v *FormatVisitor) VisitUpsertStatement(ctx *parser.UpsertStatementContext) interface{} {
-	return fmt.Sprintf("upsert %s;", v.visitRule(ctx.Expression()))
+	if q := ctx.QualifiedName(); q != nil {
+		return fmt.Sprintf("upsert %s %s;", v.visitRule(ctx.Expression()), v.visitRule(q))
+	} else {
+		return fmt.Sprintf("upsert %s;", v.visitRule(ctx.Expression()))
+	}
 }
 
 func (v *FormatVisitor) VisitMergeStatement(ctx *parser.MergeStatementContext) interface{} {