Merge #28950

28950: sql: desugar TEXT to STRING r=knz a=knz First commits from #28949 and priors. Forked off from #28690. The distinction between "TEXT" and "STRING" inside CockroachDB is inconsequential. Remove it. The data type is already properly reported in pg_catalog and information_schema as "text". Release note: None Co-authored-by: Raphael 'kena' Poss <knz@cockroachlabs.com>
cockroachdb · Aug 23, 2018 · de89a6c · de89a6c
2 parents 80812f2 + d1d5995
commit de89a6c
Show file tree

Hide file tree

Showing 112 changed files with 895 additions and 500 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,2 @@
 *.pb.* -diff
+*.golden -diff
diff --git a/pkg/ccl/importccl/read_import_mysql.go b/pkg/ccl/importccl/read_import_mysql.go
@@ -501,7 +501,7 @@ func mysqlColToCockroach(
 	case mysqltypes.VarChar:
 		def.Type = strOpt(coltypes.VarChar, length)
 	case mysqltypes.Text:
-		def.Type = strOpt(coltypes.Text, length)
+		def.Type = strOpt(coltypes.String, length)
 
 	case mysqltypes.Blob:
 		def.Type = coltypes.Bytes

diff --git a/pkg/ccl/importccl/read_import_pgdump_test.go b/pkg/ccl/importccl/read_import_pgdump_test.go
@@ -123,7 +123,7 @@ COPY public.t (s) FROM stdin;
 		}
 		fmt.Fprintf(&sb, "%s;\n", s)
 	}
-	const expect = `CREATE TABLE public.second (i INTEGER NOT NULL, s TEXT);
+	const expect = `CREATE TABLE public.second (i INTEGER NOT NULL, s STRING);
 COPY public.second (i, s) FROM STDIN;
 "0"	"0";
 "1"	"1";
@@ -134,7 +134,7 @@ COPY public.second (i, s) FROM STDIN;
 "6"	"6";
 COPY done;
 ALTER TABLE public.second ADD CONSTRAINT second_pkey PRIMARY KEY (i);
-CREATE TABLE public.t (s TEXT);
+CREATE TABLE public.t (s STRING);
 COPY public.t (s) FROM STDIN;
 "";
 "\\.";

