From e6c03d6c14a6fe15f3f1f44ad88c13f26c391fa5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 May 2023 19:41:43 +0000 Subject: [PATCH] Bump vitess.io/vitess from 0.16.1 to 0.16.2 Bumps [vitess.io/vitess](https://github.com/vitessio/vitess) from 0.16.1 to 0.16.2. - [Release notes](https://github.com/vitessio/vitess/releases) - [Changelog](https://github.com/vitessio/vitess/blob/main/docker/Dockerfile.release) - [Commits](https://github.com/vitessio/vitess/compare/v0.16.1...v0.16.2) --- updated-dependencies: - dependency-name: vitess.io/vitess dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- vendor/modules.txt | 2 +- vendor/vitess.io/vitess/go/vt/servenv/servenv.go | 1 + vendor/vitess.io/vitess/go/vt/servenv/version.go | 2 +- .../vitess.io/vitess/go/vt/sqlparser/ast_rewriting.go | 11 +++++++++-- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index fff8652d..051e6e0b 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( google.golang.org/grpc v1.55.0 gopkg.in/yaml.v2 v2.4.0 software.sslmate.com/src/go-pkcs12 v0.0.0-20200830195227-52f69702a001 - vitess.io/vitess v0.16.1 + vitess.io/vitess v0.16.2 ) require ( diff --git a/go.sum b/go.sum index 3f6245d4..ad2a00f0 100644 --- a/go.sum +++ b/go.sum @@ -579,5 +579,5 @@ k8s.io/apimachinery v0.26.1 h1:8EZ/eGJL+hY/MYCNwhmDzVqq2lPl3N3Bo8rvweJwXUQ= k8s.io/apimachinery v0.26.1/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74= software.sslmate.com/src/go-pkcs12 v0.0.0-20200830195227-52f69702a001 h1:AVd6O+azYjVQYW1l55IqkbL8/JxjrLtO6q4FCmV8N5c= software.sslmate.com/src/go-pkcs12 v0.0.0-20200830195227-52f69702a001/go.mod h1:/xvNRWUqm0+/ZMiF4EX00vrSCMsE4/NHb+Pt3freEeQ= -vitess.io/vitess v0.16.1 h1:4jyOxT+FOIZiqBIyfxuXmMlV8AZt/FeJwr/bwyqbQuA= -vitess.io/vitess v0.16.1/go.mod h1:Ennjgg9bMpYbSKqh7TSQJFZdFKtUUUXO0QW8qcjxkBQ= +vitess.io/vitess v0.16.2 h1:vu6xCrM2GpQuX03Nwhb20P8xAh9jCIJy0FESkr3Ohjw= +vitess.io/vitess v0.16.2/go.mod h1:Ennjgg9bMpYbSKqh7TSQJFZdFKtUUUXO0QW8qcjxkBQ= diff --git a/vendor/modules.txt b/vendor/modules.txt index e7c6b64a..fe74e7c7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -515,7 +515,7 @@ k8s.io/apimachinery/pkg/util/sets ## explicit software.sslmate.com/src/go-pkcs12 software.sslmate.com/src/go-pkcs12/internal/rc2 -# vitess.io/vitess v0.16.1 +# vitess.io/vitess v0.16.2 ## explicit; go 1.20 vitess.io/vitess/go/acl vitess.io/vitess/go/bytes2 diff --git a/vendor/vitess.io/vitess/go/vt/servenv/servenv.go b/vendor/vitess.io/vitess/go/vt/servenv/servenv.go index 9f3d63f1..03b29736 100644 --- a/vendor/vitess.io/vitess/go/vt/servenv/servenv.go +++ b/vendor/vitess.io/vitess/go/vt/servenv/servenv.go @@ -399,6 +399,7 @@ func init() { "vtgate", "vtgateclienttest", "vtgr", + "vtorc", "vttablet", "vttestserver", } { diff --git a/vendor/vitess.io/vitess/go/vt/servenv/version.go b/vendor/vitess.io/vitess/go/vt/servenv/version.go index e5b12224..6119012b 100644 --- a/vendor/vitess.io/vitess/go/vt/servenv/version.go +++ b/vendor/vitess.io/vitess/go/vt/servenv/version.go @@ -19,4 +19,4 @@ package servenv // THIS FILE IS AUTO-GENERATED DURING NEW RELEASES BY ./tools/do_releases.sh // DO NOT EDIT -const versionName = "16.0.1" +const versionName = "16.0.2" diff --git a/vendor/vitess.io/vitess/go/vt/sqlparser/ast_rewriting.go b/vendor/vitess.io/vitess/go/vt/sqlparser/ast_rewriting.go index 9a66202e..1e7029e3 100644 --- a/vendor/vitess.io/vitess/go/vt/sqlparser/ast_rewriting.go +++ b/vendor/vitess.io/vitess/go/vt/sqlparser/ast_rewriting.go @@ -564,12 +564,19 @@ var funcRewrites = map[string]string{ } func (er *astRewriter) funcRewrite(cursor *Cursor, node *FuncExpr) { - bindVar, found := funcRewrites[node.Name.Lowered()] + lowered := node.Name.Lowered() + if lowered == "last_insert_id" && len(node.Exprs) > 0 { + // if we are dealing with is LAST_INSERT_ID() with an argument, we don't need to rewrite it. + // with an argument, this is an identity function that will update the session state and + // sets the correct fields in the OK TCP packet that we send back + return + } + bindVar, found := funcRewrites[lowered] if !found || (bindVar == DBVarName && !er.shouldRewriteDatabaseFunc) { return } if len(node.Exprs) > 0 { - er.err = vterrors.Errorf(vtrpcpb.Code_UNIMPLEMENTED, "Argument to %s() not supported", node.Name.Lowered()) + er.err = vterrors.Errorf(vtrpcpb.Code_UNIMPLEMENTED, "Argument to %s() not supported", lowered) return } cursor.Replace(bindVarExpression(bindVar))