bump

dolthub · Aug 6, 2024 · 652f17d · 652f17d
1 parent b9f027f
commit 652f17d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/conn.go b/conn.go
@@ -98,7 +98,7 @@ func (d *DoltConn) BeginTx(ctx context.Context, opts driver.TxOptions) (driver.T
 		return nil, fmt.Errorf("isolation level not supported '%d'", opts.Isolation)
 	}
 
-	_, _, err := d.se.Query(d.gmsCtx, "BEGIN;")
+	_, _, _, err := d.se.Query(d.gmsCtx, "BEGIN;")
 	if err != nil {
 		return nil, translateError(err)
 	}

diff --git a/go.mod b/go.mod
@@ -5,8 +5,8 @@ go 1.22.2
 toolchain go1.22.3
 
 require (
-	github.com/dolthub/dolt/go v0.40.5-0.20240806002129-fac6cd4a8cda
-	github.com/dolthub/go-mysql-server v0.18.2-0.20240805192034-f695d9f43e13
+	github.com/dolthub/dolt/go v0.40.5-0.20240806193947-d2c5f5cd646f
+	github.com/dolthub/go-mysql-server v0.18.2-0.20240806192518-d88bd6d1bd52
 	github.com/dolthub/vitess v0.0.0-20240730224954-d707fadb2e04
 	github.com/go-sql-driver/mysql v1.7.2-0.20231213112541-0004702b931d
 	github.com/stretchr/testify v1.8.4

diff --git a/go.sum b/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.20240806002129-fac6cd4a8cda h1:2bVjxGQvRq0aKI8O0Ae8FtDqwTpML3xMuavc+I56GsU=
-github.com/dolthub/dolt/go v0.40.5-0.20240806002129-fac6cd4a8cda/go.mod h1:zpxMlnxQK+3criuF+NT/XLkAvM/nmoMD2qU6F0MLSTk=
+github.com/dolthub/dolt/go v0.40.5-0.20240806193947-d2c5f5cd646f h1:bIZgaIo9k4bwbnFFUzgmniDxTw0LVnBO4ETjZOPQMFU=
+github.com/dolthub/dolt/go v0.40.5-0.20240806193947-d2c5f5cd646f/go.mod h1:MzVfv9HJEEw6WJEZmRb1k/iZU1jHY+szHe4bJjd84JM=
 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=
@@ -258,8 +258,8 @@ 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.20240805192034-f695d9f43e13 h1:+4GBYKWeLvVGL8Wi9WbEP86/pQhM0sTGOQStCBey/Z8=
-github.com/dolthub/go-mysql-server v0.18.2-0.20240805192034-f695d9f43e13/go.mod h1:IvXmiR+fvWQs27nNmp0XuTO7ze6j6ekrVkhWw+3qo2s=
+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/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=

diff --git a/statement.go b/statement.go
@@ -134,7 +134,7 @@ func (stmt *doltStmt) execWithArgs(args []driver.Value) (gms.Schema, gms.RowIter
 		return nil, nil, err
 	}
 
-	sch, itr, err := stmt.se.GetUnderlyingEngine().QueryWithBindings(stmt.gmsCtx, stmt.query, nil, bindings, nil)
+	sch, itr, _, err := stmt.se.GetUnderlyingEngine().QueryWithBindings(stmt.gmsCtx, stmt.query, nil, bindings, nil)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -150,7 +150,7 @@ func (stmt *doltStmt) Query(args []driver.Value) (driver.Rows, error) {
 	if len(args) != 0 {
 		sch, rowIter, err = stmt.execWithArgs(args)
 	} else {
-		sch, rowIter, err = stmt.se.Query(stmt.gmsCtx, stmt.query)
+		sch, rowIter, _, err = stmt.se.Query(stmt.gmsCtx, stmt.query)
 	}
 	if err != nil {
 		return nil, translateError(err)

diff --git a/transaction.go b/transaction.go
@@ -15,12 +15,12 @@ type doltTx struct {
 
 // Commit finishes the transaction.
 func (tx *doltTx) Commit() error {
-	_, _, err := tx.se.Query(tx.gmsCtx, "COMMIT;")
+	_, _, _, err := tx.se.Query(tx.gmsCtx, "COMMIT;")
 	return translateError(err)
 }
 
 // Rollback cancels the transaction.
 func (tx *doltTx) Rollback() error {
-	_, _, err := tx.se.Query(tx.gmsCtx, "ROLLBACK;")
+	_, _, _, err := tx.se.Query(tx.gmsCtx, "ROLLBACK;")
 	return translateError(err)
 }