Skip to content

Commit a189729

Browse files
danieljoosdanieljoos
committed
Rename MoveTables... to MoveTable...
1 parent d8a4c2c commit a189729

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
@@ -330,13 +330,13 @@ func BuildRangeInsertPreparedQuery(databaseName, originalTableName, ghostTableNa
330330
return BuildRangeInsertQuery(databaseName, originalTableName, ghostTableName, sharedColumns, mappedSharedColumns, uniqueKey, uniqueKeyColumns, rangeStartValues, rangeEndValues, rangeStartArgs, rangeEndArgs, includeRangeStartValues, transactionalTable, noWait)
331331
}
332332

333-
type MoveTablesCopySelectQueryBuilder struct {
333+
type MoveTableCopySelectQueryBuilder struct {
334334
preparedStatement string
335335
argsMapping []int
336336
argsCount int
337337
}
338338

339-
func NewMoveTablesCopySelectQueryBuilder(sourceDatabaseName, sourceTableName string, sharedColumns *ColumnList, uniqueKey string, uniqueKeyColumns *ColumnList, includeRangeStartValues bool) (*MoveTablesCopySelectQueryBuilder, error) {
339+
func NewMoveTableCopySelectQueryBuilder(sourceDatabaseName, sourceTableName string, sharedColumns *ColumnList, uniqueKey string, uniqueKeyColumns *ColumnList, includeRangeStartValues bool) (*MoveTableCopySelectQueryBuilder, error) {
340340
sourceDatabaseName = EscapeName(sourceDatabaseName)
341341
sourceTableName = EscapeName(sourceTableName)
342342
sharedColumnsNames := sharedColumns.Names()
@@ -394,14 +394,14 @@ func NewMoveTablesCopySelectQueryBuilder(sourceDatabaseName, sourceTableName str
394394
uniqueKey,
395395
rangeStartComparison, rangeEndComparison,
396396
)
397-
return &MoveTablesCopySelectQueryBuilder{
397+
return &MoveTableCopySelectQueryBuilder{
398398
preparedStatement: stmt,
399399
argsMapping: argsMapping,
400400
argsCount: len(dummyArgs) * 2,
401401
}, nil
402402
}
403403

404-
func (b *MoveTablesCopySelectQueryBuilder) BuildQuery(rangeStartArgs, rangeEndArgs []any) (string, []any, error) {
404+
func (b *MoveTableCopySelectQueryBuilder) BuildQuery(rangeStartArgs, rangeEndArgs []any) (string, []any, error) {
405405
if len(rangeStartArgs)+len(rangeEndArgs) != b.argsCount {
406406
return "", nil, fmt.Errorf("got %d args but expected %d", len(rangeStartArgs)+len(rangeEndArgs), b.argsCount)
407407
}
@@ -416,13 +416,13 @@ func (b *MoveTablesCopySelectQueryBuilder) BuildQuery(rangeStartArgs, rangeEndAr
416416
return b.preparedStatement, explodedArgs, nil
417417
}
418418

419-
type MoveTablesCopyInsertQueryBuilder struct {
419+
type MoveTableCopyInsertQueryBuilder struct {
420420
preparedStatement string
421421
valueListPlaceholder string
422422
valueListSize int
423423
}
424424

425-
func NewMoveTablesCopyInsertQueryBuilder(targetDatabaseName, targetTableName string, sharedColumns *ColumnList) (*MoveTablesCopyInsertQueryBuilder, error) {
425+
func NewMoveTableCopyInsertQueryBuilder(targetDatabaseName, targetTableName string, sharedColumns *ColumnList) (*MoveTableCopyInsertQueryBuilder, error) {
426426
targetDatabaseName = EscapeName(targetDatabaseName)
427427
targetTableName = EscapeName(targetTableName)
428428
sharedColumnsNames := sharedColumns.Names()
@@ -443,14 +443,14 @@ func NewMoveTablesCopyInsertQueryBuilder(targetDatabaseName, targetTableName str
443443
targetDatabaseName, targetTableName,
444444
sharedColumnsListing,
445445
)
446-
return &MoveTablesCopyInsertQueryBuilder{
446+
return &MoveTableCopyInsertQueryBuilder{
447447
preparedStatement: stmt,
448448
valueListPlaceholder: valueListPlaceholder,
449449
valueListSize: valueListSize,
450450
}, nil
451451
}
452452

453-
func (b *MoveTablesCopyInsertQueryBuilder) BuildQuery(values []*ColumnValues) (string, []any, error) {
453+
func (b *MoveTableCopyInsertQueryBuilder) BuildQuery(values []*ColumnValues) (string, []any, error) {
454454
var explodedArgs []any
455455
var builder strings.Builder
456456
builder.WriteString(b.preparedStatement)

‎go/sql/builder_test.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -784,12 +784,12 @@ func TestBuildDMLUpdateQuerySignedUnsigned(t *testing.T) {
784784
}
785785
}
786786

787-
func TestMoveTablesCopySelectQueryBuilder(t *testing.T) {
787+
func TestMoveTableCopySelectQueryBuilder(t *testing.T) {
788788
t.Run("single column unique key", func(t *testing.T) {
789789
sharedColumns := NewColumnList([]string{"id", "name", "position"})
790790
uniqueKeyColumns := NewColumnList([]string{"id"})
791791

792-
builder, err := NewMoveTablesCopySelectQueryBuilder("mydb", "tbl", sharedColumns, "PRIMARY", uniqueKeyColumns, true)
792+
builder, err := NewMoveTableCopySelectQueryBuilder("mydb", "tbl", sharedColumns, "PRIMARY", uniqueKeyColumns, true)
793793
require.NoError(t, err)
794794

795795
query, args, err := builder.BuildQuery([]any{3}, []any{103})
@@ -811,7 +811,7 @@ func TestMoveTablesCopySelectQueryBuilder(t *testing.T) {
811811
sharedColumns := NewColumnList([]string{"id", "name", "position"})
812812
uniqueKeyColumns := NewColumnList([]string{"id"})
813813

814-
builder, err := NewMoveTablesCopySelectQueryBuilder("mydb", "tbl", sharedColumns, "PRIMARY", uniqueKeyColumns, false)
814+
builder, err := NewMoveTableCopySelectQueryBuilder("mydb", "tbl", sharedColumns, "PRIMARY", uniqueKeyColumns, false)
815815
require.NoError(t, err)
816816

817817
query, args, err := builder.BuildQuery([]any{3}, []any{103})
@@ -833,7 +833,7 @@ func TestMoveTablesCopySelectQueryBuilder(t *testing.T) {
833833
sharedColumns := NewColumnList([]string{"id", "name", "position"})
834834
uniqueKeyColumns := NewColumnList([]string{"name", "position"})
835835

836-
builder, err := NewMoveTablesCopySelectQueryBuilder("mydb", "tbl", sharedColumns, "name_position_uidx", uniqueKeyColumns, true)
836+
builder, err := NewMoveTableCopySelectQueryBuilder("mydb", "tbl", sharedColumns, "name_position_uidx", uniqueKeyColumns, true)
837837
require.NoError(t, err)
838838

839839
query, args, err := builder.BuildQuery([]any{3, 17}, []any{103, 117})
@@ -856,7 +856,7 @@ func TestMoveTablesCopySelectQueryBuilder(t *testing.T) {
856856
sharedColumns := NewColumnList([]string{"id", "name"})
857857
uniqueKeyColumns := NewColumnList([]string{"id"})
858858

859-
builder, err := NewMoveTablesCopySelectQueryBuilder("mydb", "tbl", sharedColumns, "PRIMARY", uniqueKeyColumns, true)
859+
builder, err := NewMoveTableCopySelectQueryBuilder("mydb", "tbl", sharedColumns, "PRIMARY", uniqueKeyColumns, true)
860860
require.NoError(t, err)
861861

862862
query1, args1, err := builder.BuildQuery([]any{1}, []any{10})
@@ -873,19 +873,19 @@ func TestMoveTablesCopySelectQueryBuilder(t *testing.T) {
873873
sharedColumns := NewColumnList([]string{"id", "name"})
874874
uniqueKeyColumns := NewColumnList([]string{"id"})
875875

876-
builder, err := NewMoveTablesCopySelectQueryBuilder("mydb", "tbl", sharedColumns, "PRIMARY", uniqueKeyColumns, true)
876+
builder, err := NewMoveTableCopySelectQueryBuilder("mydb", "tbl", sharedColumns, "PRIMARY", uniqueKeyColumns, true)
877877
require.NoError(t, err)
878878

879879
_, _, err = builder.BuildQuery([]any{1, 2}, []any{10})
880880
require.Error(t, err)
881881
})
882882
}
883883

884-
func BenchmarkMoveTablesCopySelectQueryBuilderBuildQuery(b *testing.B) {
884+
func BenchmarkMoveTableCopySelectQueryBuilderBuildQuery(b *testing.B) {
885885
sharedColumns := NewColumnList([]string{"id", "name", "position"})
886886
uniqueKeyColumns := NewColumnList([]string{"name", "position"})
887887

888-
builder, err := NewMoveTablesCopySelectQueryBuilder("mydb", "tbl", sharedColumns, "name_position_uidx", uniqueKeyColumns, true)
888+
builder, err := NewMoveTableCopySelectQueryBuilder("mydb", "tbl", sharedColumns, "name_position_uidx", uniqueKeyColumns, true)
889889
if err != nil {
890890
b.Fatal(err)
891891
}
@@ -902,11 +902,11 @@ func BenchmarkMoveTablesCopySelectQueryBuilderBuildQuery(b *testing.B) {
902902
}
903903
}
904904

905-
func TestMoveTablesCopyInsertQueryBuilder(t *testing.T) {
905+
func TestMoveTableCopyInsertQueryBuilder(t *testing.T) {
906906
t.Run("single row", func(t *testing.T) {
907907
sharedColumns := NewColumnList([]string{"id", "name", "position"})
908908

909-
builder, err := NewMoveTablesCopyInsertQueryBuilder("mydb", "ghost", sharedColumns)
909+
builder, err := NewMoveTableCopyInsertQueryBuilder("mydb", "ghost", sharedColumns)
910910
require.NoError(t, err)
911911

912912
values := []*ColumnValues{
@@ -930,7 +930,7 @@ func TestMoveTablesCopyInsertQueryBuilder(t *testing.T) {
930930
t.Run("multiple rows", func(t *testing.T) {
931931
sharedColumns := NewColumnList([]string{"id", "name", "position"})
932932

933-
builder, err := NewMoveTablesCopyInsertQueryBuilder("mydb", "ghost", sharedColumns)
933+
builder, err := NewMoveTableCopyInsertQueryBuilder("mydb", "ghost", sharedColumns)
934934
require.NoError(t, err)
935935

936936
values := []*ColumnValues{
@@ -958,7 +958,7 @@ func TestMoveTablesCopyInsertQueryBuilder(t *testing.T) {
958958
t.Run("wrong column count", func(t *testing.T) {
959959
sharedColumns := NewColumnList([]string{"id", "name", "position"})
960960

961-
builder, err := NewMoveTablesCopyInsertQueryBuilder("mydb", "ghost", sharedColumns)
961+
builder, err := NewMoveTableCopyInsertQueryBuilder("mydb", "ghost", sharedColumns)
962962
require.NoError(t, err)
963963

964964
values := []*ColumnValues{
@@ -971,7 +971,7 @@ func TestMoveTablesCopyInsertQueryBuilder(t *testing.T) {
971971
t.Run("reuses prepared statement", func(t *testing.T) {
972972
sharedColumns := NewColumnList([]string{"id", "name"})
973973

974-
builder, err := NewMoveTablesCopyInsertQueryBuilder("mydb", "ghost", sharedColumns)
974+
builder, err := NewMoveTableCopyInsertQueryBuilder("mydb", "ghost", sharedColumns)
975975
require.NoError(t, err)
976976

977977
values1 := []*ColumnValues{ToColumnValues([]interface{}{1, "a"})}
@@ -988,10 +988,10 @@ func TestMoveTablesCopyInsertQueryBuilder(t *testing.T) {
988988
})
989989
}
990990

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

994-
builder, err := NewMoveTablesCopyInsertQueryBuilder("mydb", "ghost", sharedColumns)
994+
builder, err := NewMoveTableCopyInsertQueryBuilder("mydb", "ghost", sharedColumns)
995995
if err != nil {
996996
b.Fatal(err)
997997
}

0 commit comments

Comments
 (0)