Skip to content

Commit b3a8296

Browse files
sql/ydb: fixed tests
1 parent d154515 commit b3a8296

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

sql/ydb/attributes.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ package ydb
88

99
import "ariga.io/atlas/sql/schema"
1010

11-
// YDBIndexType represents YDB-specific index attributes.
12-
type YDBIndexAttributes struct {
11+
//[IndexAttributes] represents YDB-specific index attributes.
12+
type IndexAttributes struct {
1313
schema.Attr
1414
Global bool // GLOBAL, LOCAL
1515
Sync bool // SYNC, ASYNC

sql/ydb/convert_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,9 @@ func TestConvert_ParseType(t *testing.T) {
188188
{name: "tztimestamp64", input: TypeTzTimestamp64, expected: &schema.TimeType{T: TypeTzTimestamp64}},
189189

190190
// Optional types
191-
{name: "optional_int32", input: "Optional<int32>", expected: &OptionalType{T: "Optional<int32>", InnerType: &schema.IntegerType{T: TypeInt32, Unsigned: false}}},
192-
{name: "optional_utf8", input: "Optional<utf8>", expected: &OptionalType{T: "Optional<utf8>", InnerType: &schema.StringType{T: TypeUtf8}}},
193-
{name: "optional_bool", input: "Optional<bool>", expected: &OptionalType{T: "Optional<bool>", InnerType: &schema.BoolType{T: TypeBool}}},
191+
{name: "optional_int32", input: "Optional<int32>", expected: &OptionalType{T: "optional<int32>", InnerType: &schema.IntegerType{T: TypeInt32, Unsigned: false}}},
192+
{name: "optional_utf8", input: "Optional<utf8>", expected: &OptionalType{T: "optional<utf8>", InnerType: &schema.StringType{T: TypeUtf8}}},
193+
{name: "optional_bool", input: "Optional<bool>", expected: &OptionalType{T: "optional<bool>", InnerType: &schema.BoolType{T: TypeBool}}},
194194

195195
// Unsupported/unknown types
196196
{name: "unknown_type", input: "unknown", expected: &schema.UnsupportedType{T: "unknown"}},

sql/ydb/migrate.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -285,28 +285,28 @@ func (s *state) alterTable(t *schema.Table, changes []schema.Change) error {
285285
func (s *state) addIndexes(src schema.Change, t *schema.Table, indexes ...*schema.AddIndex) error {
286286
for _, add := range indexes {
287287
index := add.I
288-
indexAttrs := YDBIndexAttributes{}
289-
sqlx.Has(index.Attrs, &indexAttrs)
288+
indexAttrs := IndexAttributes{}
289+
hasAttrs := sqlx.Has(index.Attrs, &indexAttrs)
290290

291291
b := s.Build("ALTER TABLE").
292292
Table(t).
293293
P("ADD INDEX").
294294
Ident(index.Name)
295295

296-
if indexAttrs.Global {
297-
b.P("GLOBAL")
298-
} else {
296+
if hasAttrs && !indexAttrs.Global {
299297
b.P("LOCAL")
298+
} else {
299+
b.P("GLOBAL")
300300
}
301301

302302
if index.Unique {
303303
b.P("UNIQUE")
304304
}
305305

306-
if indexAttrs.Sync {
307-
b.P("SYNC")
308-
} else {
306+
if hasAttrs && !indexAttrs.Sync {
309307
b.P("ASYNC")
308+
} else {
309+
b.P("SYNC")
310310
}
311311

312312
b.P("ON")

sql/ydb/migrate_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ func TestPlanChanges_AddIndex(t *testing.T) {
553553
Transactional: true,
554554
Changes: []*migrate.Change{
555555
{
556-
Cmd: "ALTER TABLE `users` ADD INDEX `idx_name` GLOBAL ON (`name`)",
556+
Cmd: "ALTER TABLE `users` ADD INDEX `idx_name` GLOBAL SYNC ON (`name`)",
557557
Reverse: "ALTER TABLE `users` DROP INDEX `idx_name`",
558558
Comment: `create index "idx_name" to table: "users"`,
559559
},
@@ -576,7 +576,7 @@ func TestPlanChanges_AddIndex(t *testing.T) {
576576
Transactional: true,
577577
Changes: []*migrate.Change{
578578
{
579-
Cmd: "ALTER TABLE `users` ADD INDEX `idx_name_email` GLOBAL ON (`name`, `email`)",
579+
Cmd: "ALTER TABLE `users` ADD INDEX `idx_name_email` GLOBAL SYNC ON (`name`, `email`)",
580580
Reverse: "ALTER TABLE `users` DROP INDEX `idx_name_email`",
581581
Comment: `create index "idx_name_email" to table: "users"`,
582582
},
@@ -602,12 +602,12 @@ func TestPlanChanges_AddIndex(t *testing.T) {
602602
Transactional: true,
603603
Changes: []*migrate.Change{
604604
{
605-
Cmd: "ALTER TABLE `users` ADD INDEX `idx_name` GLOBAL ON (`name`)",
605+
Cmd: "ALTER TABLE `users` ADD INDEX `idx_name` GLOBAL SYNC ON (`name`)",
606606
Reverse: "ALTER TABLE `users` DROP INDEX `idx_name`",
607607
Comment: `create index "idx_name" to table: "users"`,
608608
},
609609
{
610-
Cmd: "ALTER TABLE `users` ADD INDEX `idx_email` GLOBAL ON (`email`)",
610+
Cmd: "ALTER TABLE `users` ADD INDEX `idx_email` GLOBAL SYNC ON (`email`)",
611611
Reverse: "ALTER TABLE `users` DROP INDEX `idx_email`",
612612
Comment: `create index "idx_email" to table: "users"`,
613613
},
@@ -665,7 +665,7 @@ func TestPlanChanges_DropIndex(t *testing.T) {
665665
Changes: []*migrate.Change{
666666
{
667667
Cmd: "ALTER TABLE `users` DROP INDEX `idx_name`",
668-
Reverse: "ALTER TABLE `users` ADD INDEX `idx_name` GLOBAL ON (`name`)",
668+
Reverse: "ALTER TABLE `users` ADD INDEX `idx_name` GLOBAL SYNC ON (`name`)",
669669
Comment: `drop index "idx_name" from table: "users"`,
670670
},
671671
},
@@ -691,12 +691,12 @@ func TestPlanChanges_DropIndex(t *testing.T) {
691691
Changes: []*migrate.Change{
692692
{
693693
Cmd: "ALTER TABLE `users` DROP INDEX `idx_name`",
694-
Reverse: "ALTER TABLE `users` ADD INDEX `idx_name` GLOBAL ON (`name`)",
694+
Reverse: "ALTER TABLE `users` ADD INDEX `idx_name` GLOBAL SYNC ON (`name`)",
695695
Comment: `drop index "idx_name" from table: "users"`,
696696
},
697697
{
698698
Cmd: "ALTER TABLE `users` DROP INDEX `idx_email`",
699-
Reverse: "ALTER TABLE `users` ADD INDEX `idx_email` GLOBAL ON (`email`)",
699+
Reverse: "ALTER TABLE `users` ADD INDEX `idx_email` GLOBAL SYNC ON (`email`)",
700700
Comment: `drop index "idx_email" from table: "users"`,
701701
},
702702
},
@@ -754,11 +754,11 @@ func TestPlanChanges_ModifyIndex(t *testing.T) {
754754
Changes: []*migrate.Change{
755755
{
756756
Cmd: "ALTER TABLE `users` DROP INDEX `idx_name`",
757-
Reverse: "ALTER TABLE `users` ADD INDEX `idx_name` GLOBAL ON (`name`)",
757+
Reverse: "ALTER TABLE `users` ADD INDEX `idx_name` GLOBAL SYNC ON (`name`)",
758758
Comment: `drop index "idx_name" from table: "users"`,
759759
},
760760
{
761-
Cmd: "ALTER TABLE `users` ADD INDEX `idx_name` GLOBAL ON (`name`, `email`)",
761+
Cmd: "ALTER TABLE `users` ADD INDEX `idx_name` GLOBAL SYNC ON (`name`, `email`)",
762762
Reverse: "ALTER TABLE `users` DROP INDEX `idx_name`",
763763
Comment: `create index "idx_name" to table: "users"`,
764764
},

0 commit comments

Comments
 (0)