Skip to content

Commit 98263f2

Browse files
danieljoosdanieljoos
committed
Rename MoveTables... to MoveTable...
1 parent 8df2815 commit 98263f2

2 files changed

Lines changed: 23 additions & 23 deletions

File tree

‎go/sql/builder.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -426,13 +426,13 @@ func BuildRangeInsertPreparedQuery(databaseName, originalTableName, ghostTableNa
426426
return BuildRangeInsertQuery(databaseName, originalTableName, ghostTableName, sharedColumns, mappedSharedColumns, uniqueKey, uniqueKeyColumns, rangeStartValues, rangeEndValues, rangeStartArgs, rangeEndArgs, includeRangeStartValues, transactionalTable, noWait)
427427
}
428428

429-
type MoveTablesCopySelectQueryBuilder struct {
429+
type MoveTableCopySelectQueryBuilder struct {
430430
preparedStatement string
431431
argsMapping []int
432432
argsCount int
433433
}
434434

435-
func NewMoveTablesCopySelectQueryBuilder(sourceDatabaseName, sourceTableName string, sharedColumns *ColumnList, uniqueKey string, uniqueKeyColumns *ColumnList, includeRangeStartValues bool) (*MoveTablesCopySelectQueryBuilder, error) {
435+
func NewMoveTableCopySelectQueryBuilder(sourceDatabaseName, sourceTableName string, sharedColumns *ColumnList, uniqueKey string, uniqueKeyColumns *ColumnList, includeRangeStartValues bool) (*MoveTableCopySelectQueryBuilder, error) {
436436
sourceDatabaseName = EscapeName(sourceDatabaseName)
437437
sourceTableName = EscapeName(sourceTableName)
438438
sharedColumnsNames := sharedColumns.Names()
@@ -490,14 +490,14 @@ func NewMoveTablesCopySelectQueryBuilder(sourceDatabaseName, sourceTableName str
490490
uniqueKey,
491491
rangeStartComparison, rangeEndComparison,
492492
)
493-
return &MoveTablesCopySelectQueryBuilder{
493+
return &MoveTableCopySelectQueryBuilder{
494494
preparedStatement: stmt,
495495
argsMapping: argsMapping,
496496
argsCount: len(dummyArgs) * 2,
497497
}, nil
498498
}
499499

500-
func (b *MoveTablesCopySelectQueryBuilder) BuildQuery(rangeStartArgs, rangeEndArgs []any) (string, []any, error) {
500+
func (b *MoveTableCopySelectQueryBuilder) BuildQuery(rangeStartArgs, rangeEndArgs []any) (string, []any, error) {
501501
if len(rangeStartArgs)+len(rangeEndArgs) != b.argsCount {
502502
return "", nil, fmt.Errorf("got %d args but expected %d", len(rangeStartArgs)+len(rangeEndArgs), b.argsCount)
503503
}
@@ -512,13 +512,13 @@ func (b *MoveTablesCopySelectQueryBuilder) BuildQuery(rangeStartArgs, rangeEndAr
512512
return b.preparedStatement, explodedArgs, nil
513513
}
514514

515-
type MoveTablesCopyInsertQueryBuilder struct {
515+
type MoveTableCopyInsertQueryBuilder struct {
516516
preparedStatement string
517517
valueListPlaceholder string
518518
valueListSize int
519519
}
520520

521-
func NewMoveTablesCopyInsertQueryBuilder(targetDatabaseName, targetTableName string, sharedColumns *ColumnList) (*MoveTablesCopyInsertQueryBuilder, error) {
521+
func NewMoveTableCopyInsertQueryBuilder(targetDatabaseName, targetTableName string, sharedColumns *ColumnList) (*MoveTableCopyInsertQueryBuilder, error) {
522522
targetDatabaseName = EscapeName(targetDatabaseName)
523523
targetTableName = EscapeName(targetTableName)
524524
sharedColumnsNames := sharedColumns.Names()
@@ -539,14 +539,14 @@ func NewMoveTablesCopyInsertQueryBuilder(targetDatabaseName, targetTableName str
539539
targetDatabaseName, targetTableName,
540540
sharedColumnsListing,
541541
)
542-
return &MoveTablesCopyInsertQueryBuilder{
542+
return &MoveTableCopyInsertQueryBuilder{
543543
preparedStatement: stmt,
544544
valueListPlaceholder: valueListPlaceholder,
545545
valueListSize: valueListSize,
546546
}, nil
547547
}
548548

549-
func (b *MoveTablesCopyInsertQueryBuilder) BuildQuery(values []*ColumnValues) (string, []any, error) {
549+
func (b *MoveTableCopyInsertQueryBuilder) BuildQuery(values []*ColumnValues) (string, []any, error) {
550550
var explodedArgs []any
551551
var builder strings.Builder
552552
builder.WriteString(b.preparedStatement)

‎go/sql/builder_test.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1102,12 +1102,12 @@ func TestBuildDMLUpdateQuerySignedUnsigned(t *testing.T) {
11021102
}
11031103
}
11041104

1105-
func TestMoveTablesCopySelectQueryBuilder(t *testing.T) {
1105+
func TestMoveTableCopySelectQueryBuilder(t *testing.T) {
11061106
t.Run("single column unique key", func(t *testing.T) {
11071107
sharedColumns := NewColumnList([]string{"id", "name", "position"})
11081108
uniqueKeyColumns := NewColumnList([]string{"id"})
11091109

1110-
builder, err := NewMoveTablesCopySelectQueryBuilder("mydb", "tbl", sharedColumns, "PRIMARY", uniqueKeyColumns, true)
1110+
builder, err := NewMoveTableCopySelectQueryBuilder("mydb", "tbl", sharedColumns, "PRIMARY", uniqueKeyColumns, true)
11111111
require.NoError(t, err)
11121112

11131113
query, args, err := builder.BuildQuery([]any{3}, []any{103})
@@ -1129,7 +1129,7 @@ func TestMoveTablesCopySelectQueryBuilder(t *testing.T) {
11291129
sharedColumns := NewColumnList([]string{"id", "name", "position"})
11301130
uniqueKeyColumns := NewColumnList([]string{"id"})
11311131

1132-
builder, err := NewMoveTablesCopySelectQueryBuilder("mydb", "tbl", sharedColumns, "PRIMARY", uniqueKeyColumns, false)
1132+
builder, err := NewMoveTableCopySelectQueryBuilder("mydb", "tbl", sharedColumns, "PRIMARY", uniqueKeyColumns, false)
11331133
require.NoError(t, err)
11341134

11351135
query, args, err := builder.BuildQuery([]any{3}, []any{103})
@@ -1151,7 +1151,7 @@ func TestMoveTablesCopySelectQueryBuilder(t *testing.T) {
11511151
sharedColumns := NewColumnList([]string{"id", "name", "position"})
11521152
uniqueKeyColumns := NewColumnList([]string{"name", "position"})
11531153

1154-
builder, err := NewMoveTablesCopySelectQueryBuilder("mydb", "tbl", sharedColumns, "name_position_uidx", uniqueKeyColumns, true)
1154+
builder, err := NewMoveTableCopySelectQueryBuilder("mydb", "tbl", sharedColumns, "name_position_uidx", uniqueKeyColumns, true)
11551155
require.NoError(t, err)
11561156

11571157
query, args, err := builder.BuildQuery([]any{3, 17}, []any{103, 117})
@@ -1174,7 +1174,7 @@ func TestMoveTablesCopySelectQueryBuilder(t *testing.T) {
11741174
sharedColumns := NewColumnList([]string{"id", "name"})
11751175
uniqueKeyColumns := NewColumnList([]string{"id"})
11761176

1177-
builder, err := NewMoveTablesCopySelectQueryBuilder("mydb", "tbl", sharedColumns, "PRIMARY", uniqueKeyColumns, true)
1177+
builder, err := NewMoveTableCopySelectQueryBuilder("mydb", "tbl", sharedColumns, "PRIMARY", uniqueKeyColumns, true)
11781178
require.NoError(t, err)
11791179

11801180
query1, args1, err := builder.BuildQuery([]any{1}, []any{10})
@@ -1191,19 +1191,19 @@ func TestMoveTablesCopySelectQueryBuilder(t *testing.T) {
11911191
sharedColumns := NewColumnList([]string{"id", "name"})
11921192
uniqueKeyColumns := NewColumnList([]string{"id"})
11931193

1194-
builder, err := NewMoveTablesCopySelectQueryBuilder("mydb", "tbl", sharedColumns, "PRIMARY", uniqueKeyColumns, true)
1194+
builder, err := NewMoveTableCopySelectQueryBuilder("mydb", "tbl", sharedColumns, "PRIMARY", uniqueKeyColumns, true)
11951195
require.NoError(t, err)
11961196

11971197
_, _, err = builder.BuildQuery([]any{1, 2}, []any{10})
11981198
require.Error(t, err)
11991199
})
12001200
}
12011201

1202-
func BenchmarkMoveTablesCopySelectQueryBuilderBuildQuery(b *testing.B) {
1202+
func BenchmarkMoveTableCopySelectQueryBuilderBuildQuery(b *testing.B) {
12031203
sharedColumns := NewColumnList([]string{"id", "name", "position"})
12041204
uniqueKeyColumns := NewColumnList([]string{"name", "position"})
12051205

1206-
builder, err := NewMoveTablesCopySelectQueryBuilder("mydb", "tbl", sharedColumns, "name_position_uidx", uniqueKeyColumns, true)
1206+
builder, err := NewMoveTableCopySelectQueryBuilder("mydb", "tbl", sharedColumns, "name_position_uidx", uniqueKeyColumns, true)
12071207
if err != nil {
12081208
b.Fatal(err)
12091209
}
@@ -1220,11 +1220,11 @@ func BenchmarkMoveTablesCopySelectQueryBuilderBuildQuery(b *testing.B) {
12201220
}
12211221
}
12221222

1223-
func TestMoveTablesCopyInsertQueryBuilder(t *testing.T) {
1223+
func TestMoveTableCopyInsertQueryBuilder(t *testing.T) {
12241224
t.Run("single row", func(t *testing.T) {
12251225
sharedColumns := NewColumnList([]string{"id", "name", "position"})
12261226

1227-
builder, err := NewMoveTablesCopyInsertQueryBuilder("mydb", "ghost", sharedColumns)
1227+
builder, err := NewMoveTableCopyInsertQueryBuilder("mydb", "ghost", sharedColumns)
12281228
require.NoError(t, err)
12291229

12301230
values := []*ColumnValues{
@@ -1248,7 +1248,7 @@ func TestMoveTablesCopyInsertQueryBuilder(t *testing.T) {
12481248
t.Run("multiple rows", func(t *testing.T) {
12491249
sharedColumns := NewColumnList([]string{"id", "name", "position"})
12501250

1251-
builder, err := NewMoveTablesCopyInsertQueryBuilder("mydb", "ghost", sharedColumns)
1251+
builder, err := NewMoveTableCopyInsertQueryBuilder("mydb", "ghost", sharedColumns)
12521252
require.NoError(t, err)
12531253

12541254
values := []*ColumnValues{
@@ -1276,7 +1276,7 @@ func TestMoveTablesCopyInsertQueryBuilder(t *testing.T) {
12761276
t.Run("wrong column count", func(t *testing.T) {
12771277
sharedColumns := NewColumnList([]string{"id", "name", "position"})
12781278

1279-
builder, err := NewMoveTablesCopyInsertQueryBuilder("mydb", "ghost", sharedColumns)
1279+
builder, err := NewMoveTableCopyInsertQueryBuilder("mydb", "ghost", sharedColumns)
12801280
require.NoError(t, err)
12811281

12821282
values := []*ColumnValues{
@@ -1289,7 +1289,7 @@ func TestMoveTablesCopyInsertQueryBuilder(t *testing.T) {
12891289
t.Run("reuses prepared statement", func(t *testing.T) {
12901290
sharedColumns := NewColumnList([]string{"id", "name"})
12911291

1292-
builder, err := NewMoveTablesCopyInsertQueryBuilder("mydb", "ghost", sharedColumns)
1292+
builder, err := NewMoveTableCopyInsertQueryBuilder("mydb", "ghost", sharedColumns)
12931293
require.NoError(t, err)
12941294

12951295
values1 := []*ColumnValues{ToColumnValues([]interface{}{1, "a"})}
@@ -1306,10 +1306,10 @@ func TestMoveTablesCopyInsertQueryBuilder(t *testing.T) {
13061306
})
13071307
}
13081308

1309-
func BenchmarkMoveTablesCopyInsertQueryBuilderBuildQuery(b *testing.B) {
1309+
func BenchmarkMoveTableCopyInsertQueryBuilderBuildQuery(b *testing.B) {
13101310
sharedColumns := NewColumnList([]string{"id", "name", "position"})
13111311

1312-
builder, err := NewMoveTablesCopyInsertQueryBuilder("mydb", "ghost", sharedColumns)
1312+
builder, err := NewMoveTableCopyInsertQueryBuilder("mydb", "ghost", sharedColumns)
13131313
if err != nil {
13141314
b.Fatal(err)
13151315
}

0 commit comments

Comments
 (0)