Skip to content

Add support for UPDATE ... RETURNING #1432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fulghum merged 5 commits into from
Apr 29, 2025
Merged

Add support for UPDATE ... RETURNING #1432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e7f70f8
Add support for UPDATE ... RETURNING
fulghum Apr 24, 2025
a20d77e
Update GMS dep to latest from fulghum/returning dev branch
fulghum Apr 25, 2025
4054081
PR Feedback: making test update statement more complex
fulghum Apr 28, 2025
b2e3a2d
[ga-bump-dep] Bump dependency in Doltgres by fulghum
fulghum Apr 29, 2025
13a09f2
Merge remote-tracking branch 'origin/fulghum-1fa4dcfa' into fulghum/u…
fulghum Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ require (
github.com/PuerkitoBio/goquery v1.8.1
github.com/cockroachdb/apd/v2 v2.0.3-0.20200518165714-d020e156310a
github.com/cockroachdb/errors v1.7.5
github.com/dolthub/dolt/go v0.40.5-0.20250423233358-e6c48f54f70d
github.com/dolthub/dolt/go v0.40.5-0.20250429163255-1fa4dcfad6a8
github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20241119094239-f4e529af734d
github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad
github.com/dolthub/go-mysql-server v0.19.1-0.20250423225005-2d6449f73e2b
github.com/dolthub/go-mysql-server v0.19.1-0.20250428224756-b9931b05c831
github.com/dolthub/sqllogictest/go v0.0.0-20240618184124-ca47f9354216
github.com/dolthub/vitess v0.0.0-20250423221552-f731ee5c5379
github.com/fatih/color v1.13.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,8 @@ github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5Xh
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 h1:IdqX7J8vi/Kn3T3Ee0VzqnLqwFmgA2hr8WZETPcQjfM=
github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12/go.mod h1:rN7X8BHwkjPcfMQQ2QTAq/xM3leUSGLfb+1Js7Y6TVo=
github.com/dolthub/dolt/go v0.40.5-0.20250423233358-e6c48f54f70d h1:XT1QmzRJQNK75a7GQhzDe7eC3xmRcIR5Xoe4NcMzOSw=
github.com/dolthub/dolt/go v0.40.5-0.20250423233358-e6c48f54f70d/go.mod h1:XxLHtstDsMs2+xun7cqm9TCGMYeerQsk/7FbZFgqu4s=
github.com/dolthub/dolt/go v0.40.5-0.20250429163255-1fa4dcfad6a8 h1:dm1BhbkVH4TSLvDcMrx9BRapVp+HTQ2eMHT7/ssfPk8=
github.com/dolthub/dolt/go v0.40.5-0.20250429163255-1fa4dcfad6a8/go.mod h1:ICR1s77Y61/irQgd4EYpRGZMDCBGJ8G1uLm/4HUSgyU=
github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20241119094239-f4e529af734d h1:gO9+wrmNHXukPNCO1tpfCcXIdMlW/qppbUStfLvqz/U=
github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20241119094239-f4e529af734d/go.mod h1:L5RDYZbC9BBWmoU2+TjTekeqqhFXX5EqH9ln00O0stY=
github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 h1:u3PMzfF8RkKd3lB9pZ2bfn0qEG+1Gms9599cr0REMww=
Expand All @@ -266,8 +266,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-20250327004329-6799764f2dad h1:66ZPawHszNu37VPQckdhX1BPPVzREsGgNxQeefnlm3g=
github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA=
github.com/dolthub/go-mysql-server v0.19.1-0.20250423225005-2d6449f73e2b h1:kgKEFYkLTErT+VE4jqZsoEeq1hSKeXAOnPZA/8tDIyI=
github.com/dolthub/go-mysql-server v0.19.1-0.20250423225005-2d6449f73e2b/go.mod h1:skB7lRdqgWVqDZ/ih/DtX8iSvK15IaxRf2ASliUwgtE=
github.com/dolthub/go-mysql-server v0.19.1-0.20250428224756-b9931b05c831 h1:SxQunmO7PM6h7Tp/xaOpBv3YPX2WdZmNAUzW7ywFRio=
github.com/dolthub/go-mysql-server v0.19.1-0.20250428224756-b9931b05c831/go.mod h1:skB7lRdqgWVqDZ/ih/DtX8iSvK15IaxRf2ASliUwgtE=
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=
Expand Down
12 changes: 9 additions & 3 deletions server/ast/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,21 @@ import (
)

// nodeUpdate handles *tree.Update nodes.
func nodeUpdate(ctx *Context, node *tree.Update) (*vitess.Update, error) {
func nodeUpdate(ctx *Context, node *tree.Update) (update *vitess.Update, err error) {
if node == nil {
return nil, nil
}
ctx.Auth().PushAuthType(auth.AuthType_UPDATE)
defer ctx.Auth().PopAuthType()

if _, ok := node.Returning.(*tree.NoReturningClause); !ok {
return nil, errors.Errorf("RETURNING is not yet supported")
var returningExprs vitess.SelectExprs
if returning, ok := node.Returning.(*tree.ReturningExprs); ok {
returningExprs, err = nodeSelectExprs(ctx, tree.SelectExprs(*returning))
if err != nil {
return nil, err
}
}

if len(node.From) > 0 {
return nil, errors.Errorf("FROM is not yet supported")
}
Expand Down Expand Up @@ -68,5 +73,6 @@ func nodeUpdate(ctx *Context, node *tree.Update) (*vitess.Update, error) {
Where: where,
OrderBy: orderBy,
Limit: limit,
Returning: returningExprs,
}, nil
}
38 changes: 24 additions & 14 deletions server/connection_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1137,21 +1137,31 @@ func returnsRow(query ConvertedQuery) bool {
switch query.StatementTag {
case "SELECT", "SHOW", "FETCH", "EXPLAIN", "SHOW TABLES":
return true
case "INSERT":
hasReturningClause := false
sqlparser.Walk(func(node sqlparser.SQLNode) (kontinue bool, err error) {
switch node := node.(type) {
case *sqlparser.Insert:
if len(node.Returning) > 0 {
hasReturningClause = true
}
return false, nil
}
// this should be impossible, but just in case
return true, nil
}, query.AST)
return hasReturningClause
case "INSERT", "UPDATE", "DELETE":
return hasReturningClause(query.AST)
default:
return false
}
}

// hasReturningClause return true if |statement| has a RETURNING clause defined.
func hasReturningClause(statement sqlparser.Statement) bool {
hasReturningClause := false
sqlparser.Walk(func(node sqlparser.SQLNode) (kontinue bool, err error) {
switch node := node.(type) {
case *sqlparser.Update:
if len(node.Returning) > 0 {
hasReturningClause = true
}
return false, nil
case *sqlparser.Insert:
if len(node.Returning) > 0 {
hasReturningClause = true
}
return false, nil
}
return true, nil
}, statement)

return hasReturningClause
}
Loading