fix and tests

Author: James Cor

enginetest/queries/information_schema_queries.go

@@ -1158,15 +1158,18 @@ FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_schema = 'mydb'`,
 		SetUpScript: []string{
 			"USE foo",
 			"drop table othertable",
-			"CREATE TABLE t (i int)",
-			"CREATE VIEW v as select * from t",
+			"CREATE TABLE t (i int primary key, j int)",
+			"CREATE VIEW v as select i + 1, j * 2, mod(i, j) from t",
 		},
 		Assertions: []ScriptTestAssertion{
 			{
 				Query: "SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = 'foo'",
 				Expected: []sql.Row{
-					{"def", "foo", "t", "i", uint32(1), nil, "YES", "int", nil, nil, int64(10), int64(0), nil, nil, nil, "int", "", "", "insert,references,select,update", "", "", nil},
-					{"def", "foo", "v", "", uint32(0), nil, "", nil, nil, nil, nil, nil, nil, "", "", "", "", "", "select", "", "", nil},
+					{"def", "foo", "t", "i", uint32(1), nil, "NO", "int", nil, nil, 10, 0, nil, nil, nil, "int", "PRI", "", "insert,references,select,update", "", "", nil},
+					{"def", "foo", "t", "j", uint32(2), nil, "YES", "int", nil, nil, 10, 0, nil, nil, nil, "int", "", "", "insert,references,select,update", "", "", nil},
+					{"def", "foo", "v", "i + 1", uint32(1), nil, "NO", "bigint", nil, nil, 19, 0, nil, nil, nil, "bigint", "", "", "insert,references,select,update", "", "", nil},
+					{"def", "foo", "v", "j * 2", uint32(2), nil, "YES", "bigint", nil, nil, 19, 0, nil, nil, nil, "bigint", "", "", "insert,references,select,update", "", "", nil},
+					{"def", "foo", "v", "mod(i, j)", uint32(3), nil, "YES", "decimal", nil, nil, 10, 0, nil, nil, nil, "decimal(10,0)", "", "", "insert,references,select,update", "", "", nil},
 				},
 			},
 		},

sql/information_schema/columns_table.go

@@ -28,6 +28,7 @@ import (
 
 	"github.com/dolthub/go-mysql-server/sql"
 	"github.com/dolthub/go-mysql-server/sql/mysql_db"
+	"github.com/dolthub/go-mysql-server/sql/plan"
 	"github.com/dolthub/go-mysql-server/sql/planbuilder"
 	"github.com/dolthub/go-mysql-server/sql/transform"
 	"github.com/dolthub/go-mysql-server/sql/types"
@@ -371,17 +372,19 @@ func getRowsFromViews(ctx *sql.Context, catalog sql.Catalog, db DbWithNames, pri
 	if err != nil {
 		return nil, err
 	}
-
-	for i, view := range views {
-		node, _, err := planbuilder.Parse(ctx, catalog, view.TextDefinition)
+	privSetDb := privSet.Database(db.Database.Name())
+	for _, view := range views {
+		node, _, err := planbuilder.Parse(ctx, catalog, view.CreateViewStatement)
 		if err != nil {
-			// TODO: should we error?
+			continue // sometimes views contains views from other databases
+		}
+		createViewNode, ok := node.(*plan.CreateView)
+		if !ok {
 			continue
 		}
-		privSetDb := privSet.Database(db.Database.Name())
 		privSetTbl := privSetDb.Table(view.Name)
 		curPrivSetMap := getCurrentPrivSetMapForColumn(privSetDb.ToSlice(), privSetMap)
-		for _, col := range node.Schema() {
+		for i, col := range createViewNode.Definition.Schema() {
 			r := getRowFromColumn(ctx, i, col, db.CatalogName, db.SchemaName, view.Name, "", privSetTbl, curPrivSetMap)
 			if r != nil {
 				rows = append(rows, r)