Merge branch 'main' into jennifer/tbl-func-wrapper

Author: jennifersp

_example/main_test.go

@@ -17,13 +17,14 @@ package main
 import (
 	"database/sql"
 	"fmt"
-	"net"
 	"testing"
 
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/gocraft/dbr/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	gms "github.com/dolthub/go-mysql-server/sql"
 )
 
 var expectedResults = [][]string{
@@ -35,7 +36,8 @@ var expectedResults = [][]string{
 
 func TestExampleUsersDisabled(t *testing.T) {
 	enableUsers = false
-	useUnusedPort(t)
+	_, err := gms.GetEmptyPort()
+	require.NoError(t, err)
 	go func() {
 		main()
 	}()
@@ -53,7 +55,8 @@ func TestExampleUsersDisabled(t *testing.T) {
 func TestExampleRootUserEnabled(t *testing.T) {
 	enableUsers = true
 	pretendThatFileExists = false
-	useUnusedPort(t)
+	_, err := gms.GetEmptyPort()
+	require.NoError(t, err)
 	go func() {
 		main()
 	}()
@@ -74,7 +77,8 @@ func TestExampleRootUserEnabled(t *testing.T) {
 func TestExampleLoadedUser(t *testing.T) {
 	enableUsers = true
 	pretendThatFileExists = true
-	useUnusedPort(t)
+	_, err := gms.GetEmptyPort()
+	require.NoError(t, err)
 	go func() {
 		main()
 	}()
@@ -99,7 +103,8 @@ func TestExampleLoadedUser(t *testing.T) {
 func TestIssue1621(t *testing.T) {
 	// This is an issue that is specific to using the example server, as this is not a logic issue but a setup issue
 	enableUsers = true
-	useUnusedPort(t)
+	_, err := gms.GetEmptyPort()
+	require.NoError(t, err)
 	go func() {
 		main()
 	}()
@@ -141,11 +146,3 @@ func checkRows(t *testing.T, expectedRows [][]string, actualRows *sql.Rows) {
 	}
 	assert.NoError(t, actualRows.Close())
 }
-
-func useUnusedPort(t *testing.T) {
-	// Tests should grab an open port, otherwise they'll fail if some hardcoded port is already in use
-	listener, err := net.Listen("tcp", ":0")
-	require.NoError(t, err)
-	port = listener.Addr().(*net.TCPAddr).Port
-	require.NoError(t, listener.Close())
-}

enginetest/engine_only_test.go

@@ -19,7 +19,6 @@ import (
 	sql2 "database/sql"
 	"fmt"
 	"io"
-	"net"
 	"runtime"
 	"strings"
 	"testing"
@@ -1051,7 +1050,7 @@ func TestAlterTableWithBadSchema(t *testing.T) {
 			ctx := harness.NewContext()
 			ctx.SetCurrentDatabase("mydb")
 			_, iter, _, err := engine.Query(ctx, tt.q)
-			// errors should be analyze time, not execution time
+			// errors should analyze time, not execution time
 			if tt.err {
 				require.Error(t, err)
 			} else {
@@ -1065,14 +1064,10 @@ func TestAlterTableWithBadSchema(t *testing.T) {
 
 func newDatabase() (*sql2.DB, func()) {
 	// Grab an empty port so that tests do not fail if a specific port is already in use
-	listener, err := net.Listen("tcp", ":0")
+	port, err := sql.GetEmptyPort()
 	if err != nil {
 		panic(err)
 	}
-	port := listener.Addr().(*net.TCPAddr).Port
-	if err = listener.Close(); err != nil {
-		panic(err)
-	}
 
 	harness := enginetest.NewDefaultMemoryHarness()
 	pro := harness.Provider()

enginetest/enginetests.go

@@ -20,7 +20,6 @@ import (
 	dsql "database/sql"
 	"fmt"
 	"io"
-	"net"
 	"os"
 	"reflect"
 	"strings"
@@ -2144,7 +2143,8 @@ func TestUserAuthentication(t *testing.T, h Harness) {
 	}
 	clientHarness.Setup(setup.MydbData, setup.MytableData)
 
-	port := getEmptyPort(t)
+	port, err := sql.GetEmptyPort()
+	require.NoError(t, err)
 	for _, script := range queries.ServerAuthTests {
 		t.Run(script.Name, func(t *testing.T) {
 			ctx := NewContextWithClient(clientHarness, sql.Client{
@@ -2240,14 +2240,6 @@ func TestUserAuthentication(t *testing.T, h Harness) {
 	}
 }
 
-func getEmptyPort(t *testing.T) int {
-	listener, err := net.Listen("tcp", ":0")
-	require.NoError(t, err)
-	port := listener.Addr().(*net.TCPAddr).Port
-	require.NoError(t, listener.Close())
-	return port
-}
-
 func TestComplexIndexQueries(t *testing.T, harness Harness) {
 	harness.Setup(setup.ComplexIndexSetup...)
 	e := mustNewEngine(t, harness)
@@ -5725,7 +5717,8 @@ func testCharsetCollationWire(t *testing.T, h Harness, sessionBuilder server.Ses
 		harness.Setup(setup.MydbData)
 	}
 
-	port := getEmptyPort(t)
+	port, err := sql.GetEmptyPort()
+	require.NoError(t, err)
 	for _, script := range tests {
 		t.Run(script.Name, func(t *testing.T) {
 			serverConfig := server.Config{
@@ -5829,7 +5822,8 @@ func extractCollationIdForField(r *dsql.Rows, i int) uint64 {
 func TestTypesOverWire(t *testing.T, harness ClientHarness, sessionBuilder server.SessionBuilder) {
 	harness.Setup(setup.MydbData)
 
-	port := getEmptyPort(t)
+	port, err := sql.GetEmptyPort()
+	require.NoError(t, err)
 	for _, script := range queries.TypeWireTests {
 		t.Run(script.Name, func(t *testing.T) {
 			e := mustNewEngine(t, harness)

enginetest/queries/variable_queries.go

@@ -22,12 +22,6 @@ import (
 )
 
 var VariableQueries = []ScriptTest{
-	{
-		Name:        "use string name for foreign_key checks",
-		SetUpScript: []string{},
-		Query:       "select @@GLOBAL.unknown",
-		ExpectedErr: sql.ErrUnknownSystemVariable,
-	},
 	{
 		Name:        "use string name for foreign_key checks",
 		SetUpScript: []string{},
@@ -649,6 +643,10 @@ var VariableQueries = []ScriptTest{
 }
 
 var VariableErrorTests = []QueryErrorTest{
+	{
+		Query:       "select @@GLOBAL.unknown",
+		ExpectedErr: sql.ErrUnknownSystemVariable,
+	},
 	{
 		Query:       "set @@does_not_exist = 100",
 		ExpectedErr: sql.ErrUnknownSystemVariable,

enginetest/server_engine.go

@@ -20,7 +20,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"net"
 	"strconv"
 	"strings"
 	"testing"
@@ -61,7 +60,7 @@ func NewServerQueryEngine(t *testing.T, engine *sqle.Engine, builder server.Sess
 		panic(err)
 	}
 
-	p, err := findEmptyPort()
+	p, err := sql.GetEmptyPort()
 	if err != nil {
 		return nil, err
 	}
@@ -708,19 +707,6 @@ func prepareBindingArgs(ctx *sql.Context, bindings map[string]sqlparser.Expr) ([
 	return args, nil
 }
 
-func findEmptyPort() (int, error) {
-	listener, err := net.Listen("tcp", ":0")
-	if err != nil {
-		return -1, err
-	}
-	port := listener.Addr().(*net.TCPAddr).Port
-	if err = listener.Close(); err != nil {
-		return -1, err
-
-	}
-	return port, nil
-}
-
 func (s *ServerQueryEngine) CloseSession(connID uint32) {
 	// TODO
 }

enginetest/server_engine_test.go

@@ -5,7 +5,7 @@ import (
 	gosql "database/sql"
 	"fmt"
 	"math"
-	"net"
+	"os"
 	"testing"
 
 	"github.com/dolthub/vitess/go/mysql"
@@ -24,19 +24,6 @@ var (
 	noUserFmt = "no_user:@tcp(%s:%d)/"
 )
 
-func findEmptyPort() (int, error) {
-	listener, err := net.Listen("tcp", ":0")
-	if err != nil {
-		return -1, err
-	}
-	port := listener.Addr().(*net.TCPAddr).Port
-	if err = listener.Close(); err != nil {
-		return -1, err
-
-	}
-	return port, nil
-}
-
 // initTestServer initializes an in-memory server with the given port, but does not start it.
 func initTestServer(port int) (*server.Server, error) {
 	pro := memory.NewDBProvider()
@@ -57,7 +44,7 @@ func initTestServer(port int) (*server.Server, error) {
 
 // TestSmoke checks that an in-memory server can be started and stopped without error.
 func TestSmoke(t *testing.T) {
-	port, err := findEmptyPort()
+	port, err := sql.GetEmptyPort()
 	require.NoError(t, err)
 
 	s, err := initTestServer(port)
@@ -314,7 +301,7 @@ func TestServerPreparedStatements(t *testing.T) {
 		},
 	}
 
-	port, perr := findEmptyPort()
+	port, perr := sql.GetEmptyPort()
 	require.NoError(t, perr)
 
 	s, serr := initTestServer(port)
@@ -375,3 +362,92 @@ func TestServerPreparedStatements(t *testing.T) {
 		})
 	}
 }
+
+func TestServerVariables(t *testing.T) {
+	hostname, herr := os.Hostname()
+	require.NoError(t, herr)
+
+	port, perr := sql.GetEmptyPort()
+	require.NoError(t, perr)
+
+	s, serr := initTestServer(port)
+	require.NoError(t, serr)
+
+	go s.Start()
+	defer s.Close()
+
+	tests := []serverScriptTest{
+		{
+			name:  "test that config system variables are properly set",
+			setup: []string{},
+			assertions: []serverScriptTestAssertion{
+				{
+					query:  "select @@hostname, @@port, @@net_read_timeout, @@net_write_timeout",
+					isExec: false,
+					expectedRows: []any{
+						sql.Row{hostname, port, 1, 1},
+					},
+					checkRows: func(t *testing.T, rows *gosql.Rows, expectedRows []any) (bool, error) {
+						var resHostname string
+						var resPort int
+						var resNetReadTimeout int
+						var resNetWriteTimeout int
+						var rowNum int
+						for rows.Next() {
+							if err := rows.Scan(&resHostname, &resPort, &resNetReadTimeout, &resNetWriteTimeout); err != nil {
+								return false, err
+							}
+							if rowNum >= len(expectedRows) {
+								return false, nil
+							}
+							expectedRow := expectedRows[rowNum].(sql.Row)
+							require.Equal(t, expectedRow[0].(string), resHostname)
+							require.Equal(t, expectedRow[1].(int), resPort)
+						}
+						return true, nil
+					},
+				},
+			},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			conn, cerr := dbr.Open("mysql", fmt.Sprintf(noUserFmt, address, port), nil)
+			require.NoError(t, cerr)
+			defer conn.Close()
+			commonSetup := []string{
+				"create database test_db;",
+				"use test_db;",
+			}
+			commonTeardown := []string{
+				"drop database test_db",
+			}
+			for _, stmt := range append(commonSetup, test.setup...) {
+				_, err := conn.Exec(stmt)
+				require.NoError(t, err)
+			}
+			for _, assertion := range test.assertions {
+				t.Run(assertion.query, func(t *testing.T) {
+					if assertion.skip {
+						t.Skip()
+					}
+					rows, err := conn.Query(assertion.query, assertion.args...)
+					if assertion.expectErr {
+						require.Error(t, err)
+						return
+					}
+					require.NoError(t, err)
+
+					ok, err := assertion.checkRows(t, rows, assertion.expectedRows)
+					require.NoError(t, err)
+					require.True(t, ok)
+				})
+			}
+			for _, stmt := range append(commonTeardown) {
+				_, err := conn.Exec(stmt)
+				require.NoError(t, err)
+			}
+		})
+	}
+}

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad
 	github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71
 	github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81
-	github.com/dolthub/vitess v0.0.0-20250813175212-45844169a751
+	github.com/dolthub/vitess v0.0.0-20250814204310-c749d213f235
 	github.com/go-sql-driver/mysql v1.7.2-0.20231213112541-0004702b931d
 	github.com/gocraft/dbr/v2 v2.7.2
 	github.com/google/uuid v1.3.0

go.sum

@@ -22,6 +22,8 @@ github.com/dolthub/vitess v0.0.0-20250730174048-497aebb8cea7 h1:l+mWO0xoh4eG1J9g
 github.com/dolthub/vitess v0.0.0-20250730174048-497aebb8cea7/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70=
 github.com/dolthub/vitess v0.0.0-20250813175212-45844169a751 h1:BBQKyvyODewdQxS+ICklMn1d/fFj2pVlkmMN1QFY4ms=
 github.com/dolthub/vitess v0.0.0-20250813175212-45844169a751/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70=
+github.com/dolthub/vitess v0.0.0-20250814204310-c749d213f235 h1:uXrK+xn8rCwz/8jWDKaDyqZG1HbZI9F4V4HJ7zXFPMY=
+github.com/dolthub/vitess v0.0.0-20250814204310-c749d213f235/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=