Merge pull request #1495 from dolthub/jennifer/column-name

fix displaying correct column name for dolt_ tables

Author: jennifersp

server/expression/gms_cast.go

@@ -22,6 +22,7 @@ import (
 	"github.com/cockroachdb/errors"
 	"github.com/dolthub/dolt/go/store/prolly/tree"
 	"github.com/dolthub/go-mysql-server/sql"
+	"github.com/dolthub/go-mysql-server/sql/expression"
 	"github.com/dolthub/go-mysql-server/sql/types"
 	"github.com/dolthub/vitess/go/vt/proto/query"
 	"github.com/shopspring/decimal"
@@ -205,6 +206,9 @@ func (c *GMSCast) Resolved() bool {
 
 // String implements the sql.Expression interface.
 func (c *GMSCast) String() string {
+	if gf, ok := c.sqlChild.(*expression.GetField); ok {
+		return gf.Name()
+	}
 	return c.sqlChild.String()
 }
 

testing/go/dolt_tables_test.go

@@ -26,20 +26,24 @@ func TestUserSpaceDoltTables(t *testing.T) {
 			Name: "dolt branches",
 			Assertions: []ScriptTestAssertion{
 				{
-					Query:    `SELECT name FROM dolt.branches`,
-					Expected: []sql.Row{{"main"}},
+					Query:            `SELECT name FROM dolt.branches`,
+					ExpectedColNames: []string{"name"},
+					Expected:         []sql.Row{{"main"}},
 				},
 				{
-					Query:    `SELECT name FROM dolt_branches`,
-					Expected: []sql.Row{{"main"}},
+					Query:            `SELECT name FROM dolt_branches`,
+					ExpectedColNames: []string{"name"},
+					Expected:         []sql.Row{{"main"}},
 				},
 				{
-					Query:    `SELECT branches.name FROM dolt.branches`,
-					Expected: []sql.Row{{"main"}},
+					Query:            `SELECT branches.name FROM dolt.branches`,
+					ExpectedColNames: []string{"name"},
+					Expected:         []sql.Row{{"main"}},
 				},
 				{
-					Query:    `SELECT dolt.branches.name FROM dolt.branches`,
-					Expected: []sql.Row{{"main"}},
+					Query:            `SELECT dolt.branches.name FROM dolt.branches`,
+					ExpectedColNames: []string{"name"},
+					Expected:         []sql.Row{{"main"}},
 				},
 				{
 					Query:    `SELECT dolt_branches.name FROM dolt_branches`,

testing/go/framework.go

@@ -112,8 +112,8 @@ type ScriptTestAssertion struct {
 	// This is checked only if no Expected is defined
 	ExpectedTag string
 
-	// Cols is used to check the column names returned from the server.
-	Cols []string
+	// ExpectedColNames is used to check the column names returned from the server.
+	ExpectedColNames []string
 
 	// CopyFromSTDIN is used to test the COPY FROM STDIN command.
 	CopyFromStdInFile string
@@ -224,10 +224,10 @@ func runScript(t *testing.T, ctx context.Context, script ScriptTest, conn *Conne
 				readRows, err := ReadRows(rows, normalizeRows)
 				require.NoError(t, err)
 
-				if assertion.Cols != nil {
+				if assertion.ExpectedColNames != nil {
 					fields := rows.FieldDescriptions()
-					if assert.Len(t, fields, len(assertion.Cols), "expected length of columns") {
-						for i, col := range assertion.Cols {
+					if assert.Len(t, fields, len(assertion.ExpectedColNames), "expected length of columns") {
+						for i, col := range assertion.ExpectedColNames {
 							assert.Equal(t, col, fields[i].Name)
 						}
 					}