tree: fix formatting of ON COMMIT PRESERVE ROWS

Formatting for this clause was added in
d80409c, but that had a mistake since
the locality clause should always be formatted after the ON COMMIT
clause.

Release note: None

Author: rafiss

pkg/sql/parser/testdata/create_table

@@ -2687,3 +2687,19 @@ CREATE TABLE t (l LTREE) -- normalized!
 CREATE TABLE t (l LTREE) -- fully parenthesized
 CREATE TABLE t (l LTREE) -- literals removed
 CREATE TABLE _ (_ LTREE) -- identifiers removed
+
+parse
+CREATE TABLE tbl (a INT PRIMARY KEY) ON COMMIT PRESERVE ROWS LOCALITY REGIONAL BY TABLE IN PRIMARY REGION
+----
+CREATE TABLE tbl (a INT8 PRIMARY KEY) ON COMMIT PRESERVE ROWS LOCALITY REGIONAL BY TABLE IN PRIMARY REGION -- normalized!
+CREATE TABLE tbl (a INT8 PRIMARY KEY) ON COMMIT PRESERVE ROWS LOCALITY REGIONAL BY TABLE IN PRIMARY REGION -- fully parenthesized
+CREATE TABLE tbl (a INT8 PRIMARY KEY) ON COMMIT PRESERVE ROWS LOCALITY REGIONAL BY TABLE IN PRIMARY REGION -- literals removed
+CREATE TABLE _ (_ INT8 PRIMARY KEY) ON COMMIT PRESERVE ROWS LOCALITY REGIONAL BY TABLE IN PRIMARY REGION -- identifiers removed
+
+error
+CREATE TABLE tbl AS (SELECT * FROM t) ON COMMIT PRESERVE ROWS LOCALITY REGIONAL BY TABLE IN PRIMARY REGION
+----
+at or near "locality": syntax error
+DETAIL: source SQL:
+CREATE TABLE tbl AS (SELECT * FROM t) ON COMMIT PRESERVE ROWS LOCALITY REGIONAL BY TABLE IN PRIMARY REGION
+                                                              ^

pkg/sql/sem/tree/create.go

@@ -1581,10 +1581,6 @@ func (node *CreateTable) FormatBody(ctx *FmtCtx) {
 			ctx.FormatNode(&node.StorageParams)
 			ctx.WriteByte(')')
 		}
-		if node.Locality != nil {
-			ctx.WriteString(" ")
-			ctx.FormatNode(node.Locality)
-		}
 	}
 	switch node.OnCommit {
 	case CreateTableOnCommitUnset:
@@ -1593,6 +1589,10 @@ func (node *CreateTable) FormatBody(ctx *FmtCtx) {
 	default:
 		panic(errors.AssertionFailedf("unexpected CreateTableOnCommitSetting: %d", node.OnCommit))
 	}
+	if node.Locality != nil {
+		ctx.WriteString(" ")
+		ctx.FormatNode(node.Locality)
+	}
 }
 
 // HoistConstraints finds column check and foreign key constraints defined

pkg/sql/sem/tree/pretty.go

@@ -1302,16 +1302,16 @@ func (node *CreateTable) doc(p *PrettyCfg) pretty.Doc {
 			),
 		)
 	}
-	if node.Locality != nil {
-		clauses = append(clauses, p.Doc(node.Locality))
-	}
 	switch node.OnCommit {
 	case CreateTableOnCommitUnset:
 	case CreateTableOnCommitPreserveRows:
 		clauses = append(clauses, pretty.Keyword("ON COMMIT PRESERVE ROWS"))
 	default:
 		panic(errors.AssertionFailedf("unexpected CreateTableOnCommitSetting: %d", node.OnCommit))
 	}
+	if node.Locality != nil {
+		clauses = append(clauses, p.Doc(node.Locality))
+	}
 	if len(clauses) == 0 {
 		return title
 	}