Skip to content

Allow args to driver's raw Exec #886

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
May 9, 2025
Merged

Allow args to driver's raw Exec #886

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
19 changes: 16 additions & 3 deletions internal/riverinternaltest/riverdrivertest/riverdrivertest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,10 +258,23 @@ func Exercise[TTx any](ctx context.Context, t *testing.T,
t.Run("Exec", func(t *testing.T) {
t.Parallel()

exec, _ := setup(ctx, t)
t.Run("NoArgs", func(t *testing.T) {
t.Parallel()

_, err := exec.Exec(ctx, "SELECT 1 + 2")
require.NoError(t, err)
exec, _ := setup(ctx, t)

_, err := exec.Exec(ctx, "SELECT 1 + 2")
require.NoError(t, err)
})

t.Run("WithArgs", func(t *testing.T) {
t.Parallel()

exec, _ := setup(ctx, t)

_, err := exec.Exec(ctx, "SELECT $1 || $2", "foo", "bar")
require.NoError(t, err)
})
})

t.Run("JobCancel", func(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion riverdriver/river_driver_interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ type Executor interface {
ColumnExists(ctx context.Context, params *ColumnExistsParams) (bool, error)

// Exec executes raw SQL. Used for migrations.
Exec(ctx context.Context, sql string) (struct{}, error)
Exec(ctx context.Context, sql string, args ...any) (struct{}, error)

JobCancel(ctx context.Context, params *JobCancelParams) (*rivertype.JobRow, error)
JobCountByState(ctx context.Context, params *JobCountByStateParams) (int, error)
Expand Down
4 changes: 2 additions & 2 deletions riverdriver/riverdatabasesql/river_database_sql_driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ func (e *Executor) ColumnExists(ctx context.Context, params *riverdriver.ColumnE
return exists, interpretError(err)
}

func (e *Executor) Exec(ctx context.Context, sql string) (struct{}, error) {
_, err := e.dbtx.ExecContext(ctx, sql)
func (e *Executor) Exec(ctx context.Context, sql string, args ...any) (struct{}, error) {
_, err := e.dbtx.ExecContext(ctx, sql, args...)
return struct{}{}, interpretError(err)
}

Expand Down
4 changes: 2 additions & 2 deletions riverdriver/riverpgxv5/river_pgx_v5_driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ func (e *Executor) ColumnExists(ctx context.Context, params *riverdriver.ColumnE
return exists, interpretError(err)
}

func (e *Executor) Exec(ctx context.Context, sql string) (struct{}, error) {
_, err := e.dbtx.Exec(ctx, sql)
func (e *Executor) Exec(ctx context.Context, sql string, args ...any) (struct{}, error) {
_, err := e.dbtx.Exec(ctx, sql, args...)
return struct{}{}, interpretError(err)
}

Expand Down
Loading