Merge branch 'main' into elian/9738

Author: elianddb

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/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/function_queries.go

@@ -1529,3 +1529,16 @@ var FunctionQueryTests = []QueryTest{
 		},
 	},
 }
+
+// BrokenFunctionQueryTests contains SQL function call queries that don't match MySQL behavior
+var BrokenFunctionQueryTests = []QueryTest{
+	// https://github.com/dolthub/dolt/issues/9735
+	{
+		Query:    "select log('10asdf', '100f')",
+		Expected: []sql.Row{{float64(2)}},
+	},
+	{
+		Query:    "select log('a10asdf', 'b100f')",
+		Expected: []sql.Row{{nil}},
+	},
+}

enginetest/queries/logic_test_scripts.go

@@ -951,7 +951,6 @@ var SQLLogicSubqueryTests = []ScriptTest{
 				},
 			},
 			{
-				Skip:  true,
 				Query: "SELECT * FROM (SELECT c_id AS c_c_id, bill FROM c) sq1, LATERAL (SELECT row_number() OVER () AS rownum FROM o WHERE c_id = c_c_id) sq2 ORDER BY c_c_id, bill, rownum;",
 				Expected: []sql.Row{
 					{1, "CA", 1},