Skip to content

Commit 94d70d4

Browse files
committed
materialize-sql: s/variadic/slice in column migration instructions
1 parent 3ff58f6 commit 94d70d4

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

materialize-bigquery/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ var columnMigrationSteps = []sql.ColumnMigrationStep{
130130
sql.StdMigrationSteps[1],
131131
sql.StdMigrationSteps[2],
132132
sql.StdMigrationSteps[3],
133-
func(dialect sql.Dialect, table sql.Table, instructions ...sql.MigrationInstruction) ([]string, error) {
133+
func(dialect sql.Dialect, table sql.Table, instructions []sql.MigrationInstruction) ([]string, error) {
134134
// BigQuery does not support making a column REQUIRED when it is NULLABLE
135135
// TODO: do we prefer to backfill in these instances for BigQuery, or just continue
136136
// with this no-op as-is?

materialize-mysql/client.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ var migrationSteps = []sql.ColumnMigrationStep{
106106
sql.StdMigrationSteps[0],
107107
sql.StdMigrationSteps[1],
108108
sql.StdMigrationSteps[2],
109-
func(dialect sql.Dialect, table sql.Table, instructions ...sql.MigrationInstruction) ([]string, error) {
109+
func(dialect sql.Dialect, table sql.Table, instructions []sql.MigrationInstruction) ([]string, error) {
110110
var queries []string
111111
for _, ins := range instructions {
112112
queries = append(
@@ -123,7 +123,7 @@ var migrationSteps = []sql.ColumnMigrationStep{
123123

124124
return queries, nil
125125
},
126-
func(dialect sql.Dialect, table sql.Table, instructions ...sql.MigrationInstruction) ([]string, error) {
126+
func(dialect sql.Dialect, table sql.Table, instructions []sql.MigrationInstruction) ([]string, error) {
127127
var queries []string
128128

129129
for _, ins := range instructions {

materialize-sql/std_sql.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -456,10 +456,10 @@ type MigrationInstruction struct {
456456
TempColumnIdentifier string
457457
}
458458

459-
type ColumnMigrationStep func(dialect Dialect, table Table, instructions ...MigrationInstruction) ([]string, error)
459+
type ColumnMigrationStep func(dialect Dialect, table Table, instructions []MigrationInstruction) ([]string, error)
460460

461461
var StdMigrationSteps = []ColumnMigrationStep{
462-
func(dialect Dialect, table Table, instructions ...MigrationInstruction) ([]string, error) {
462+
func(dialect Dialect, table Table, instructions []MigrationInstruction) ([]string, error) {
463463
var queries []string
464464
for _, ins := range instructions {
465465
queries = append(
@@ -474,7 +474,7 @@ var StdMigrationSteps = []ColumnMigrationStep{
474474

475475
return queries, nil
476476
},
477-
func(dialect Dialect, table Table, instructions ...MigrationInstruction) ([]string, error) {
477+
func(dialect Dialect, table Table, instructions []MigrationInstruction) ([]string, error) {
478478
var query strings.Builder
479479
query.WriteString(fmt.Sprintf("UPDATE %s SET ", table.Identifier))
480480

@@ -490,7 +490,7 @@ var StdMigrationSteps = []ColumnMigrationStep{
490490

491491
return []string{query.String()}, nil
492492
},
493-
func(dialect Dialect, table Table, instructions ...MigrationInstruction) ([]string, error) {
493+
func(dialect Dialect, table Table, instructions []MigrationInstruction) ([]string, error) {
494494
var queries []string
495495
for _, ins := range instructions {
496496
queries = append(
@@ -504,7 +504,7 @@ var StdMigrationSteps = []ColumnMigrationStep{
504504

505505
return queries, nil
506506
},
507-
func(dialect Dialect, table Table, instructions ...MigrationInstruction) ([]string, error) {
507+
func(dialect Dialect, table Table, instructions []MigrationInstruction) ([]string, error) {
508508
var queries []string
509509
for _, ins := range instructions {
510510
queries = append(queries,
@@ -518,7 +518,7 @@ var StdMigrationSteps = []ColumnMigrationStep{
518518

519519
return queries, nil
520520
},
521-
func(dialect Dialect, table Table, instructions ...MigrationInstruction) ([]string, error) {
521+
func(dialect Dialect, table Table, instructions []MigrationInstruction) ([]string, error) {
522522
var queries []string
523523

524524
for _, ins := range instructions {
@@ -579,7 +579,7 @@ func StdColumnTypeMigrations(ctx context.Context, dialect Dialect, table Table,
579579
var renderedSteps []string
580580
for step, instructions := range stepInstructions {
581581
for i, s := range steps[step:] {
582-
newStep, err := s(dialect, table, instructions...)
582+
newStep, err := s(dialect, table, instructions)
583583
if err != nil {
584584
return nil, fmt.Errorf("rendering step %d: %w", i, err)
585585
}

materialize-sqlserver/client.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func (c *client) InfoSchema(ctx context.Context, resourcePaths [][]string) (is *
8989
}
9090

9191
var columnMigrationSteps = []sql.ColumnMigrationStep{
92-
func(dialect sql.Dialect, table sql.Table, instructions ...sql.MigrationInstruction) ([]string, error) {
92+
func(dialect sql.Dialect, table sql.Table, instructions []sql.MigrationInstruction) ([]string, error) {
9393
var queries []string
9494

9595
for _, ins := range instructions {
@@ -105,7 +105,7 @@ var columnMigrationSteps = []sql.ColumnMigrationStep{
105105

106106
return queries, nil
107107
},
108-
func(dialect sql.Dialect, table sql.Table, instructions ...sql.MigrationInstruction) ([]string, error) {
108+
func(dialect sql.Dialect, table sql.Table, instructions []sql.MigrationInstruction) ([]string, error) {
109109
var query strings.Builder
110110
query.WriteString(fmt.Sprintf("UPDATE %s SET ", table.Identifier))
111111

@@ -119,7 +119,7 @@ var columnMigrationSteps = []sql.ColumnMigrationStep{
119119
return []string{query.String()}, nil
120120
},
121121
sql.StdMigrationSteps[2],
122-
func(dialect sql.Dialect, table sql.Table, instructions ...sql.MigrationInstruction) ([]string, error) {
122+
func(dialect sql.Dialect, table sql.Table, instructions []sql.MigrationInstruction) ([]string, error) {
123123
var queries []string
124124

125125
for _, ins := range instructions {
@@ -137,7 +137,7 @@ var columnMigrationSteps = []sql.ColumnMigrationStep{
137137

138138
return queries, nil
139139
},
140-
func(dialect sql.Dialect, table sql.Table, instructions ...sql.MigrationInstruction) ([]string, error) {
140+
func(dialect sql.Dialect, table sql.Table, instructions []sql.MigrationInstruction) ([]string, error) {
141141
var queries []string
142142

143143
for _, ins := range instructions {

0 commit comments

Comments
 (0)