sql: fix CREATE TABLE LIKE with implicit pk

pkg/sql/create_table.go

@@ -2512,18 +2512,11 @@ func replaceLikeTableOpts(n *tree.CreateTable, params runParams) (tree.TableDefs
 		// This is required to ensure the newly created table still works as expected
 		// as these columns are required for certain features to work when used
 		// as an index.
+		// TODO(#82672): We shouldn't need this. This is only still required for
+		// the REGIONAL BY ROW column.
 		shouldCopyColumnDefaultSet := make(map[string]struct{})
 		if opts.Has(tree.LikeTableOptIndexes) {
 			for _, idx := range td.NonDropIndexes() {
-				// Copy the rowid default if it was created implicitly by not specifying
-				// PRIMARY KEY.
-				if idx.Primary() && td.IsPrimaryIndexDefaultRowID() {
-					for i := 0; i < idx.NumKeyColumns(); i++ {
-						shouldCopyColumnDefaultSet[idx.GetKeyColumnName(i)] = struct{}{}
-					}
-				}
-				// Copy any implicitly created columns (e.g. hash-sharded indexes,
-				// REGIONAL BY ROW).
 				for i := 0; i < idx.ExplicitColumnStartIdx(); i++ {
 					for i := 0; i < idx.NumKeyColumns(); i++ {
 						shouldCopyColumnDefaultSet[idx.GetKeyColumnName(i)] = struct{}{}
@@ -2533,12 +2526,15 @@ func replaceLikeTableOpts(n *tree.CreateTable, params runParams) (tree.TableDefs
 		}
 
 		defs := make(tree.TableDefs, 0)
-		// Add all columns. Columns are always added.
+		// Add user-defined columns.
 		for i := range td.Columns {
 			c := &td.Columns[i]
-			if c.Inaccessible {
-				// Inaccessible columns automatically get added by
-				// the system; we don't need to add them ourselves here.
+			implicit, err := isImplicitlyCreatedBySystem(td, c)
+			if err != nil {
+				return nil, err
+			}
+			if implicit {
+				// Don't add system-created implicit columns.
 				continue
 			}
 			def := tree.ColumnTableDef{
@@ -2618,6 +2614,11 @@ func replaceLikeTableOpts(n *tree.CreateTable, params runParams) (tree.TableDefs
 		}
 		if opts.Has(tree.LikeTableOptIndexes) {
 			for _, idx := range td.NonDropIndexes() {
+				if idx.Primary() && td.IsPrimaryIndexDefaultRowID() {
+					// We won't copy over the default rowid primary index; instead
+					// we'll just generate a new one.
+					continue
+				}
 				indexDef := tree.IndexTableDef{
 					Name:     tree.Name(idx.GetName()),
 					Inverted: idx.GetType() == descpb.IndexDescriptor_INVERTED,
@@ -2886,3 +2887,23 @@ func validateUniqueConstraintParamsForCreateTableAs(n *tree.CreateTable) error {
 	}
 	return nil
 }
+
+// Checks if the column was automatically added by the system (e.g. for a rowid
+// primary key or hash sharded index).
+func isImplicitlyCreatedBySystem(td *tabledesc.Mutable, c *descpb.ColumnDescriptor) (bool, error) {
+	// TODO(#82672): add check for REGIONAL BY ROW column
+	if td.IsPrimaryIndexDefaultRowID() && c.ID == td.GetPrimaryIndex().GetKeyColumnID(0) {
+		return true, nil
+	}
+	col, err := td.FindColumnWithID(c.ID)
+	if err != nil {
+		return false, err
+	}
+	if td.IsShardColumn(col) {
+		return true, nil
+	}
+	if c.Inaccessible {
+		return true, nil
+	}
+	return false, nil
+}

pkg/sql/logictest/testdata/logic_test/create_table

@@ -296,7 +296,7 @@ like_no_pk_rowid_hidden  CREATE TABLE public.like_no_pk_rowid_hidden (
                          a INT8 NULL,
                          b INT8 NULL,
                          rowid INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
-                         CONSTRAINT like_no_pk_table_pkey PRIMARY KEY (rowid ASC)
+                         CONSTRAINT like_no_pk_rowid_hidden_pkey PRIMARY KEY (rowid ASC)
 )
 
 statement error duplicate column name
@@ -323,9 +323,8 @@ like_more_specifiers  CREATE TABLE public.like_more_specifiers (
                       t TIMESTAMPTZ NULL,
                       z DECIMAL NULL,
                       blah INT8 NULL,
-                      rowid INT8 NOT VISIBLE NOT NULL,
-                      rowid_1 INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
-                      CONSTRAINT like_more_specifiers_pkey PRIMARY KEY (rowid_1 ASC),
+                      rowid INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
+                      CONSTRAINT like_more_specifiers_pkey PRIMARY KEY (rowid ASC),
                       INDEX like_more_specifiers_a_blah_z_idx (a ASC, blah ASC, z ASC)
 )
 
@@ -340,9 +339,9 @@ SHOW CREATE TABLE like_hash
 ----
 like_hash  CREATE TABLE public.like_hash (
            a INT8 NULL,
-           crdb_internal_a_shard_4 INT8 NOT VISIBLE NOT NULL,
+           crdb_internal_a_shard_4 INT8 NOT VISIBLE NOT NULL AS (mod(fnv32(crdb_internal.datums_to_bytes(a)), 4:::INT8)) VIRTUAL,
            rowid INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
-           CONSTRAINT like_hash_base_pkey PRIMARY KEY (rowid ASC),
+           CONSTRAINT like_hash_pkey PRIMARY KEY (rowid ASC),
            INDEX like_hash_base_a_idx (a ASC) USING HASH WITH (bucket_count=4)
 )
 
@@ -359,7 +358,7 @@ like_hash  CREATE TABLE public.like_hash (
            a INT8 NULL,
            crdb_internal_a_shard_4 INT8 NOT VISIBLE NOT NULL AS (mod(fnv32(crdb_internal.datums_to_bytes(a)), 4:::INT8)) VIRTUAL,
            rowid INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
-           CONSTRAINT like_hash_base_pkey PRIMARY KEY (rowid ASC),
+           CONSTRAINT like_hash_pkey PRIMARY KEY (rowid ASC),
            INDEX like_hash_base_a_idx (a ASC) USING HASH WITH (bucket_count=4)
 )
 

pkg/sql/logictest/testdata/logic_test/inverted_index_multi_column

@@ -103,7 +103,7 @@ CREATE TABLE public.dst (
    b INT8 NULL,
    j JSONB NULL,
    rowid INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
-   CONSTRAINT src_pkey PRIMARY KEY (rowid ASC),
+   CONSTRAINT dst_pkey PRIMARY KEY (rowid ASC),
    INVERTED INDEX src_a_j_idx (a ASC, j ASC),
    INVERTED INDEX src_a_b_j_idx (a ASC, b ASC, j ASC)
 )

pkg/sql/logictest/testdata/logic_test/partial_index

@@ -217,7 +217,7 @@ t10  CREATE TABLE public.t10 (
      a INT8 NULL,
      b INT8 NULL,
      rowid INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
-     CONSTRAINT t9_pkey PRIMARY KEY (rowid ASC),
+     CONSTRAINT t10_pkey PRIMARY KEY (rowid ASC),
      INDEX t9_a_idx (a ASC) WHERE b > 1:::INT8
 )
 

pkg/sql/logictest/testdata/logic_test/virtual_columns

@@ -1176,7 +1176,7 @@ CREATE TABLE public.t63167_b (
    a INT8 NULL,
    v INT8 NULL AS (a + 1:::INT8) VIRTUAL,
    rowid INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
-   CONSTRAINT t63167_a_pkey PRIMARY KEY (rowid ASC)
+   CONSTRAINT t63167_b_pkey PRIMARY KEY (rowid ASC)
 )
 
 # Test that columns backfills to tables with virtual columns work.