fixed visitor and select fields

internal/engine/execution/procedure.go

@@ -473,7 +473,7 @@ func makeExecutables(exprs []tree.Expression) ([]evaluatable, error) {
 		// OID (placeholder types) that it can't know since there's no FOR table.
 		selectTree := &tree.SelectStmt{
 			Stmt: &tree.SelectCore{
-				SelectCores: []*tree.SimpleSelect{
+				SimpleSelects: []*tree.SimpleSelect{
 					{
 						SelectType: tree.SelectTypeAll,
 						Columns: []tree.ResultColumn{

internal/engine/sqlanalyzer/attributes/select_core_test.go

@@ -189,7 +189,7 @@ func TestGetSelectCoreRelationAttributes(t *testing.T) {
 				return
 			}
 
-			got, err := attributes.GetSelectCoreRelationAttributes(selectStmt.Stmt.SelectCores[0], tt.tables)
+			got, err := attributes.GetSelectCoreRelationAttributes(selectStmt.Stmt.SimpleSelects[0], tt.tables)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("GetSelectCoreRelationAttributes() error = %v, wantErr %v", err, tt.wantErr)
 				return

internal/engine/sqlanalyzer/clean/walker.go

@@ -301,7 +301,7 @@ func (s *StatementCleaner) EnterSelectCore(node *tree.SimpleSelect) (err error)
 
 // EnterSelectStmt checks that, for each SelectCore besides the last, a compound operator is provided
 func (s *StatementCleaner) EnterSelectStmtNoCte(node *tree.SelectCore) (err error) {
-	for _, core := range node.SelectCores[:len(node.SelectCores)-1] {
+	for _, core := range node.SimpleSelects[:len(node.SimpleSelects)-1] {
 		if core.Compound == nil {
 			return wrapErr(ErrInvalidCompoundOperator, errors.New("compound operator must be provided for all SelectCores except the last"))
 		}

internal/engine/sqlanalyzer/order/order.go

@@ -31,11 +31,11 @@ var _ tree.AstListener = &orderingWalker{}
 
 // we need to register common table expressions as tables, so that we can order them.
 func (o *orderingWalker) EnterCTE(node *tree.CTE) error {
-	if len(node.Select.SelectCores) == 0 {
+	if len(node.Select.SimpleSelects) == 0 {
 		return nil
 	}
 
-	cteAttributes, err := attributes.GetSelectCoreRelationAttributes(node.Select.SelectCores[0], o.tables)
+	cteAttributes, err := attributes.GetSelectCoreRelationAttributes(node.Select.SimpleSelects[0], o.tables)
 	if err != nil {
 		return err
 	}
@@ -55,11 +55,11 @@ func (o *orderingWalker) EnterRelationSubquery(node *tree.RelationSubquery) erro
 	if node.Select == nil {
 		return fmt.Errorf("subquery select is nil")
 	}
-	if len(node.Select.SelectCores) == 0 {
+	if len(node.Select.SimpleSelects) == 0 {
 		return fmt.Errorf("subquery select has no select cores")
 	}
 
-	relationAttributes, err := attributes.GetSelectCoreRelationAttributes(node.Select.SelectCores[0], o.tables)
+	relationAttributes, err := attributes.GetSelectCoreRelationAttributes(node.Select.SimpleSelects[0], o.tables)
 	if err != nil {
 		return err
 	}
@@ -84,13 +84,13 @@ func (o *orderingWalker) EnterRelationSubquery(node *tree.RelationSubquery) erro
 func (o *orderingWalker) ExitSelectStmtNoCte(node *tree.SelectCore) error {
 	var terms []*tree.OrderingTerm
 	var err error
-	switch len(node.SelectCores) {
+	switch len(node.SimpleSelects) {
 	case 0:
 		return fmt.Errorf("no select cores in select statement")
 	case 1:
-		terms, err = orderSimpleStatement(node.SelectCores[0], o.tables)
+		terms, err = orderSimpleStatement(node.SimpleSelects[0], o.tables)
 	default:
-		terms, err = orderCompoundStatement(node.SelectCores, o.tables)
+		terms, err = orderCompoundStatement(node.SimpleSelects, o.tables)
 	}
 	if err != nil {
 		return fmt.Errorf("error ordering statement: %w", err)

internal/engine/sqlanalyzer/utils/utils_test.go

@@ -50,9 +50,9 @@ func Test_JoinSearch(t *testing.T) {
 
 			topSelect, ok := stmt.(*tree.SelectStmt)
 			require.True(t, ok)
-			require.Equal(t, len(topSelect.Stmt.SelectCores), 1)
+			require.Equal(t, len(topSelect.Stmt.SimpleSelects), 1)
 
-			tbls, err := utils.GetUsedTables(topSelect.Stmt.SelectCores[0].From)
+			tbls, err := utils.GetUsedTables(topSelect.Stmt.SimpleSelects[0].From)
 			require.NoError(t, err)
 
 			require.EqualValues(t, tt.tables, tbls)

parse/sql/ast_builder.go

@@ -1024,7 +1024,7 @@ func (v *astBuilder) VisitSelect_core(ctx *grammar.Select_coreContext) interface
 		selectCores[i+1] = core
 	}
 
-	t.SelectCores = selectCores
+	t.SimpleSelects = selectCores
 
 	if ctx.Order_by_stmt() != nil {
 		t.OrderBy = v.Visit(ctx.Order_by_stmt()).(*tree.OrderBy)