Merge remote-tracking branch 'origin/main' into nicktobey/vector2

Author: nicktobey

_example/main_test.go

@@ -18,6 +18,7 @@ import (
 	"database/sql"
 	"fmt"
 	"testing"
+	"time"
 
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/gocraft/dbr/v2"
@@ -42,6 +43,8 @@ func TestExampleUsersDisabled(t *testing.T) {
 		main()
 	}()
 
+	// Wait for the database to start
+	time.Sleep(1 * time.Second)
 	conn, err := dbr.Open("mysql", fmt.Sprintf("no_user:@tcp(%s:%d)/%s", address, port, dbName), nil)
 	require.NoError(t, err)
 	require.NoError(t, conn.Ping())
@@ -60,7 +63,6 @@ func TestExampleRootUserEnabled(t *testing.T) {
 	go func() {
 		main()
 	}()
-
 	conn, err := dbr.Open("mysql", fmt.Sprintf("no_user:@tcp(%s:%d)/%s", address, port, dbName), nil)
 	require.NoError(t, err)
 	require.ErrorContains(t, conn.Ping(), "User not found")
@@ -82,7 +84,6 @@ func TestExampleLoadedUser(t *testing.T) {
 	go func() {
 		main()
 	}()
-
 	conn, err := dbr.Open("mysql", fmt.Sprintf("no_user:@tcp(%s:%d)/%s", address, port, dbName), nil)
 	require.NoError(t, err)
 	require.ErrorContains(t, conn.Ping(), "User not found")
@@ -108,7 +109,6 @@ func TestIssue1621(t *testing.T) {
 	go func() {
 		main()
 	}()
-
 	conn, err := dbr.Open("mysql",
 		fmt.Sprintf("root:@tcp(localhost:%d)/mydb", port), nil)
 	require.NoError(t, err)

driver/conn.go

@@ -23,13 +23,13 @@ import (
 
 // Conn is a connection to a database.
 type Conn struct {
-	dsn      string
-	options  *Options
-	dbConn   *dbConn
 	session  sql.Session
 	contexts ContextBuilder
+	options  *Options
+	dbConn   *dbConn
 	indexes  *sql.IndexRegistry
 	views    *sql.ViewRegistry
+	dsn      string
 }
 
 // DSN returns the driver connection string.

driver/driver.go

@@ -82,12 +82,11 @@ type ProviderWithSessionBuilder interface {
 // A Driver exposes an engine as a stdlib SQL driver.
 type Driver struct {
 	provider Provider
-	options  *Options
 	sessions SessionBuilder
 	contexts ContextBuilder
-
-	mu  sync.Mutex
-	dbs map[string]*dbConn
+	options  *Options
+	dbs      map[string]*dbConn
+	mu       sync.Mutex
 }
 
 // New returns a driver using the specified provider.
@@ -223,9 +222,9 @@ func (c *dbConn) close() error {
 type Connector struct {
 	driver     *Driver
 	options    *Options
+	dbConn     *dbConn
 	serverName string
 	dsn        string
-	dbConn     *dbConn
 }
 
 // Driver returns the driver.

driver/rows.go

@@ -26,10 +26,10 @@ import (
 
 // Rows is an iterator over an executed query's results.
 type Rows struct {
+	rows    sql.RowIter
 	options *Options
 	ctx     *sql.Context
 	cols    sql.Schema
-	rows    sql.RowIter
 }
 
 // Columns returns the names of the columns. The number of

driver/stmt.go

@@ -117,5 +117,10 @@ func (s *Stmt) query(ctx context.Context, bindings map[string]sqlparser.Expr) (d
 		return nil, err
 	}
 
-	return &Rows{s.conn.options, qctx, cols, rows}, nil
+	return &Rows{
+		options: s.conn.options,
+		ctx:     qctx,
+		cols:    cols,
+		rows:    rows,
+	}, nil
 }

engine.go

@@ -53,16 +53,16 @@ func init() {
 type Config struct {
 	// VersionPostfix to display with the `VERSION()` UDF.
 	VersionPostfix string
+	// TemporaryUsers adds any users that should be included when the engine is created. By default, authentication is
+	// disabled, and including any users here will enable authentication. All users in this list will have full access.
+	// This field is only temporary, and will be removed as development on users and authentication continues.
+	TemporaryUsers []TemporaryUser
 	// IsReadOnly sets the engine to disallow modification queries.
 	IsReadOnly     bool
 	IsServerLocked bool
 	// IncludeRootAccount adds the root account (with no password) to the list of accounts, and also enables
 	// authentication.
 	IncludeRootAccount bool
-	// TemporaryUsers adds any users that should be included when the engine is created. By default, authentication is
-	// disabled, and including any users here will enable authentication. All users in this list will have full access.
-	// This field is only temporary, and will be removed as development on users and authentication continues.
-	TemporaryUsers []TemporaryUser
 }
 
 // TemporaryUser is a user that will be added to the engine. This is for temporary use while the remaining features
@@ -136,18 +136,18 @@ func (p *PreparedDataCache) UncacheStmt(sessId uint32, query string) {
 
 // Engine is a SQL engine.
 type Engine struct {
+	Parser            sql.Parser
+	ProcessList       sql.ProcessList
 	Analyzer          *analyzer.Analyzer
 	LS                *sql.LockSubsystem
-	ProcessList       sql.ProcessList
 	MemoryManager     *sql.MemoryManager
 	BackgroundThreads *sql.BackgroundThreads
-	ReadOnly          atomic.Bool
-	IsServerLocked    bool
 	PreparedDataCache *PreparedDataCache
 	mu                *sync.Mutex
-	Version           sql.AnalyzerVersion
 	EventScheduler    *eventscheduler.EventScheduler
-	Parser            sql.Parser
+	ReadOnly          atomic.Bool
+	IsServerLocked    bool
+	Version           sql.AnalyzerVersion
 }
 
 var _ sql.StatementRunner = (*Engine)(nil)

enginetest/enginetests.go

@@ -866,43 +866,7 @@ func TestOrderByGroupBy(t *testing.T, harness Harness) {
 		}
 		require.Equal(t, rowCount, 3)
 
-		// TODO: this should error; the order by doesn't count towards ONLY_FULL_GROUP_BY
-		_, rowIter, _, err = e.Query(ctx, "select id, team from members group by team order by id")
-		require.NoError(t, err)
-		rowCount = 0
-		for {
-			row, err = rowIter.Next(ctx)
-			if err == io.EOF {
-				break
-			}
-			rowCount++
-			require.NoError(t, err)
-
-			var val int64
-			switch v := row[0].(type) {
-			case int64:
-				val = v
-			case int32:
-				val = int64(v)
-			default:
-				panic(fmt.Sprintf("unexpected type %T", v))
-			}
-
-			team, ok, err := sql.Unwrap[string](ctx, row[1])
-			require.True(t, ok)
-			require.NoError(t, err)
-			switch team {
-			case "red":
-				require.True(t, val == 3 || val == 4)
-			case "orange":
-				require.True(t, val == 5 || val == 6 || val == 7)
-			case "purple":
-				require.True(t, val == 8)
-			default:
-				panic("received non-existent team")
-			}
-		}
-		require.Equal(t, rowCount, 3)
+		AssertErr(t, e, harness, "select id, team from members group by team order by id", nil, analyzererrors.ErrValidationGroupBy)
 	})
 }
 
@@ -4586,8 +4550,8 @@ func TestPreparedStatements(t *testing.T, harness Harness) {
 	e := mustNewEngine(t, harness)
 	defer e.Close()
 
-	for _, query := range queries.PreparedScriptTests {
-		TestScript(t, harness, query)
+	for _, script := range queries.PreparedScriptTests {
+		TestScript(t, harness, script)
 	}
 }
 
@@ -4597,6 +4561,9 @@ func TestShowTableStatus(t *testing.T, harness Harness) {
 	for _, tt := range queries.ShowTableStatusQueries {
 		TestQuery(t, harness, tt.Query, tt.Expected, nil, nil)
 	}
+	for _, script := range queries.ShowTableStatusScripts {
+		TestScript(t, harness, script)
+	}
 }
 
 func TestDateParse(t *testing.T, harness Harness) {

enginetest/join_planning_tests.go

@@ -512,7 +512,7 @@ order by 1;`,
 			},
 			{
 				// group by doesn't transform
-				q:     "select * from xy where y-1 in (select u from uv group by v having v = 2 order by 1) order by 1;",
+				q:     "select * from xy where y-1 in (select u from uv group by u having u = 2 order by 1) order by 1;",
 				types: []plan.JoinType{plan.JoinTypeSemi},
 				exp:   []sql.Row{{3, 3}},
 			},

enginetest/queries/check_scripts.go

@@ -540,16 +540,36 @@ var ChecksOnUpdateScriptTests = []ScriptTest{
 		},
 		Assertions: []ScriptTestAssertion{
 			{
-				Query:    "UPDATE sales JOIN (SELECT year_built FROM sales) AS t ON sales.year_built = t.year_built SET sales.year_built = 1901;",
-				Expected: []sql.Row{{types.OkResult{1, 0, plan.UpdateInfo{1, 1, 0}}}},
+				Query: "UPDATE sales JOIN (SELECT year_built FROM sales) AS t ON sales.year_built = t.year_built SET sales.year_built = 1901;",
+				Expected: []sql.Row{
+					{
+						types.OkResult{
+							RowsAffected: 1,
+							Info: plan.UpdateInfo{
+								Matched: 1,
+								Updated: 1,
+							},
+						},
+					},
+				},
 			},
 			{
 				Query:    "select * from sales;",
 				Expected: []sql.Row{{1901}},
 			},
 			{
-				Query:    "UPDATE sales as s1 JOIN (SELECT year_built FROM sales) AS t SET S1.year_built = 1902;",
-				Expected: []sql.Row{{types.OkResult{1, 0, plan.UpdateInfo{1, 1, 0}}}},
+				Query: "UPDATE sales as s1 JOIN (SELECT year_built FROM sales) AS t SET S1.year_built = 1902;",
+				Expected: []sql.Row{
+					{
+						types.OkResult{
+							RowsAffected: 1,
+							Info: plan.UpdateInfo{
+								Matched: 1,
+								Updated: 1,
+							},
+						},
+					},
+				},
 			},
 			{
 				Query:    "select * from sales;",
@@ -599,8 +619,18 @@ var ChecksOnUpdateScriptTests = []ScriptTest{
 				Expected: []sql.Row{{"WA"}},
 			},
 			{
-				Query:    "UPDATE sales JOIN locations SET sales.year_built = 2000, locations.state = 'CA';",
-				Expected: []sql.Row{{types.OkResult{2, 0, plan.UpdateInfo{2, 2, 0}}}},
+				Query: "UPDATE sales JOIN locations SET sales.year_built = 2000, locations.state = 'CA';",
+				Expected: []sql.Row{
+					{
+						types.OkResult{
+							RowsAffected: 2,
+							Info: plan.UpdateInfo{
+								Matched: 2,
+								Updated: 2,
+							},
+						},
+					},
+				},
 			},
 			{
 				Query:    "select * from sales;",

enginetest/queries/column_alias_queries.go

@@ -210,6 +210,10 @@ var ColumnAliasQueries = []ScriptTest{
 				Query:    "SELECT 1 as a, (select a) as b;",
 				Expected: []sql.Row{{1, 1}},
 			},
+			{
+				Query:    `SELECT 1 as a, (select a union select a) as b;`,
+				Expected: []sql.Row{{1, 1}},
+			},
 			{
 				Query:    "SELECT 1 as a, (select a) as b from dual;",
 				Expected: []sql.Row{{1, 1}},
@@ -226,6 +230,22 @@ var ColumnAliasQueries = []ScriptTest{
 				Query:    "SELECT 1 as a, (select a) from xy;",
 				Expected: []sql.Row{{1, 1}, {1, 1}, {1, 1}, {1, 1}},
 			},
+			{
+				// https://github.com/dolthub/dolt/issues/4256
+				Query: `SELECT *, (select i union select i) as a from mytable;`,
+				Expected: []sql.Row{
+					{1, "first row", 1},
+					{2, "second row", 2},
+					{3, "third row", 3}},
+			},
+			{
+				Query:    "select 1 as b, (select b group by b order by b) order by 1;",
+				Expected: []sql.Row{{1, 1}},
+			},
+			{
+				Query:       `select 1 as a, (select b), 0 as b;`,
+				ExpectedErr: sql.ErrColumnNotFound,
+			},
 		},
 	},
 	{
@@ -245,39 +265,15 @@ var ColumnAliasQueries = []ScriptTest{
 	},
 	{
 		Name: "various broken alias queries",
+		Skip: true,
 		Assertions: []ScriptTestAssertion{
-			{
-				// The second query in the union subquery returns "x" instead of mytable.i
-				// https://github.com/dolthub/dolt/issues/4256
-				Query: `SELECT *, (select i union select i) as a from mytable;`,
-				Expected: []sql.Row{
-					{1, "first row", 1},
-					{2, "second row", 2},
-					{3, "third row", 3}},
-			},
-			{
-				Query:    `SELECT 1 as a, (select a union select a) as b;`,
-				Expected: []sql.Row{{1, 1}},
-			},
-			{
-				// GMS executes this query, but it is not valid because of the forward ref of alias b.
-				// GMS should return an error about an invalid forward-ref.
-				Skip:        true,
-				Query:       `select 1 as a, (select b), 0 as b;`,
-				ExpectedErr: sql.ErrColumnNotFound,
-			},
 			{
 				// GMS returns "expression 'dt.two' doesn't appear in the group by expressions", but MySQL will execute
 				// this query.
 				Query: "select 1 as a, one + 1 as mod1, dt.* from mytable as t1, (select 1, 2 from mytable) as dt (one, two) where dt.one > 0 group by one;",
 				// column names:  a, mod1, one, two
 				Expected: []sql.Row{{1, 2, 1, 2}},
 			},
-			{
-				// GMS returns `ambiguous column or alias name "b"` on both cases of `group by b` and `group by 1` inside subquery, but MySQL executes.
-				Query:    "select 1 as b, (select b group by b order by b) order by 1;",
-				Expected: []sql.Row{{1, 1}},
-			},
 		},
 	},
 }