diff --git a/pkg/sql/coltypes/aliases.go b/pkg/sql/coltypes/aliases.go
@@ -80,8 +80,6 @@ var (
 	VarChar = &TString{Name: "VARCHAR"}
 	// String is an immutable T instance.
 	String = &TString{Name: "STRING"}
-	// Text is an immutable T instance.
-	Text = &TString{Name: "TEXT"}
 	// QChar is an immutable T instance.
 	QChar = &TString{Name: `"char"`}
 

diff --git a/pkg/sql/opt/memo/testdata/logprops/project b/pkg/sql/opt/memo/testdata/logprops/project
@@ -348,7 +348,7 @@ project
  │    ├── prune: (1-4)
  │    └── interesting orderings: (+1) (-3,+4,+1)
  └── projections [outer=(2)]
-      └── cast: TEXT [type=string, outer=(2)]
+      └── cast: STRING [type=string, outer=(2)]
            └── variable: xysd.y [type=int, outer=(2)]
 
 # We don't have the FD: d --> d::TEXT because d is a composite type.
@@ -368,5 +368,5 @@ project
  │    ├── prune: (1-4)
  │    └── interesting orderings: (+1) (-3,+4,+1)
  └── projections [outer=(4)]
-      └── cast: TEXT [type=string, outer=(4)]
+      └── cast: STRING [type=string, outer=(4)]
            └── variable: xysd.d [type=decimal, outer=(4)]
diff --git a/pkg/sql/opt/norm/testdata/rules/inline b/pkg/sql/opt/norm/testdata/rules/inline
@@ -207,25 +207,24 @@ project
                 │    ├── when [type=int, outer=(1,2), side-effects]
                 │    │    ├── c1 IS NOT NULL [type=bool, outer=(2)]
                 │    │    └── function: extract [type=int, outer=(1), side-effects]
-                │    │         ├── cast: TEXT [type=string, outer=(1)]
-                │    │         │    └── case [type=string, outer=(1)]
-                │    │         │         ├── true [type=bool]
-                │    │         │         ├── when [type=string, outer=(1)]
-                │    │         │         │    ├── exists [type=bool, outer=(1)]
-                │    │         │         │    │    └── limit
-                │    │         │         │    │         ├── columns: config_yaml:5(bytes!null)
-                │    │         │         │    │         ├── outer: (1)
-                │    │         │         │    │         ├── cardinality: [0 - 52]
-                │    │         │         │    │         ├── select
-                │    │         │         │    │         │    ├── columns: config_yaml:5(bytes!null)
-                │    │         │         │    │         │    ├── outer: (1)
-                │    │         │         │    │         │    ├── scan zones
-                │    │         │         │    │         │    │    └── columns: config_yaml:5(bytes!null)
-                │    │         │         │    │         │    └── filters [type=bool, outer=(1), constraints=(/1: (/NULL - ]; tight)]
-                │    │         │         │    │         │         └── c0 IS NOT NULL [type=bool, outer=(1), constraints=(/1: (/NULL - ]; tight)]
-                │    │         │         │    │         └── const: 52 [type=int]
-                │    │         │         │    └── function: version [type=string]
-                │    │         │         └── function: version [type=string]
+                │    │         ├── case [type=string, outer=(1)]
+                │    │         │    ├── true [type=bool]
+                │    │         │    ├── when [type=string, outer=(1)]
+                │    │         │    │    ├── exists [type=bool, outer=(1)]
+                │    │         │    │    │    └── limit
+                │    │         │    │    │         ├── columns: config_yaml:5(bytes!null)
+                │    │         │    │    │         ├── outer: (1)
+                │    │         │    │    │         ├── cardinality: [0 - 52]
+                │    │         │    │    │         ├── select
+                │    │         │    │    │         │    ├── columns: config_yaml:5(bytes!null)
+                │    │         │    │    │         │    ├── outer: (1)
+                │    │         │    │    │         │    ├── scan zones
+                │    │         │    │    │         │    │    └── columns: config_yaml:5(bytes!null)
+                │    │         │    │    │         │    └── filters [type=bool, outer=(1), constraints=(/1: (/NULL - ]; tight)]
+                │    │         │    │    │         │         └── c0 IS NOT NULL [type=bool, outer=(1), constraints=(/1: (/NULL - ]; tight)]
+                │    │         │    │    │         └── const: 52 [type=int]
+                │    │         │    │    └── function: version [type=string]
+                │    │         │    └── function: version [type=string]
                 │    │         └── function: current_date [type=date, side-effects]
                 │    └── const: 1 [type=int]
                 └── const: 1 [type=int]

diff --git a/pkg/sql/opt/norm/testdata/rules/join b/pkg/sql/opt/norm/testdata/rules/join
@@ -884,7 +884,7 @@ inner-join
  │    │    ├── fd: ()-->(1)
  │    │    └── (1.0,) [type=tuple{decimal}]
  │    └── filters [type=bool, outer=(1)]
- │         └── column1::TEXT = '1.0' [type=bool, outer=(1)]
+ │         └── column1::STRING = '1.0' [type=bool, outer=(1)]
  └── filters [type=bool, outer=(1,2), constraints=(/1: (/NULL - ]; /2: (/NULL - ]), fd=(1)==(2), (2)==(1)]
       └── column1 = column1 [type=bool, outer=(1,2), constraints=(/1: (/NULL - ]; /2: (/NULL - ])]
 

diff --git a/pkg/sql/opt/norm/testdata/rules/scalar b/pkg/sql/opt/norm/testdata/rules/scalar
@@ -183,7 +183,7 @@ project
       ├── a.s::JSON [type=jsonb, outer=(4)]
       ├── a.s::VARCHAR(2) [type=string, outer=(4)]
       ├── a.i::SMALLINT::INT8 [type=int, outer=(2)]
-      ├── a.s::TEXT::CHAR::VARCHAR [type=string, outer=(4)]
+      ├── a.s::CHAR::VARCHAR [type=string, outer=(4)]
       ├── ARRAY[1,2]::OIDVECTOR [type=oid[]]
       └── ARRAY[1,2]::INT2VECTOR [type=int[]]
 

diff --git a/pkg/sql/opt/optbuilder/testdata/aggregate b/pkg/sql/opt/optbuilder/testdata/aggregate
@@ -232,7 +232,7 @@ scalar-group-by
  │    ├── values
  │    │    └── tuple [type=tuple]
  │    └── projections
- │         └── cast: TEXT [type=string]
+ │         └── cast: STRING [type=string]
  │              └── null [type=unknown]
  └── aggregations
       └── array-agg [type=string[]]

diff --git a/pkg/sql/parser/parse_test.go b/pkg/sql/parser/parse_test.go
@@ -122,31 +122,31 @@ func TestParse(t *testing.T) {
 		{`CREATE TABLE a (a INT CONSTRAINT one DEFAULT 1 CONSTRAINT positive CHECK (a > 0))`},
 		{`CREATE TABLE a (a INT CONSTRAINT one CHECK (a > 0) CONSTRAINT two CHECK (a < 10))`},
 		// "0" lost quotes previously.
-		{`CREATE TABLE a (b INT, c TEXT, PRIMARY KEY (b, c, "0"))`},
-		{`CREATE TABLE a (b INT, c TEXT, FOREIGN KEY (b) REFERENCES other)`},
-		{`CREATE TABLE a (b INT, c TEXT, FOREIGN KEY (b) REFERENCES other ON UPDATE RESTRICT)`},
-		{`CREATE TABLE a (b INT, c TEXT, FOREIGN KEY (b) REFERENCES other ON DELETE RESTRICT)`},
-		{`CREATE TABLE a (b INT, c TEXT, FOREIGN KEY (b) REFERENCES other ON DELETE RESTRICT ON UPDATE RESTRICT)`},
-		{`CREATE TABLE a (b INT, c TEXT, FOREIGN KEY (b) REFERENCES other ON UPDATE CASCADE)`},
-		{`CREATE TABLE a (b INT, c TEXT, FOREIGN KEY (b) REFERENCES other ON DELETE CASCADE)`},
-		{`CREATE TABLE a (b INT, c TEXT, FOREIGN KEY (b) REFERENCES other ON DELETE CASCADE ON UPDATE CASCADE)`},
-		{`CREATE TABLE a (b INT, c TEXT, FOREIGN KEY (b) REFERENCES other ON UPDATE SET NULL)`},
-		{`CREATE TABLE a (b INT, c TEXT, FOREIGN KEY (b) REFERENCES other ON DELETE SET NULL)`},
-		{`CREATE TABLE a (b INT, c TEXT, FOREIGN KEY (b) REFERENCES other ON DELETE SET NULL ON UPDATE SET NULL)`},
-		{`CREATE TABLE a (b INT, c TEXT, FOREIGN KEY (b) REFERENCES other ON UPDATE SET DEFAULT)`},
-		{`CREATE TABLE a (b INT, c TEXT, FOREIGN KEY (b) REFERENCES other ON DELETE SET DEFAULT)`},
-		{`CREATE TABLE a (b INT, c TEXT, FOREIGN KEY (b) REFERENCES other ON DELETE SET DEFAULT ON UPDATE SET DEFAULT)`},
-		{`CREATE TABLE a (b INT, c TEXT, FOREIGN KEY (b) REFERENCES other ON DELETE RESTRICT ON UPDATE SET DEFAULT)`},
-		{`CREATE TABLE a (b INT, c TEXT, FOREIGN KEY (b) REFERENCES other ON DELETE SET DEFAULT ON UPDATE CASCADE)`},
-		{`CREATE TABLE a (b INT, c TEXT, FOREIGN KEY (b) REFERENCES other ON DELETE CASCADE ON UPDATE SET NULL)`},
-		{`CREATE TABLE a (b INT, c TEXT, FOREIGN KEY (b) REFERENCES other ON DELETE SET NULL ON UPDATE RESTRICT)`},
-		{`CREATE TABLE a (b INT, c TEXT, FOREIGN KEY (b, c) REFERENCES other)`},
-		{`CREATE TABLE a (b INT, c TEXT, FOREIGN KEY (b, c) REFERENCES other (x, y))`},
-		{`CREATE TABLE a (b INT, c TEXT, CONSTRAINT s FOREIGN KEY (b, c) REFERENCES other (x, y))`},
-		{`CREATE TABLE a (b INT, c TEXT, INDEX (b, c))`},
-		{`CREATE TABLE a (b INT, c TEXT, INDEX d (b, c))`},
-		{`CREATE TABLE a (b INT, c TEXT, CONSTRAINT d UNIQUE (b, c))`},
-		{`CREATE TABLE a (b INT, c TEXT, CONSTRAINT d UNIQUE (b, c) INTERLEAVE IN PARENT d (e, f))`},
+		{`CREATE TABLE a (b INT, c STRING, PRIMARY KEY (b, c, "0"))`},
+		{`CREATE TABLE a (b INT, c STRING, FOREIGN KEY (b) REFERENCES other)`},
+		{`CREATE TABLE a (b INT, c STRING, FOREIGN KEY (b) REFERENCES other ON UPDATE RESTRICT)`},
+		{`CREATE TABLE a (b INT, c STRING, FOREIGN KEY (b) REFERENCES other ON DELETE RESTRICT)`},
+		{`CREATE TABLE a (b INT, c STRING, FOREIGN KEY (b) REFERENCES other ON DELETE RESTRICT ON UPDATE RESTRICT)`},
+		{`CREATE TABLE a (b INT, c STRING, FOREIGN KEY (b) REFERENCES other ON UPDATE CASCADE)`},
+		{`CREATE TABLE a (b INT, c STRING, FOREIGN KEY (b) REFERENCES other ON DELETE CASCADE)`},
+		{`CREATE TABLE a (b INT, c STRING, FOREIGN KEY (b) REFERENCES other ON DELETE CASCADE ON UPDATE CASCADE)`},
+		{`CREATE TABLE a (b INT, c STRING, FOREIGN KEY (b) REFERENCES other ON UPDATE SET NULL)`},
+		{`CREATE TABLE a (b INT, c STRING, FOREIGN KEY (b) REFERENCES other ON DELETE SET NULL)`},
+		{`CREATE TABLE a (b INT, c STRING, FOREIGN KEY (b) REFERENCES other ON DELETE SET NULL ON UPDATE SET NULL)`},
+		{`CREATE TABLE a (b INT, c STRING, FOREIGN KEY (b) REFERENCES other ON UPDATE SET DEFAULT)`},
+		{`CREATE TABLE a (b INT, c STRING, FOREIGN KEY (b) REFERENCES other ON DELETE SET DEFAULT)`},
+		{`CREATE TABLE a (b INT, c STRING, FOREIGN KEY (b) REFERENCES other ON DELETE SET DEFAULT ON UPDATE SET DEFAULT)`},
+		{`CREATE TABLE a (b INT, c STRING, FOREIGN KEY (b) REFERENCES other ON DELETE RESTRICT ON UPDATE SET DEFAULT)`},
+		{`CREATE TABLE a (b INT, c STRING, FOREIGN KEY (b) REFERENCES other ON DELETE SET DEFAULT ON UPDATE CASCADE)`},
+		{`CREATE TABLE a (b INT, c STRING, FOREIGN KEY (b) REFERENCES other ON DELETE CASCADE ON UPDATE SET NULL)`},
+		{`CREATE TABLE a (b INT, c STRING, FOREIGN KEY (b) REFERENCES other ON DELETE SET NULL ON UPDATE RESTRICT)`},
+		{`CREATE TABLE a (b INT, c STRING, FOREIGN KEY (b, c) REFERENCES other)`},
+		{`CREATE TABLE a (b INT, c STRING, FOREIGN KEY (b, c) REFERENCES other (x, y))`},
+		{`CREATE TABLE a (b INT, c STRING, CONSTRAINT s FOREIGN KEY (b, c) REFERENCES other (x, y))`},
+		{`CREATE TABLE a (b INT, c STRING, INDEX (b, c))`},
+		{`CREATE TABLE a (b INT, c STRING, INDEX d (b, c))`},
+		{`CREATE TABLE a (b INT, c STRING, CONSTRAINT d UNIQUE (b, c))`},
+		{`CREATE TABLE a (b INT, c STRING, CONSTRAINT d UNIQUE (b, c) INTERLEAVE IN PARENT d (e, f))`},
 		{`CREATE TABLE a (b INT, UNIQUE (b))`},
 		{`CREATE TABLE a (b INT, UNIQUE (b) STORING (c))`},
 		{`CREATE TABLE a (b INT, INDEX (b))`},
@@ -173,7 +173,7 @@ func TestParse(t *testing.T) {
 		{`CREATE TABLE a (b INT, c INT REFERENCES foo ON UPDATE SET DEFAULT)`},
 		{`CREATE TABLE a (b INT, c INT REFERENCES foo (bar))`},
 		{`CREATE TABLE a (b INT, INDEX (b) STORING (c))`},
-		{`CREATE TABLE a (b INT, c TEXT, INDEX (b ASC, c DESC) STORING (c))`},
+		{`CREATE TABLE a (b INT, c STRING, INDEX (b ASC, c DESC) STORING (c))`},
 		{`CREATE TABLE a (b INT, INDEX (b) INTERLEAVE IN PARENT c (d, e))`},
 		{`CREATE TABLE a (b INT, FAMILY (b))`},
 		{`CREATE TABLE a (b INT, c STRING, FAMILY foo (b), FAMILY (c))`},
@@ -640,8 +640,8 @@ func TestParse(t *testing.T) {
 		{`SELECT "full" FROM t`}, // must quote column name keyword
 
 		{`SELECT "FROM" FROM t`},
-		{`SELECT CAST(1 AS TEXT)`},
-		{`SELECT ANNOTATE_TYPE(1, TEXT)`},
+		{`SELECT CAST(1 AS STRING)`},
+		{`SELECT ANNOTATE_TYPE(1, STRING)`},
 		{`SELECT a FROM t AS bar`},
 		{`SELECT a FROM t AS bar (bar1)`},
 		{`SELECT a FROM t AS bar (bar1, bar2, bar3)`},
@@ -1123,6 +1123,8 @@ func TestParse2(t *testing.T) {
 			`CREATE TABLE a (b DECIMAL, c DECIMAL(10), d DECIMAL)`},
 		{`CREATE TABLE a (b BOOLEAN)`,
 			`CREATE TABLE a (b BOOL)`},
+		{`CREATE TABLE a (b TEXT)`,
+			`CREATE TABLE a (b STRING)`},
 		{`CREATE TABLE a (b BYTES, c BYTEA, d BLOB)`,
 			`CREATE TABLE a (b BYTES, c BYTES, d BYTES)`},
 

diff --git a/pkg/sql/parser/sql.y b/pkg/sql/parser/sql.y
@@ -5921,7 +5921,7 @@ const_typename:
   }
 | TEXT
   {
-    $$.val = coltypes.Text
+    $$.val = coltypes.String
   }
 | NAME
   {

diff --git a/pkg/sql/sem/tree/col_types_test.go b/pkg/sql/sem/tree/col_types_test.go
@@ -54,7 +54,6 @@ func TestParseColumnType(t *testing.T) {
 		{"CHAR", &coltypes.TString{Name: "CHAR"}},
 		{"VARCHAR", &coltypes.TString{Name: "VARCHAR"}},
 		{"CHAR(11)", &coltypes.TString{Name: "CHAR", N: 11}},
-		{"TEXT", &coltypes.TString{Name: "TEXT"}},
 		{"BYTES", &coltypes.TBytes{}},
 		{"STRING COLLATE da", &coltypes.TCollatedString{Name: "STRING", Locale: "da"}},
 		{"CHAR COLLATE de", &coltypes.TCollatedString{Name: "CHAR", Locale: "de"}},

diff --git a/pkg/sql/sem/tree/pretty_test.go b/pkg/sql/sem/tree/pretty_test.go
@@ -15,6 +15,7 @@
 package tree_test
 
 import (
+	"bytes"
 	"context"
 	"flag"
 	"fmt"
@@ -108,7 +109,12 @@ func runTestPrettyData(t *testing.T, prefix string, cfg tree.PrettyCfg, matches
 					fmt.Fprintf(&sb, "%d:\n%s\n%s\n\n", i+1, strings.Repeat("-", i+1), s)
 				}
 			}
-			got := strings.TrimSpace(sb.String()) + "\n"
+			var gotB bytes.Buffer
+			gotB.WriteString("// Code generated by TestPretty. DO NOT EDIT.\n")
+			gotB.WriteString("// GENERATED FILE DO NOT EDIT\n")
+			gotB.WriteString(sb.String())
+			gotB.WriteByte('\n')
+			got := gotB.String()
 
 			ext := filepath.Ext(m)
 			outfile := m[:len(m)-len(ext)] + "." + prefix + ".golden"

diff --git a/pkg/sql/sem/tree/testdata/pretty/1.align-deindent.golden b/pkg/sql/sem/tree/testdata/pretty/1.align-deindent.golden
@@ -1,3 +1,5 @@
+// Code generated by TestPretty. DO NOT EDIT.
+// GENERATED FILE DO NOT EDIT
 1:
 -
 SELECT
@@ -6,3 +8,5 @@ SELECT
 8:
 --------
 SELECT 1
+
+
diff --git a/pkg/sql/sem/tree/testdata/pretty/1.align-only.golden b/pkg/sql/sem/tree/testdata/pretty/1.align-only.golden
@@ -1,3 +1,5 @@
+// Code generated by TestPretty. DO NOT EDIT.
+// GENERATED FILE DO NOT EDIT
 1:
 -
 SELECT
@@ -6,3 +8,5 @@ SELECT
 8:
 --------
 SELECT 1
+
+
diff --git a/pkg/sql/sem/tree/testdata/pretty/1.ref.golden b/pkg/sql/sem/tree/testdata/pretty/1.ref.golden
@@ -1,3 +1,5 @@
+// Code generated by TestPretty. DO NOT EDIT.
+// GENERATED FILE DO NOT EDIT
 1:
 -
 SELECT
@@ -6,3 +8,5 @@ SELECT
 8:
 --------
 SELECT 1
+
+
diff --git a/pkg/sql/sem/tree/testdata/pretty/10.align-deindent.golden b/pkg/sql/sem/tree/testdata/pretty/10.align-deindent.golden
@@ -1,3 +1,5 @@
+// Code generated by TestPretty. DO NOT EDIT.
+// GENERATED FILE DO NOT EDIT
 1:
 -
 SELECT
@@ -14,3 +16,5 @@ SELECT 1,
 14:
 --------------
 SELECT 1, 2, 3
+
+
diff --git a/pkg/sql/sem/tree/testdata/pretty/10.align-only.golden b/pkg/sql/sem/tree/testdata/pretty/10.align-only.golden
@@ -1,3 +1,5 @@
+// Code generated by TestPretty. DO NOT EDIT.
+// GENERATED FILE DO NOT EDIT
 1:
 -
 SELECT
@@ -14,3 +16,5 @@ SELECT 1,
 14:
 --------------
 SELECT 1, 2, 3
+
+
diff --git a/pkg/sql/sem/tree/testdata/pretty/10.ref.golden b/pkg/sql/sem/tree/testdata/pretty/10.ref.golden
@@ -1,3 +1,5 @@
+// Code generated by TestPretty. DO NOT EDIT.
+// GENERATED FILE DO NOT EDIT
 1:
 -
 SELECT
@@ -13,3 +15,5 @@ SELECT
 14:
 --------------
 SELECT 1, 2, 3
+
+
diff --git a/pkg/sql/sem/tree/testdata/pretty/11.align-deindent.golden b/pkg/sql/sem/tree/testdata/pretty/11.align-deindent.golden
@@ -1,3 +1,5 @@
+// Code generated by TestPretty. DO NOT EDIT.
+// GENERATED FILE DO NOT EDIT
 1:
 -
 SELECT
@@ -16,3 +18,5 @@ SELECT fn(
 15:
 ---------------
 SELECT fn(1, 2)
+
+
diff --git a/pkg/sql/sem/tree/testdata/pretty/11.align-only.golden b/pkg/sql/sem/tree/testdata/pretty/11.align-only.golden
@@ -1,3 +1,5 @@
+// Code generated by TestPretty. DO NOT EDIT.
+// GENERATED FILE DO NOT EDIT
 1:
 -
 SELECT
@@ -16,3 +18,5 @@ SELECT fn(
 15:
 ---------------
 SELECT fn(1, 2)
+
+
diff --git a/pkg/sql/sem/tree/testdata/pretty/11.ref.golden b/pkg/sql/sem/tree/testdata/pretty/11.ref.golden
@@ -1,3 +1,5 @@
+// Code generated by TestPretty. DO NOT EDIT.
+// GENERATED FILE DO NOT EDIT
 1:
 -
 SELECT
@@ -14,3 +16,5 @@ SELECT
 15:
 ---------------
 SELECT fn(1, 2)
+
+
diff --git a/pkg/sql/sem/tree/testdata/pretty/12.align-deindent.golden b/pkg/sql/sem/tree/testdata/pretty/12.align-deindent.golden
@@ -1,3 +1,5 @@
+// Code generated by TestPretty. DO NOT EDIT.
+// GENERATED FILE DO NOT EDIT
 1:
 -
 INSERT
@@ -56,3 +58,5 @@ VALUES (1, 2)
 34:
 ----------------------------------
 INSERT INTO t (a, b) VALUES (1, 2)
+
+
diff --git a/pkg/sql/sem/tree/testdata/pretty/12.align-only.golden b/pkg/sql/sem/tree/testdata/pretty/12.align-only.golden
@@ -1,3 +1,5 @@
+// Code generated by TestPretty. DO NOT EDIT.
+// GENERATED FILE DO NOT EDIT
 1:
 -
 INSERT
@@ -56,3 +58,5 @@ VALUES (1, 2)
 34:
 ----------------------------------
 INSERT INTO t (a, b) VALUES (1, 2)
+
+
diff --git a/pkg/sql/sem/tree/testdata/pretty/12.ref.golden b/pkg/sql/sem/tree/testdata/pretty/12.ref.golden
@@ -1,3 +1,5 @@
+// Code generated by TestPretty. DO NOT EDIT.
+// GENERATED FILE DO NOT EDIT
 1:
 -
 INSERT
@@ -36,3 +38,5 @@ VALUES
 34:
 ----------------------------------
 INSERT INTO t (a, b) VALUES (1, 2)
+
+