Skip to content

Fix intermittent test in sqlctemplate relating to arbitrary map sorting #796

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
brandur merged 1 commit into from
Mar 9, 2025
Merged

Fix intermittent test in sqlctemplate relating to arbitrary map sorting #796

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
8 changes: 7 additions & 1 deletion rivershared/sqlctemplate/sqlc_template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,12 +177,18 @@ func (r *Replacer) RunSafely(ctx context.Context, sql string, args []any) (strin

if len(container.NamedArgs) > 0 {
placeholderNum := len(args)
for arg, val := range container.NamedArgs {

// For the benefit of the test suite's output being predictable, sort
// named args before processing them.
sortedNamedArgs := maputil.Keys(container.NamedArgs)
slices.Sort(sortedNamedArgs)
for _, arg := range sortedNamedArgs {
placeholderNum++

var (
symbol = "@" + arg
symbolIndex = strings.Index(updatedSQL, symbol)
val = container.NamedArgs[arg]
)

if symbolIndex == -1 {
Expand Down