Merge pull request #61767 from ajwerner/backport21.1-61713

release-21.1: sql: minor fixes for virtual computed columns
cockroachdb · Mar 11, 2021 · 5d84e07 · 5d84e07
2 parents 25b911e + ae9190d
commit 5d84e07
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/pkg/sql/alter_table.go b/pkg/sql/alter_table.go
@@ -1164,6 +1164,10 @@ func applyColumnMutation(
 			return pgerror.Newf(pgcode.InvalidColumnDefinition,
 				"column %q is not a computed column", col.Name)
 		}
+		if col.Virtual {
+			return pgerror.Newf(pgcode.InvalidColumnDefinition,
+				"column %q is not a stored computed column", col.Name)
+		}
 		col.ComputeExpr = nil
 	}
 	return nil

diff --git a/pkg/sql/logictest/testdata/logic_test/pg_catalog b/pkg/sql/logictest/testdata/logic_test/pg_catalog
@@ -496,6 +496,7 @@ CREATE TABLE constraint_db.t1 (
   i VARCHAR(20)[],
   j "char",
   k VARCHAR(10) COLLATE sv,
+  l INT AS (a * b) VIRTUAL,
   UNIQUE INDEX index_key(b, c)
 )
 
@@ -699,7 +700,7 @@ JOIN pg_catalog.pg_namespace n ON c.relnamespace = n.oid
 WHERE n.nspname = 'public'
 ----
 relname       relistemp  relkind  relnatts  relchecks  relhasoids  relhaspkey
-t1            false      r        12        0          false       true
+t1            false      r        13        0          false       true
 primary       false      i        1         0          false       false
 t1_a_key      false      i        1         0          false       false
 index_key     false      i        2         0          false       false
@@ -764,6 +765,7 @@ attrelid    relname       attname   atttypid  attstattarget  attlen  attnum  att
 55          t1            i         1015      0              -1      10      0         -1
 55          t1            j         18        0              1       11      0         -1
 55          t1            k         1043      0              -1      12      0         -1
+55          t1            l         20        0              8       13      0         -1
 450499963   primary       p         701       0              8       1       0         -1
 450499960   t1_a_key      a         20        0              8       2       0         -1
 450499961   index_key     b         20        0              8       3       0         -1
@@ -817,6 +819,7 @@ t1            h         16         NULL      NULL        NULL      false       f
 t1            i         24         NULL      NULL        NULL      false       false      ·            ·
 t1            j         -1         NULL      NULL        NULL      false       false      ·            ·
 t1            k         14         NULL      NULL        NULL      false       false      ·            ·
+t1            l         -1         NULL      NULL        NULL      false       false      ·            v
 primary       p         -1         NULL      NULL        NULL      true        false      ·            ·
 t1_a_key      a         -1         NULL      NULL        NULL      false       false      ·            ·
 index_key     b         -1         NULL      NULL        NULL      false       false      ·            ·
@@ -870,6 +873,7 @@ t1            h         false         true        0            NULL    NULL
 t1            i         false         true        0            NULL    NULL        NULL
 t1            j         false         true        0            NULL    NULL        NULL
 t1            k         false         true        0            NULL    NULL        NULL
+t1            l         false         true        0            NULL    NULL        NULL
 primary       p         false         true        0            NULL    NULL        NULL
 t1_a_key      a         false         true        0            NULL    NULL        NULL
 index_key     b         false         true        0            NULL    NULL        NULL

diff --git a/pkg/sql/logictest/testdata/logic_test/virtual_columns b/pkg/sql/logictest/testdata/logic_test/virtual_columns
@@ -40,6 +40,9 @@ CREATE TABLE t (
   v INT AS (a+b) VIRTUAL
 )
 
+statement error pgcode 42611 column "v" is not a stored computed column
+ALTER TABLE t ALTER COLUMN v DROP STORED
+
 statement ok
 INSERT INTO t VALUES (1, 1)
 

diff --git a/pkg/sql/pg_catalog.go b/pkg/sql/pg_catalog.go
@@ -639,10 +639,12 @@ https://www.postgresql.org/docs/12/catalog-pg-attribute.html`,
 		addColumn := func(column *descpb.ColumnDescriptor, attRelID tree.Datum, attNum uint32) error {
 			colTyp := column.Type
 			// Sets the attgenerated column to 's' if the column is generated/
-			// computed, zero byte otherwise.
+			// computed stored, "v" if virtual, zero byte otherwise.
 			var isColumnComputed string
-			if column.IsComputed() {
+			if column.IsComputed() && !column.Virtual {
 				isColumnComputed = "s"
+			} else if column.IsComputed() {
+				isColumnComputed = "v"
 			} else {
 				isColumnComputed = ""
 			}