bump dolt and gms

go.mod

@@ -5,9 +5,9 @@ go 1.22.2
 toolchain go1.22.3
 
 require (
-	github.com/dolthub/dolt/go v0.40.5-0.20240806200513-594fd2d2d772
-	github.com/dolthub/go-mysql-server v0.18.2-0.20240806192518-d88bd6d1bd52
-	github.com/dolthub/vitess v0.0.0-20240730224954-d707fadb2e04
+	github.com/dolthub/dolt/go v0.40.5-0.20240918224257-88ae8c98593a
+	github.com/dolthub/go-mysql-server v0.18.2-0.20240918214853-7e76e21750a6
+	github.com/dolthub/vitess v0.0.0-20240916204416-9d4d4a09b1d9
 	github.com/go-sql-driver/mysql v1.7.2-0.20231213112541-0004702b931d
 	github.com/stretchr/testify v1.8.4
 	gorm.io/driver/mysql v1.5.6
@@ -34,7 +34,7 @@ require (
 	github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20240212175631-02e9f99a3a9b // indirect
 	github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 // indirect
 	github.com/dolthub/fslock v0.0.3 // indirect
-	github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e // indirect
+	github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662 // indirect
 	github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 // indirect
 	github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 // indirect
 	github.com/dolthub/maphash v0.1.0 // indirect

go.sum

@@ -246,8 +246,8 @@ github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQ
 github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=
 github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/dolthub/dolt/go v0.40.5-0.20240806200513-594fd2d2d772 h1:MwfujvqGQkhjn7+EBgcRtDT2/NVmvl/sDsI7rxaQjkQ=
-github.com/dolthub/dolt/go v0.40.5-0.20240806200513-594fd2d2d772/go.mod h1:MzVfv9HJEEw6WJEZmRb1k/iZU1jHY+szHe4bJjd84JM=
+github.com/dolthub/dolt/go v0.40.5-0.20240918224257-88ae8c98593a h1:PkWAP7KQ954Plu1qkEYJFTKZVNsud6Vf1sRNzSr6Pmg=
+github.com/dolthub/dolt/go v0.40.5-0.20240918224257-88ae8c98593a/go.mod h1:BQ/uK6QhfC8A0Lfik3JIwdVRY/JyGDsOJt1FkSvqEUk=
 github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20240212175631-02e9f99a3a9b h1:VehmKUF425NgXpRQVYMPzJx6rWZaJ2cbTwTTwXlrbiM=
 github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20240212175631-02e9f99a3a9b/go.mod h1:gHeHIDGU7em40EhFTliq62pExFcc1hxDTIZ9g5UqXYM=
 github.com/dolthub/flatbuffers v1.13.0-dh.1 h1:OWJdaPep22N52O/0xsUevxJ6Qfw1M2txCjZPOdjXybE=
@@ -256,10 +256,10 @@ github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 h1:u3PMzfF8RkKd3lB9pZ2bfn0qEG+1G
 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2/go.mod h1:mIEZOHnFx4ZMQeawhw9rhsj+0zwQj7adVsnBX7t+eKY=
 github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U=
 github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0=
-github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e h1:kPsT4a47cw1+y/N5SSCkma7FhAPw7KeGmD6c9PBZW9Y=
-github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e/go.mod h1:KPUcpx070QOfJK1gNe0zx4pA5sicIK1GMikIGLKC168=
-github.com/dolthub/go-mysql-server v0.18.2-0.20240806192518-d88bd6d1bd52 h1:h6LTXOEumUyHrVyTQ/Wcx2XBqkZRulz4FcH1mny6nj4=
-github.com/dolthub/go-mysql-server v0.18.2-0.20240806192518-d88bd6d1bd52/go.mod h1:IvXmiR+fvWQs27nNmp0XuTO7ze6j6ekrVkhWw+3qo2s=
+github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662 h1:aC17hZD6iwzBwwfO5M+3oBT5E5gGRiQPdn+vzpDXqIA=
+github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662/go.mod h1:KPUcpx070QOfJK1gNe0zx4pA5sicIK1GMikIGLKC168=
+github.com/dolthub/go-mysql-server v0.18.2-0.20240918214853-7e76e21750a6 h1:bqXlOmbV1cX3G83xLz4+czZUsAn4Fp2hRsypkz6N1fM=
+github.com/dolthub/go-mysql-server v0.18.2-0.20240918214853-7e76e21750a6/go.mod h1:m88EMm9OthVVa6qIhbpnRDpj/eYUXuNpvY/+0YWKVwc=
 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI=
 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q=
 github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE=
@@ -270,8 +270,8 @@ github.com/dolthub/maphash v0.1.0 h1:bsQ7JsF4FkkWyrP3oCnFJgrCUAFbFf3kOl4L/QxPDyQ
 github.com/dolthub/maphash v0.1.0/go.mod h1:gkg4Ch4CdCDu5h6PMriVLawB7koZ+5ijb9puGMV50a4=
 github.com/dolthub/swiss v0.2.1 h1:gs2osYs5SJkAaH5/ggVJqXQxRXtWshF6uE0lgR/Y3Gw=
 github.com/dolthub/swiss v0.2.1/go.mod h1:8AhKZZ1HK7g18j7v7k6c5cYIGEZJcPn0ARsai8cUrh0=
-github.com/dolthub/vitess v0.0.0-20240730224954-d707fadb2e04 h1:2uejd/7c93uwExCGeZDzU5uiOaGqfJ1Tlse7mxziXzQ=
-github.com/dolthub/vitess v0.0.0-20240730224954-d707fadb2e04/go.mod h1:uBvlRluuL+SbEWTCZ68o0xvsdYZER3CEG/35INdzfJM=
+github.com/dolthub/vitess v0.0.0-20240916204416-9d4d4a09b1d9 h1:2My8cED5m5/sFay7U4bvLxpECJccKj0cEKCqEA+63yU=
+github.com/dolthub/vitess v0.0.0-20240916204416-9d4d4a09b1d9/go.mod h1:uBvlRluuL+SbEWTCZ68o0xvsdYZER3CEG/35INdzfJM=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=

statement.go

@@ -2,13 +2,13 @@ package embedded
 
 import (
 	"database/sql/driver"
+	"github.com/dolthub/vitess/go/vt/sqlparser"
 	"strconv"
 
 	"github.com/dolthub/dolt/go/cmd/dolt/commands/engine"
 	gms "github.com/dolthub/go-mysql-server/sql"
 	"github.com/dolthub/go-mysql-server/sql/types"
 	"github.com/dolthub/vitess/go/sqltypes"
-	querypb "github.com/dolthub/vitess/go/vt/proto/query"
 )
 
 // doltMultiStmt represents a collection of statements to be executed against a
@@ -99,12 +99,19 @@ func (stmt *doltStmt) NumInput() int {
 	return -1
 }
 
-func argsToBindings(args []driver.Value) (map[string]*querypb.BindVariable, error) {
-	bindings := make(map[string]*querypb.BindVariable)
-	var err error
+func argsToBindings(args []driver.Value) (map[string]sqlparser.Expr, error) {
+	bindings := make(map[string]sqlparser.Expr)
 	for i := range args {
 		vIdx := "v" + strconv.FormatInt(int64(i+1), 10)
-		bindings[vIdx], err = sqltypes.BuildBindVariable(args[i])
+		bv, err := sqltypes.BuildBindVariable(args[i])
+		if err != nil {
+			return nil, err
+		}
+		v, err := sqltypes.BindVariableToValue(bv)
+		if err != nil {
+			return nil, err
+		}
+		bindings[vIdx], err = sqlparser.ExprFromValue(v)
 		if err != nil {
 			return nil, err
 		}