Merge cockroachdb#112393

112393: sql: remove redundant conditional paths r=stevendanna a=Shikhar03Stark Fixes: cockroachdb#111781 Remove redundant conditional path in sql package Co-authored-by: Harshit Vishwakarma <[email protected]>
stevendanna · Oct 19, 2023 · eb148c0 · eb148c0
2 parents fbee076 + 64441a1
commit eb148c0
Showing 1 changed file with 6 additions and 18 deletions.
diff --git a/pkg/sql/sem/tree/backup.go b/pkg/sql/sem/tree/backup.go
@@ -201,15 +201,9 @@ func (node *Restore) Format(ctx *FmtCtx) {
 		ctx.FormatNode(&node.AsOf)
 	}
 	if !node.Options.IsDefault() {
-		if ctx.HasFlags(FmtHideConstants) {
-			ctx.WriteString(" WITH OPTIONS (")
-			ctx.FormatNode(&node.Options)
-			ctx.WriteString(")")
-		} else {
-			ctx.WriteString(" WITH OPTIONS (")
-			ctx.FormatNode(&node.Options)
-			ctx.WriteString(")")
-		}
+		ctx.WriteString(" WITH OPTIONS (")
+		ctx.FormatNode(&node.Options)
+		ctx.WriteString(")")
 	}
 }
 
@@ -520,15 +514,9 @@ func (o *RestoreOptions) Format(ctx *FmtCtx) {
 	}
 
 	if o.ExecutionLocality != nil {
-		if ctx.HasFlags(FmtHideConstants) {
-			maybeAddSep()
-			ctx.WriteString("execution locality = ")
-			ctx.FormatNode(o.ExecutionLocality)
-		} else {
-			maybeAddSep()
-			ctx.WriteString("execution locality = ")
-			ctx.FormatNode(o.ExecutionLocality)
-		}
+		maybeAddSep()
+		ctx.WriteString("execution locality = ")
+		ctx.FormatNode(o.ExecutionLocality)
 	}
 
 	if o.ExperimentalOnline {