fix view default for filters and add join test

Author: James Cor

enginetest/queries/information_schema_queries.go

@@ -1160,17 +1160,25 @@ FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_schema = 'mydb'`,
 			"drop table othertable",
 			"CREATE TABLE t (i int primary key, j int default (uuid_to_bin(uuid())));",
 			"CREATE VIEW v as select i + 1, j, j * 2, mod(i, j) from t;",
+			"create table tt (ii int primary key, jj int default (pow(1, 2)));",
+			"create view vv as select * from t join tt where i = ii;",
 		},
 		Assertions: []ScriptTestAssertion{
 			{
 				Query: "SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = 'foo'",
 				Expected: []sql.Row{
 					{"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), "UUID_TO_BIN(uuid())", "YES", "int", nil, nil, 10, 0, nil, nil, nil, "int", "", "DEFAULT_GENERATED", "insert,references,select,update", "", "", nil},
+					{"def", "foo", "tt", "ii", uint32(1), nil, "NO", "int", nil, nil, 10, 0, nil, nil, nil, "int", "PRI", "", "insert,references,select,update", "", "", nil},
+					{"def", "foo", "tt", "jj", uint32(2), "power(1, 2)", "YES", "int", nil, nil, 10, 0, nil, nil, nil, "int", "", "DEFAULT_GENERATED", "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", uint32(2), "UUID_TO_BIN(uuid())", "YES", "int", nil, nil, 10, 0, nil, nil, nil, "int", "", "DEFAULT_GENERATED", "insert,references,select,update", "", "", nil},
 					{"def", "foo", "v", "j * 2", uint32(3), nil, "YES", "bigint", nil, nil, 19, 0, nil, nil, nil, "bigint", "", "", "insert,references,select,update", "", "", nil},
 					{"def", "foo", "v", "mod(i, j)", uint32(4), nil, "YES", "decimal", nil, nil, 10, 0, nil, nil, nil, "decimal(10,0)", "", "", "insert,references,select,update", "", "", nil},
+					{"def", "foo", "vv", "i", uint32(1), nil, "NO", "int", nil, nil, 10, 0, nil, nil, nil, "int", "", "", "insert,references,select,update", "", "", nil},
+					{"def", "foo", "vv", "j", uint32(2), "UUID_TO_BIN(uuid())", "YES", "int", nil, nil, 10, 0, nil, nil, nil, "int", "", "DEFAULT_GENERATED", "insert,references,select,update", "", "", nil},
+					{"def", "foo", "vv", "ii", uint32(3), nil, "NO", "int", nil, nil, 10, 0, nil, nil, nil, "int", "", "", "insert,references,select,update", "", "", nil},
+					{"def", "foo", "vv", "jj", uint32(4), "power(1, 2)", "YES", "int", nil, nil, 10, 0, nil, nil, nil, "int", "", "DEFAULT_GENERATED", "insert,references,select,update", "", "", nil},
 				},
 			},
 		},

enginetest/queries/view_queries.go

@@ -203,8 +203,11 @@ CREATE TABLE tab1 (
 		SetUpScript: []string{
 			"create table t (i int primary key, j int default 100);",
 			"insert into t(i) values (1);",
+			"create table tt (ii int primary key, jj int default (pow(11, 2)));",
+			"insert into tt values (1, default), (3, 4);",
 			"create view v as select * from t;",
 			"create view v1 as select i, j + 10 as jj from t;",
+			"create view vv as select i, ii, j, jj, i + ii + j + jj from t join tt where i = ii;",
 		},
 		Assertions: []ScriptTestAssertion{
 			{
@@ -249,6 +252,36 @@ CREATE TABLE tab1 (
 					{"jj", "bigint", "YES", "", nil, ""},
 				},
 			},
+			{
+				Query: "show full columns from vv;",
+				Expected: []sql.Row{
+					{"i", "int", nil, "NO", "", nil, "", "", ""},
+					{"ii", "int", nil, "NO", "", nil, "", "", ""},
+					{"j", "int", nil, "YES", "", "100", "", "", ""},
+					{"jj", "int", nil, "YES", "", "(power(11, 2))", "DEFAULT_GENERATED", "", ""},
+					{"i + ii + j + jj", "bigint", nil, "YES", "", nil, "", "", ""},
+				},
+			},
+			{
+				Query: "show columns from vv;",
+				Expected: []sql.Row{
+					{"i", "int", "NO", "", nil, ""},
+					{"ii", "int", "NO", "", nil, ""},
+					{"j", "int", "YES", "", "100", ""},
+					{"jj", "int", "YES", "", "(power(11, 2))", "DEFAULT_GENERATED"},
+					{"i + ii + j + jj", "bigint", "YES", "", nil, ""},
+				},
+			},
+			{
+				Query: "describe vv;",
+				Expected: []sql.Row{
+					{"i", "int", "NO", "", nil, ""},
+					{"ii", "int", "NO", "", nil, ""},
+					{"j", "int", "YES", "", "100", ""},
+					{"jj", "int", "YES", "", "(power(11, 2))", "DEFAULT_GENERATED"},
+					{"i + ii + j + jj", "bigint", "YES", "", nil, ""},
+				},
+			},
 		},
 	},
 }

sql/plan/project.go

@@ -53,6 +53,8 @@ func findDefault(node sql.Node, gf *expression.GetField) *sql.ColumnDefaultValue
 		return findDefault(n.Child, gf)
 	case *HashLookup:
 		return findDefault(n.Child, gf)
+	case *Filter:
+		return findDefault(n.Child, gf)
 	case *JoinNode:
 		if defVal := findDefault(n.Left(), gf); defVal != nil {
 			return defVal