Merge pull request cockroachdb#107227 from ecwall/backport22.2-107099

release-22.2: sql: fix `CREATE TABLE AS` sourcing `SHOW <show_subcmd> <table>` job failures

pkg/sql/create_as_test.go

@@ -126,9 +126,6 @@ func TestCreateAsShow(t *testing.T) {
 		{
 			sql:   "SHOW CREATE TABLE show_create_tbl",
 			setup: "CREATE TABLE show_create_tbl (id int PRIMARY KEY)",
-			// TODO(sql-foundations): Fix `relation "show_create_tbl" does not exist` error in job.
-			//  See https://github.com/cockroachdb/cockroach/issues/106260.
-			skip: true,
 		},
 		{
 			sql:   "SHOW CREATE FUNCTION show_create_fn",
@@ -146,40 +143,25 @@ func TestCreateAsShow(t *testing.T) {
 		{
 			sql:   "SHOW INDEXES FROM show_indexes_tbl",
 			setup: "CREATE TABLE show_indexes_tbl (id int PRIMARY KEY)",
-			// TODO(sql-foundations): Fix `relation "show_indexes_tbl" does not exist` error in job.
-			//  See https://github.com/cockroachdb/cockroach/issues/106260.
-			skip: true,
 		},
 		{
 			sql:   "SHOW COLUMNS FROM show_columns_tbl",
 			setup: "CREATE TABLE show_columns_tbl (id int PRIMARY KEY)",
-			// TODO(sql-foundations): Fix `relation "show_columns_tbl" does not exist` error in job.
-			//  See https://github.com/cockroachdb/cockroach/issues/106260.
-			skip: true,
 		},
 		{
 			sql:   "SHOW CONSTRAINTS FROM show_constraints_tbl",
 			setup: "CREATE TABLE show_constraints_tbl (id int PRIMARY KEY)",
-			// TODO(sql-foundations): Fix `relation "show_constraints_tbl" does not exist` error in job.
-			//  See https://github.com/cockroachdb/cockroach/issues/106260.
-			skip: true,
 		},
 		{
 			sql: "SHOW PARTITIONS FROM DATABASE defaultdb",
 		},
 		{
 			sql:   "SHOW PARTITIONS FROM TABLE show_partitions_tbl",
 			setup: "CREATE TABLE show_partitions_tbl (id int PRIMARY KEY)",
-			// TODO(sql-foundations): Fix `relation "show_partitions_tbl" does not exist` error in job.
-			//  See https://github.com/cockroachdb/cockroach/issues/106260.
-			skip: true,
 		},
 		{
 			sql:   "SHOW PARTITIONS FROM INDEX show_partitions_idx_tbl@show_partitions_idx_tbl_pkey",
 			setup: "CREATE TABLE show_partitions_idx_tbl (id int PRIMARY KEY)",
-			// TODO(sql-foundations): Fix `relation "show_partitions_idx_tbl" does not exist` error in job.
-			//  See https://github.com/cockroachdb/cockroach/issues/106260.
-			skip: true,
 		},
 		{
 			sql: "SHOW GRANTS",

pkg/sql/delegate/delegate.go

@@ -32,12 +32,17 @@ import (
 // can be rewritten as a lower level query. If it can, returns a new AST which
 // is equivalent to the original statement. Otherwise, returns nil.
 func TryDelegate(
-	ctx context.Context, catalog cat.Catalog, evalCtx *eval.Context, stmt tree.Statement,
+	ctx context.Context,
+	catalog cat.Catalog,
+	evalCtx *eval.Context,
+	stmt tree.Statement,
+	qualifyDataSourceNamesInAST bool,
 ) (tree.Statement, error) {
 	d := delegator{
-		ctx:     ctx,
-		catalog: catalog,
-		evalCtx: evalCtx,
+		ctx:                         ctx,
+		catalog:                     catalog,
+		evalCtx:                     evalCtx,
+		qualifyDataSourceNamesInAST: qualifyDataSourceNamesInAST,
 	}
 	switch t := stmt.(type) {
 	case *tree.ShowClusterSettingList:
@@ -192,12 +197,74 @@ func TryDelegate(
 }
 
 type delegator struct {
-	ctx     context.Context
-	catalog cat.Catalog
-	evalCtx *eval.Context
+	ctx                         context.Context
+	catalog                     cat.Catalog
+	evalCtx                     *eval.Context
+	qualifyDataSourceNamesInAST bool
 }
 
 func parse(sql string) (tree.Statement, error) {
 	s, err := parser.ParseOne(sql)
 	return s.AST, err
 }
+
+// We avoid the cache so that we can observe the details without
+// taking a lease, like other SHOW commands.
+var resolveFlags = cat.Flags{AvoidDescriptorCaches: true, NoTableStats: true}
+
+// resolveAndModifyUnresolvedObjectName may modify the name input
+// if d.qualifyDataSourceNamesInAST == true
+func (d *delegator) resolveAndModifyUnresolvedObjectName(
+	name *tree.UnresolvedObjectName,
+) (cat.DataSource, cat.DataSourceName, error) {
+	tn := name.ToTableName()
+	dataSource, resName, err := d.catalog.ResolveDataSource(d.ctx, resolveFlags, &tn)
+	if err != nil {
+		return nil, cat.DataSourceName{}, err
+	}
+	if err := d.catalog.CheckAnyPrivilege(d.ctx, dataSource); err != nil {
+		return nil, cat.DataSourceName{}, err
+	}
+	// Use qualifyDataSourceNamesInAST similarly to the Builder so that
+	// CREATE TABLE AS can source from a delegated expression.
+	// For example: CREATE TABLE t2 AS SELECT * FROM [SHOW CREATE t1];
+	if d.qualifyDataSourceNamesInAST {
+		resName.ExplicitSchema = true
+		resName.ExplicitCatalog = true
+		*name = *resName.ToUnresolvedObjectName()
+	}
+	return dataSource, resName, nil
+}
+
+// resolveAndModifyTableIndexName may modify the name input
+// if d.qualifyDataSourceNamesInAST == true
+func (d *delegator) resolveAndModifyTableIndexName(
+	name *tree.TableIndexName,
+) (cat.DataSource, cat.DataSourceName, error) {
+
+	tn := name.Table
+	dataSource, resName, err := d.catalog.ResolveDataSource(d.ctx, resolveFlags, &tn)
+	if err != nil {
+		return nil, cat.DataSourceName{}, err
+	}
+
+	if err := d.catalog.CheckAnyPrivilege(d.ctx, dataSource); err != nil {
+		return nil, cat.DataSourceName{}, err
+	}
+
+	// Force resolution of the index.
+	_, _, err = cat.ResolveTableIndex(d.ctx, d.catalog, resolveFlags, name)
+	if err != nil {
+		return nil, cat.DataSourceName{}, err
+	}
+
+	// Use qualifyDataSourceNamesInAST similarly to the Builder so that
+	// CREATE TABLE AS can source from a delegated expression.
+	// For example: CREATE TABLE t2 AS SELECT * FROM [SHOW PARTITIONS FROM INDEX t1@t1_pkey];
+	if d.qualifyDataSourceNamesInAST {
+		resName.ExplicitSchema = true
+		resName.ExplicitCatalog = true
+		(*name).Table = resName.ToUnresolvedObjectName().ToTableName()
+	}
+	return dataSource, resName, nil
+}

pkg/sql/delegate/show_partitions.go

@@ -14,7 +14,6 @@ import (
 	"fmt"
 
 	"github.com/cockroachdb/cockroach/pkg/sql/lexbase"
-	"github.com/cockroachdb/cockroach/pkg/sql/opt/cat"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgcode"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgerror"
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
@@ -25,16 +24,10 @@ import (
 func (d *delegator) delegateShowPartitions(n *tree.ShowPartitions) (tree.Statement, error) {
 	sqltelemetry.IncrementShowCounter(sqltelemetry.Partitions)
 	if n.IsTable {
-		flags := cat.Flags{AvoidDescriptorCaches: true, NoTableStats: true}
-		tn := n.Table.ToTableName()
-
-		dataSource, resName, err := d.catalog.ResolveDataSource(d.ctx, flags, &tn)
+		_, resName, err := d.resolveAndModifyUnresolvedObjectName(n.Table)
 		if err != nil {
 			return nil, err
 		}
-		if err := d.catalog.CheckAnyPrivilege(d.ctx, dataSource); err != nil {
-			return nil, err
-		}
 
 		// We use the raw_config_sql from the partition_lookup result to get the
 		// official zone config for the partition, and use the full_config_sql from the zones table
@@ -108,28 +101,16 @@ func (d *delegator) delegateShowPartitions(n *tree.ShowPartitions) (tree.Stateme
 		return parse(fmt.Sprintf(showDatabasePartitionsQuery, n.Database.String(), lexbase.EscapeSQLString(string(n.Database))))
 	}
 
-	flags := cat.Flags{AvoidDescriptorCaches: true, NoTableStats: true}
-	tn := n.Index.Table
-
 	// Throw a more descriptive error if the user did not use the index hint syntax.
-	if tn.ObjectName == "" {
+	tableIndexName := &n.Index
+	if tableIndexName.Table.ObjectName == "" {
 		err := errors.New("no table specified")
 		err = pgerror.WithCandidateCode(err, pgcode.InvalidParameterValue)
 		err = errors.WithHint(err, "Specify a table using the hint syntax of table@index.")
 		return nil, err
 	}
 
-	dataSource, resName, err := d.catalog.ResolveDataSource(d.ctx, flags, &tn)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := d.catalog.CheckAnyPrivilege(d.ctx, dataSource); err != nil {
-		return nil, err
-	}
-
-	// Force resolution of the index.
-	_, _, err = cat.ResolveTableIndex(d.ctx, d.catalog, flags, &n.Index)
+	_, resName, err := d.resolveAndModifyTableIndexName(tableIndexName)
 	if err != nil {
 		return nil, err
 	}

pkg/sql/delegate/show_table.go

@@ -14,7 +14,6 @@ import (
 	"fmt"
 
 	"github.com/cockroachdb/cockroach/pkg/sql/lexbase"
-	"github.com/cockroachdb/cockroach/pkg/sql/opt/cat"
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
 	"github.com/cockroachdb/cockroach/pkg/sql/sqltelemetry"
 	"github.com/cockroachdb/errors"
@@ -257,18 +256,11 @@ func (d *delegator) delegateShowCreateAllTables() (tree.Statement, error) {
 func (d *delegator) showTableDetails(
 	name *tree.UnresolvedObjectName, query string,
 ) (tree.Statement, error) {
-	// We avoid the cache so that we can observe the details without
-	// taking a lease, like other SHOW commands.
-	flags := cat.Flags{AvoidDescriptorCaches: true, NoTableStats: true}
-	tn := name.ToTableName()
-	dataSource, resName, err := d.catalog.ResolveDataSource(d.ctx, flags, &tn)
+
+	dataSource, resName, err := d.resolveAndModifyUnresolvedObjectName(name)
 	if err != nil {
 		return nil, err
 	}
-	if err := d.catalog.CheckAnyPrivilege(d.ctx, dataSource); err != nil {
-		return nil, err
-	}
-
 	fullQuery := fmt.Sprintf(query,
 		lexbase.EscapeSQLString(resName.Catalog()),
 		lexbase.EscapeSQLString(resName.Table()),

pkg/sql/opt/optbuilder/builder.go

@@ -399,7 +399,13 @@ func (b *Builder) buildStmt(
 	default:
 		// See if this statement can be rewritten to another statement using the
 		// delegate functionality.
-		newStmt, err := delegate.TryDelegate(b.ctx, b.catalog, b.evalCtx, stmt)
+		newStmt, err := delegate.TryDelegate(
+			b.ctx,
+			b.catalog,
+			b.evalCtx,
+			stmt,
+			b.qualifyDataSourceNamesInAST,
+		)
 		if err != nil {
 			panic(err)
 		}