Skip to content

Add support for RETURNING clause in bulk insert queries #11

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
tomtwinkle merged 1 commit into from
Nov 12, 2025
Merged

Add support for RETURNING clause in bulk insert queries #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 0 deletions templates/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ func buildBulkInsertQuery(originalQuery string, numArgs int, numParamsPerArg int
// Use LastIndex to find the main clause
onDuplicateUpperIndex := strings.LastIndex(strings.ToUpper(trimmedQuery), "ON DUPLICATE KEY UPDATE")
onConflictUpperIndex := strings.LastIndex(strings.ToUpper(trimmedQuery), "ON CONFLICT")
returningUpperIndex := strings.LastIndex(strings.ToUpper(trimmedQuery), "RETURNING")

// Find the earliest starting position of any suffix keyword
suffixBoundary := len(trimmedQuery)
Expand All @@ -76,6 +77,9 @@ func buildBulkInsertQuery(originalQuery string, numArgs int, numParamsPerArg int
if onConflictUpperIndex != -1 && onConflictUpperIndex < suffixBoundary {
suffixBoundary = onConflictUpperIndex
}
if returningUpperIndex != -1 && returningUpperIndex < suffixBoundary {
suffixBoundary = returningUpperIndex
}

if suffixBoundary < len(trimmedQuery) {
// Suffix found
Expand Down
48 changes: 48 additions & 0 deletions templates/template_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,30 @@ func TestBuildBulkInsertQuery(t *testing.T) {
}
},
},
"valid:upsert (ON DUPLICATE KEY UPDATE)": {
arrange: func(t *testing.T) (Args, Expected) {
return Args{
originalQuery: "INSERT INTO users (id, name) VALUES (?, ?) ON DUPLICATE KEY UPDATE id = VALUES(id), name = VALUES(name);",
numArgs: 2,
numParamsPerArg: 2,
}, Expected{
query: "INSERT INTO users (id, name) VALUES (?,?),(?,?) ON DUPLICATE KEY UPDATE id = VALUES(id), name = VALUES(name)",
err: nil,
}
},
},
"valid:upsert (ON DUPLICATE KEY UPDATE) case-insensitive": {
arrange: func(t *testing.T) (Args, Expected) {
return Args{
originalQuery: "insert into users (id, name) values (?, ?) on duplicate key update id = values(id), name = values(name);",
numArgs: 2,
numParamsPerArg: 2,
}, Expected{
query: "insert into users (id, name) VALUES (?,?),(?,?) on duplicate key update id = values(id), name = values(name)",
err: nil,
}
},
},
"valid:upsert (ON CONFLICT)": {
arrange: func(t *testing.T) (Args, Expected) {
return Args{
Expand All @@ -185,6 +209,30 @@ func TestBuildBulkInsertQuery(t *testing.T) {
}
},
},
"valid:RETURNING clause": {
arrange: func(t *testing.T) (Args, Expected) {
return Args{
originalQuery: "INSERT INTO users (id, name) VALUES (?, ?) RETURNING id;",
numArgs: 2,
numParamsPerArg: 2,
}, Expected{
query: "INSERT INTO users (id, name) VALUES (?,?),(?,?) RETURNING id",
err: nil,
}
},
},
"valid:RETURNING clause with ON CONFLICT": {
arrange: func(t *testing.T) (Args, Expected) {
return Args{
originalQuery: "INSERT INTO users (id, name) VALUES (?, ?) ON CONFLICT (id) DO UPDATE SET name = EXCLUDED.name RETURNING id;",
numArgs: 2,
numParamsPerArg: 2,
}, Expected{
query: "INSERT INTO users (id, name) VALUES (?,?),(?,?) ON CONFLICT (id) DO UPDATE SET name = EXCLUDED.name RETURNING id",
err: nil,
}
},
},
"valid:Squeeze spaces": {
arrange: func(t *testing.T) (Args, Expected) {
return Args{
Expand Down
Loading