cli: remove ColumnTypeScanType

Release note: None
cockroachdb · Jun 2, 2022 · 6b3d2a8 · 6b3d2a8
1 parent fc2ea6f
commit 6b3d2a8
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 69 deletions.
diff --git a/pkg/cli/clisqlclient/api.go b/pkg/cli/clisqlclient/api.go
@@ -14,7 +14,6 @@ import (
 	"context"
 	"database/sql/driver"
 	"io"
-	"reflect"
 	"time"
 )
 
@@ -109,10 +108,6 @@ type Rows interface {
 	// result does not need to be constructed on each invocation.
 	Columns() []string
 
-	// ColumnTypeScanType returns the natural Go type of values at the
-	// given column index.
-	ColumnTypeScanType(index int) reflect.Type
-
 	// ColumnTypeDatabaseTypeName returns the database type name
 	// of the column at the given column index.
 	ColumnTypeDatabaseTypeName(index int) string

diff --git a/pkg/cli/clisqlclient/copy.go b/pkg/cli/clisqlclient/copy.go
@@ -15,7 +15,6 @@ import (
 	"context"
 	"database/sql/driver"
 	"io"
-	"reflect"
 
 	"github.com/jackc/pgconn"
 )
@@ -53,10 +52,6 @@ func (c copyFromRows) Columns() []string {
 	return nil
 }
 
-func (c copyFromRows) ColumnTypeScanType(index int) reflect.Type {
-	return nil
-}
-
 func (c copyFromRows) ColumnTypeDatabaseTypeName(index int) string {
 	return ""
 }

diff --git a/pkg/cli/clisqlclient/row_type_helpers.go b/pkg/cli/clisqlclient/row_type_helpers.go
@@ -11,45 +11,11 @@
 package clisqlclient
 
 import (
-	"reflect"
 	"strings"
-	"time"
 
 	"github.com/jackc/pgtype"
 )
 
-// scanType returns the Go type used for the given column type.
-func scanType(typeOID uint32, typeName string) reflect.Type {
-	if typeName == "" || strings.HasPrefix(typeName, "_") {
-		// User-defined types and array types are scanned into []byte.
-		// These are handled separately since we can't easily include all the OIDs
-		// for user-defined types and arrays in the switch statement.
-		return reflect.TypeOf([]byte(nil))
-	}
-	// This switch is copied from lib/pq, and modified with a few additional cases.
-	// https://github.com/lib/pq/blob/b2901c7946b69f1e7226214f9760e31620499595/rows.go#L24
-	switch typeOID {
-	case pgtype.Int8OID:
-		return reflect.TypeOf(int64(0))
-	case pgtype.Int4OID:
-		return reflect.TypeOf(int32(0))
-	case pgtype.Int2OID:
-		return reflect.TypeOf(int16(0))
-	case pgtype.VarcharOID, pgtype.TextOID, pgtype.NameOID,
-		pgtype.ByteaOID, pgtype.NumericOID, pgtype.RecordOID,
-		pgtype.QCharOID, pgtype.BPCharOID:
-		return reflect.TypeOf("")
-	case pgtype.BoolOID:
-		return reflect.TypeOf(false)
-	case pgtype.DateOID, pgtype.TimeOID, 1266, pgtype.TimestampOID, pgtype.TimestamptzOID:
-		// 1266 is the OID for TimeTZ.
-		// TODO(rafi): Add TimetzOID to pgtype.
-		return reflect.TypeOf(time.Time{})
-	default:
-		return reflect.TypeOf(new(interface{})).Elem()
-	}
-}
-
 // databaseTypeName returns the database type name for the given type OID.
 func databaseTypeName(ci *pgtype.ConnInfo, typeOID uint32) string {
 	dataType, ok := ci.DataTypeForOID(typeOID)

diff --git a/pkg/cli/clisqlclient/rows.go b/pkg/cli/clisqlclient/rows.go
@@ -13,7 +13,6 @@ package clisqlclient
 import (
 	"database/sql/driver"
 	"io"
-	"reflect"
 
 	"github.com/jackc/pgtype"
 	"github.com/jackc/pgx/v4"
@@ -87,13 +86,6 @@ func (r *sqlRows) NextResultSet() (bool, error) {
 	return false, nil
 }
 
-func (r *sqlRows) ColumnTypeScanType(index int) reflect.Type {
-	// todo: remove this?
-	o := r.rows.FieldDescriptions()[index].DataTypeOID
-	n := r.ColumnTypeDatabaseTypeName(index)
-	return scanType(o, n)
-}
-
 func (r *sqlRows) ColumnTypeDatabaseTypeName(index int) string {
 	fieldOID := r.rows.FieldDescriptions()[index].DataTypeOID
 	return databaseTypeName(r.connInfo, fieldOID)

diff --git a/pkg/cli/clisqlclient/rows_multi.go b/pkg/cli/clisqlclient/rows_multi.go
@@ -13,7 +13,6 @@ package clisqlclient
 import (
 	"database/sql/driver"
 	"io"
-	"reflect"
 
 	"github.com/cockroachdb/errors"
 	"github.com/jackc/pgconn"
@@ -135,13 +134,6 @@ func (r *sqlRowsMultiResultSet) NextResultSet() (bool, error) {
 	return next, nil
 }
 
-func (r *sqlRowsMultiResultSet) ColumnTypeScanType(index int) reflect.Type {
-	rd := r.rows.ResultReader()
-	o := rd.FieldDescriptions()[index].DataTypeOID
-	n := r.ColumnTypeDatabaseTypeName(index)
-	return scanType(o, n)
-}
-
 func (r *sqlRowsMultiResultSet) ColumnTypeDatabaseTypeName(index int) string {
 	rd := r.rows.ResultReader()
 	fieldOID := rd.FieldDescriptions()[index].DataTypeOID

diff --git a/pkg/cli/clisqlexec/BUILD.bazel b/pkg/cli/clisqlexec/BUILD.bazel
@@ -23,7 +23,6 @@ go_library(
         "//pkg/util/syncutil",
         "//pkg/util/timeutil",
         "@com_github_cockroachdb_errors//:errors",
-        "@com_github_jackc_pgtype//:pgtype",
         "@com_github_olekukonko_tablewriter//:tablewriter",
         "@com_github_spf13_pflag//:pflag",
     ],

diff --git a/pkg/cli/clisqlexec/format_table.go b/pkg/cli/clisqlexec/format_table.go
@@ -16,7 +16,6 @@ import (
 	"fmt"
 	"html"
 	"io"
-	"reflect"
 	"strings"
 	"text/tabwriter"
 	"time"
@@ -121,16 +120,19 @@ func (iter *rowIter) Align() []int {
 	cols := iter.rows.Columns()
 	align := make([]int, len(cols))
 	for i := range align {
-		switch iter.rows.ColumnTypeScanType(i).Kind() {
-		case reflect.String:
+		typName := iter.rows.ColumnTypeDatabaseTypeName(i)
+		if typName == "" || strings.HasPrefix(typName, "_") {
+			// All array types begin with "_" and user-defined types may not have a
+			// type name available.
 			align[i] = tablewriter.ALIGN_LEFT
-		case reflect.Slice:
+			continue
+		}
+		switch typName {
+		case "TEXT", "BYTEA", "CHAR", "BPCHAR", "NAME", "UUID":
 			align[i] = tablewriter.ALIGN_LEFT
-		case reflect.Int64:
-			align[i] = tablewriter.ALIGN_RIGHT
-		case reflect.Float64:
+		case "INT2", "INT4", "INT8", "FLOAT4", "FLOAT8", "NUMERIC", "OID":
 			align[i] = tablewriter.ALIGN_RIGHT
-		case reflect.Bool:
+		case "BOOL":
 			align[i] = tablewriter.ALIGN_CENTER
 		default:
 			align[i] = tablewriter.ALIGN_DEFAULT