schemachange: cleanly backport schemachange to release 20.1

Release note: None
cockroachdb · Oct 26, 2020 · 151d33d · 151d33d
1 parent 0da1971
commit 151d33d
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 179 deletions.
diff --git a/pkg/cli/cli.go b/pkg/cli/cli.go
@@ -28,12 +28,13 @@ import (
 	_ "github.com/cockroachdb/cockroach/pkg/workload/bank"       // registers workloads
 	_ "github.com/cockroachdb/cockroach/pkg/workload/bulkingest" // registers workloads
 	workloadcli "github.com/cockroachdb/cockroach/pkg/workload/cli"
-	_ "github.com/cockroachdb/cockroach/pkg/workload/examples" // registers workloads
-	_ "github.com/cockroachdb/cockroach/pkg/workload/kv"       // registers workloads
-	_ "github.com/cockroachdb/cockroach/pkg/workload/movr"     // registers workloads
-	_ "github.com/cockroachdb/cockroach/pkg/workload/tpcc"     // registers workloads
-	_ "github.com/cockroachdb/cockroach/pkg/workload/tpch"     // registers workloads
-	_ "github.com/cockroachdb/cockroach/pkg/workload/ycsb"     // registers workloads
+	_ "github.com/cockroachdb/cockroach/pkg/workload/examples"     // registers workloads
+	_ "github.com/cockroachdb/cockroach/pkg/workload/kv"           // registers workloads
+	_ "github.com/cockroachdb/cockroach/pkg/workload/movr"         // registers workloads
+	_ "github.com/cockroachdb/cockroach/pkg/workload/schemachange" // registers workloads
+	_ "github.com/cockroachdb/cockroach/pkg/workload/tpcc"         // registers workloads
+	_ "github.com/cockroachdb/cockroach/pkg/workload/tpch"         // registers workloads
+	_ "github.com/cockroachdb/cockroach/pkg/workload/ycsb"         // registers workloads
 	"github.com/cockroachdb/errors"
 	"github.com/spf13/cobra"
 )

diff --git a/pkg/sql/sem/tree/table_name.go b/pkg/sql/sem/tree/table_name.go
@@ -165,6 +165,15 @@ func MakeTableNameWithSchema(db, schema, tbl Name) TableName {
 	}}
 }
 
+// MakeTableNameFromPrefix creates a table name from an unqualified name
+// and a resolved prefix.
+func MakeTableNameFromPrefix(prefix TableNamePrefix, object Name) TableName {
+	return TableName{tblName{
+		TableName:       object,
+		TableNamePrefix: prefix,
+	}}
+}
+
 // MakeUnqualifiedTableName creates a new base table name.
 func MakeUnqualifiedTableName(tbl Name) TableName {
 	return TableName{tblName{

diff --git a/pkg/workload/schemachange/optype_string.go b/pkg/workload/schemachange/optype_string.go