ridgepole 0.8.13 → 0.9.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (139) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/test.yml +27 -20
  3. data/.rubocop.yml +5 -4
  4. data/.simplecov +6 -0
  5. data/Appraisals +4 -5
  6. data/README.md +24 -43
  7. data/bin/ridgepole +13 -3
  8. data/gemfiles/{activerecord_5.0.gemfile → activerecord_6.1.gemfile} +1 -2
  9. data/lib/ridgepole/client.rb +8 -3
  10. data/lib/ridgepole/delta.rb +16 -1
  11. data/lib/ridgepole/diff.rb +50 -31
  12. data/lib/ridgepole/dsl_parser/table_definition.rb +8 -1
  13. data/lib/ridgepole/execute_expander.rb +10 -1
  14. data/lib/ridgepole/ext/abstract_adapter/disable_table_options.rb +9 -1
  15. data/lib/ridgepole/external_sql_executer.rb +12 -1
  16. data/lib/ridgepole/version.rb +1 -1
  17. data/ridgepole.gemspec +4 -3
  18. data/spec/erb_helper.rb +1 -1
  19. data/spec/mysql/_migrate/migrate_change_table_option_spec.rb +2 -2
  20. data/spec/mysql/bigint_pk/int_pk_spec.rb +1 -1
  21. data/spec/mysql/cli/ridgepole_spec.rb +35 -1
  22. data/spec/mysql/collation/collation_spec.rb +14 -14
  23. data/spec/mysql/comment/comment_spec.rb +9 -9
  24. data/spec/mysql/diff/diff2_spec.rb +5 -5
  25. data/spec/mysql/diff/diff_spec.rb +3 -3
  26. data/spec/mysql/dump/dump_class_method_spec.rb +13 -13
  27. data/spec/mysql/dump/dump_some_tables_spec.rb +4 -4
  28. data/spec/mysql/dump/dump_spec.rb +13 -13
  29. data/spec/mysql/dump/dump_unknown_column_type_spec.rb +2 -2
  30. data/spec/mysql/dump/dump_without_table_options_spec.rb +2 -2
  31. data/spec/mysql/fk/migrate_change_fk2_spec.rb +2 -2
  32. data/spec/mysql/fk/migrate_change_fk_spec.rb +88 -20
  33. data/spec/mysql/fk/migrate_create_fk_spec.rb +77 -22
  34. data/spec/mysql/fk/migrate_drop_fk_spec.rb +81 -26
  35. data/spec/mysql/fk/migrate_fk_with_column_spec.rb +16 -16
  36. data/spec/mysql/fk/migrate_ignore_fk_spec.rb +6 -6
  37. data/spec/mysql/migrate/migrate_add_column_order_spec.rb +2 -2
  38. data/spec/mysql/migrate/migrate_add_column_spec.rb +18 -18
  39. data/spec/mysql/migrate/migrate_add_column_with_alter_extra_spec.rb +106 -18
  40. data/spec/mysql/migrate/migrate_add_column_with_script_spec.rb +18 -18
  41. data/spec/mysql/migrate/migrate_change_column2_spec.rb +5 -5
  42. data/spec/mysql/migrate/migrate_change_column3_spec.rb +10 -10
  43. data/spec/mysql/migrate/migrate_change_column5_spec.rb +3 -3
  44. data/spec/mysql/migrate/migrate_change_column6_spec.rb +7 -7
  45. data/spec/mysql/migrate/migrate_change_column8_spec.rb +38 -5
  46. data/spec/mysql/migrate/migrate_change_column_default_spec.rb +2 -14
  47. data/spec/mysql/migrate/migrate_change_column_spec.rb +21 -21
  48. data/spec/mysql/migrate/migrate_change_index2_spec.rb +5 -5
  49. data/spec/mysql/migrate/migrate_change_index3_spec.rb +7 -7
  50. data/spec/mysql/migrate/migrate_change_index4_spec.rb +6 -6
  51. data/spec/mysql/migrate/migrate_change_index5_spec.rb +4 -4
  52. data/spec/mysql/migrate/migrate_change_index6_spec.rb +27 -27
  53. data/spec/mysql/migrate/migrate_change_index7_spec.rb +4 -4
  54. data/spec/mysql/migrate/migrate_change_index8_spec.rb +4 -4
  55. data/spec/mysql/migrate/migrate_change_index_spec.rb +34 -28
  56. data/spec/mysql/migrate/migrate_check_relation_column_type_spec.rb +5 -5
  57. data/spec/mysql/migrate/migrate_create_index2_spec.rb +24 -24
  58. data/spec/mysql/migrate/migrate_create_index_spec.rb +78 -18
  59. data/spec/mysql/migrate/migrate_create_table_spec.rb +16 -16
  60. data/spec/mysql/migrate/migrate_create_table_with_ignore_spec.rb +4 -4
  61. data/spec/mysql/migrate/migrate_create_table_with_index_spec.rb +4 -4
  62. data/spec/mysql/migrate/migrate_create_table_with_script_spec.rb +16 -16
  63. data/spec/mysql/migrate/migrate_drop_column_and_index2_spec.rb +18 -18
  64. data/spec/mysql/migrate/migrate_drop_column_and_index_spec.rb +16 -16
  65. data/spec/mysql/migrate/migrate_drop_column_and_unique_index_spec.rb +1 -1
  66. data/spec/mysql/migrate/migrate_drop_column_spec.rb +18 -18
  67. data/spec/mysql/migrate/migrate_drop_index_spec.rb +15 -15
  68. data/spec/mysql/migrate/migrate_drop_table_spec.rb +16 -16
  69. data/spec/mysql/migrate/migrate_empty_spec.rb +9 -9
  70. data/spec/mysql/migrate/migrate_execute_spec.rb +32 -32
  71. data/spec/mysql/migrate/migrate_ignore_column_spec.rb +4 -4
  72. data/spec/mysql/migrate/migrate_ignore_index_spec.rb +5 -5
  73. data/spec/mysql/migrate/migrate_log_file_spec.rb +16 -16
  74. data/spec/mysql/migrate/migrate_merge_mode_spec.rb +18 -18
  75. data/spec/mysql/migrate/migrate_noop_spec.rb +12 -12
  76. data/spec/mysql/migrate/migrate_primary_key_spec.rb +31 -6
  77. data/spec/mysql/migrate/migrate_rename_column_spec.rb +18 -18
  78. data/spec/mysql/migrate/migrate_rename_table_spec.rb +22 -22
  79. data/spec/mysql/migrate/migrate_same_spec.rb +13 -13
  80. data/spec/mysql/migrate/migrate_skip_column_comment_change_spec.rb +2 -2
  81. data/spec/mysql/migrate/migrate_skip_drop_table_spec.rb +18 -18
  82. data/spec/mysql/migrate/migrate_skip_rename_column_spec.rb +18 -18
  83. data/spec/mysql/migrate/migrate_skip_rename_table_spec.rb +18 -18
  84. data/spec/mysql/migrate/migrate_with_pre_post_query_spec.rb +18 -18
  85. data/spec/mysql/text_blob_types/text_blob_types_spec.rb +2 -2
  86. data/spec/mysql/~default_name_fk/migrate_change_fk_spec.rb +6 -6
  87. data/spec/mysql/~default_name_fk/migrate_create_fk_spec.rb +9 -9
  88. data/spec/mysql/~default_name_fk/migrate_drop_fk_spec.rb +8 -8
  89. data/spec/mysql/~dump_auto_increment/migrate_create_table_with_index_spec.rb +5 -5
  90. data/spec/mysql57/json/add_json_column_spec.rb +2 -2
  91. data/spec/mysql57/json/change_json_column_spec.rb +6 -6
  92. data/spec/mysql57/json/drop_json_column_spec.rb +2 -2
  93. data/spec/mysql57/virtual/add_virtual_column_spec.rb +1 -1
  94. data/spec/mysql57/virtual/change_virtual_column_spec.rb +1 -1
  95. data/spec/mysql57/virtual/drop_virtual_column_spec.rb +1 -1
  96. data/spec/postgresql/dump/dump_spec.rb +13 -13
  97. data/spec/postgresql/fk/migrate_change_fk_spec.rb +6 -6
  98. data/spec/postgresql/fk/migrate_create_fk_spec.rb +5 -5
  99. data/spec/postgresql/fk/migrate_drop_fk_spec.rb +8 -8
  100. data/spec/postgresql/migrate/migrate_add_column_spec.rb +16 -16
  101. data/spec/postgresql/migrate/migrate_add_expression_index_spec.rb +1 -1
  102. data/spec/postgresql/migrate/migrate_change_column_spec.rb +16 -16
  103. data/spec/postgresql/migrate/migrate_change_index_spec.rb +18 -18
  104. data/spec/postgresql/migrate/migrate_check_relation_column_type_spec.rb +1 -1
  105. data/spec/postgresql/migrate/migrate_create_table_spec.rb +14 -14
  106. data/spec/postgresql/migrate/migrate_drop_column_spec.rb +18 -18
  107. data/spec/postgresql/migrate/migrate_drop_column_with_index_spec.rb +17 -17
  108. data/spec/postgresql/migrate/migrate_drop_expression_index_spec.rb +3 -3
  109. data/spec/postgresql/migrate/migrate_drop_index_spec.rb +15 -15
  110. data/spec/postgresql/migrate/migrate_drop_table_spec.rb +16 -16
  111. data/spec/postgresql/migrate/migrate_primary_key2_spec.rb +1 -1
  112. data/spec/postgresql/migrate/migrate_primary_key_spec.rb +1 -1
  113. data/spec/postgresql/migrate/migrate_references_spec.rb +6 -6
  114. data/spec/postgresql/migrate/migrate_rename_column_spec.rb +18 -18
  115. data/spec/postgresql/migrate/migrate_rename_table_spec.rb +20 -20
  116. data/spec/postgresql/migrate/migrate_same_spec.rb +13 -13
  117. data/spec/postgresql/~default_name_fk/migrate_change_fk_spec.rb +3 -3
  118. data/spec/postgresql/~default_name_fk/migrate_create_fk_spec.rb +4 -4
  119. data/spec/postgresql/~default_name_fk/migrate_drop_fk_spec.rb +4 -4
  120. data/spec/processing_for_ci.rb +13 -0
  121. data/spec/spec_const.rb +1 -1
  122. data/spec/spec_helper.rb +2 -1
  123. metadata +43 -46
  124. data/lib/ridgepole/ext/abstract_mysql_adapter/use_alter_index.rb +0 -31
  125. data/omnibus-ridgepole/.gitignore +0 -10
  126. data/omnibus-ridgepole/Dockerfile.centos +0 -25
  127. data/omnibus-ridgepole/Dockerfile.ubuntu +0 -21
  128. data/omnibus-ridgepole/Gemfile +0 -24
  129. data/omnibus-ridgepole/README.md +0 -15
  130. data/omnibus-ridgepole/Rakefile +0 -38
  131. data/omnibus-ridgepole/config/projects/ridgepole.rb +0 -27
  132. data/omnibus-ridgepole/config/software/ridgepole.rb +0 -13
  133. data/omnibus-ridgepole/omnibus.rb +0 -54
  134. data/omnibus-ridgepole/package-scripts/ridgepole/postinst +0 -1
  135. data/omnibus-ridgepole/package-scripts/ridgepole/postrm +0 -1
  136. data/spec/mysql/bigint_pk/bigint_pk_spec.rb +0 -47
  137. data/spec/mysql/migrate_/migrate_create_index_with_alter_spec.rb +0 -141
  138. data/spec/mysql/migrate_/migrate_drop_index_with_alter_spec.rb +0 -141
  139. data/spec/processing_for_travis.rb +0 -11
data/spec/mysql/migrate/migrate_skip_rename_table_spec.rb CHANGED
@@ -6,12 +6,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
6
6
  erbh(<<-ERB)
7
7
  create_table "clubs", force: :cascade do |t|
8
8
  t.string "name", default: "", null: false
9
- t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
9
+ t.index ["name"], name: "idx_name", unique: true
10
10
  end
11
11
 
12
12
  create_table "departments", primary_key: "dept_no", force: :cascade do |t|
13
13
  t.string "dept_name", limit: 40, null: false
14
- t.index ["dept_name"], name: "dept_name", unique: true, <%= i cond(5.0, using: :btree) %>
14
+ t.index ["dept_name"], name: "dept_name", unique: true
15
15
  end
16
16
 
17
17
  create_table "dept_emp", id: false, force: :cascade do |t|
@@ -19,8 +19,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
19
19
  t.string "dept_no", null: false
20
20
  t.date "from_date", null: false
21
21
  t.date "to_date", null: false
22
- t.index ["dept_no"], name: "dept_no", <%= i cond(5.0, using: :btree) %>
23
- t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
22
+ t.index ["dept_no"], name: "dept_no"
23
+ t.index ["emp_no"], name: "emp_no"
24
24
  end
25
25
 
26
26
  create_table "dept_manager", id: false, force: :cascade do |t|
@@ -28,14 +28,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
28
28
  t.integer "emp_no", null: false
29
29
  t.date "from_date", null: false
30
30
  t.date "to_date", null: false
31
- t.index ["dept_no"], name: "dept_no", <%= i cond(5.0, using: :btree) %>
32
- t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
31
+ t.index ["dept_no"], name: "dept_no"
32
+ t.index ["emp_no"], name: "emp_no"
33
33
  end
34
34
 
35
35
  create_table "employee_clubs", force: :cascade do |t|
36
36
  t.integer "emp_no", null: false
37
37
  t.integer "club_id", null: false
38
- t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
38
+ t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id"
39
39
  end
40
40
 
41
41
  create_table "employees2", primary_key: "emp_no", force: :cascade do |t|
@@ -51,7 +51,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
51
51
  t.integer "salary", null: false
52
52
  t.date "from_date", null: false
53
53
  t.date "to_date", null: false
54
- t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
54
+ t.index ["emp_no"], name: "emp_no"
55
55
  end
56
56
 
57
57
  create_table "titles", id: false, force: :cascade do |t|
@@ -59,7 +59,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
59
59
  t.string "title", limit: 50, null: false
60
60
  t.date "from_date", null: false
61
61
  t.date "to_date"
62
- t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
62
+ t.index ["emp_no"], name: "emp_no"
63
63
  end
64
64
  ERB
65
65
  end
@@ -68,12 +68,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
68
68
  erbh(<<-ERB)
69
69
  create_table "clubs", force: :cascade do |t|
70
70
  t.string "name", default: "", null: false
71
- t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
71
+ t.index ["name"], name: "idx_name", unique: true
72
72
  end
73
73
 
74
74
  create_table "departments", primary_key: "dept_no", force: :cascade do |t|
75
75
  t.string "dept_name", limit: 40, null: false
76
- t.index ["dept_name"], name: "dept_name", unique: true, <%= i cond(5.0, using: :btree) %>
76
+ t.index ["dept_name"], name: "dept_name", unique: true
77
77
  end
78
78
 
79
79
  create_table "dept_emp", id: false, force: :cascade do |t|
@@ -81,8 +81,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
81
81
  t.string "dept_no", null: false
82
82
  t.date "from_date", null: false
83
83
  t.date "to_date", null: false
84
- t.index ["dept_no"], name: "dept_no", <%= i cond(5.0, using: :btree) %>
85
- t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
84
+ t.index ["dept_no"], name: "dept_no"
85
+ t.index ["emp_no"], name: "emp_no"
86
86
  end
87
87
 
88
88
  create_table "dept_manager", id: false, force: :cascade do |t|
@@ -90,14 +90,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
90
90
  t.integer "emp_no", null: false
91
91
  t.date "from_date", null: false
92
92
  t.date "to_date", null: false
93
- t.index ["dept_no"], name: "dept_no", <%= i cond(5.0, using: :btree) %>
94
- t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
93
+ t.index ["dept_no"], name: "dept_no"
94
+ t.index ["emp_no"], name: "emp_no"
95
95
  end
96
96
 
97
97
  create_table "employee_clubs", force: :cascade do |t|
98
98
  t.integer "emp_no", null: false
99
99
  t.integer "club_id", null: false
100
- t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
100
+ t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id"
101
101
  end
102
102
 
103
103
  create_table "employees2", primary_key: "emp_no", force: :cascade, renamed_from: 'employees' do |t|
@@ -113,7 +113,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
113
113
  t.integer "salary", null: false
114
114
  t.date "from_date", null: false
115
115
  t.date "to_date", null: false
116
- t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
116
+ t.index ["emp_no"], name: "emp_no"
117
117
  end
118
118
 
119
119
  create_table "titles", id: false, force: :cascade do |t|
@@ -121,7 +121,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
121
121
  t.string "title", limit: 50, null: false
122
122
  t.date "from_date", null: false
123
123
  t.date "to_date"
124
- t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
124
+ t.index ["emp_no"], name: "emp_no"
125
125
  end
126
126
  ERB
127
127
  end
data/spec/mysql/migrate/migrate_with_pre_post_query_spec.rb CHANGED
@@ -7,12 +7,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
7
7
  erbh(<<-ERB)
8
8
  create_table "clubs", force: :cascade do |t|
9
9
  t.string "name", default: "", null: false
10
- t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
10
+ t.index ["name"], name: "idx_name", unique: true
11
11
  end
12
12
 
13
13
  create_table "departments", primary_key: "dept_no", force: :cascade do |t|
14
14
  t.string "dept_name", limit: 40, null: false
15
- t.index ["dept_name"], name: "dept_name", unique: true, <%= i cond(5.0, using: :btree) %>
15
+ t.index ["dept_name"], name: "dept_name", unique: true
16
16
  end
17
17
 
18
18
  create_table "dept_emp", id: false, force: :cascade do |t|
@@ -20,8 +20,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
20
20
  t.string "dept_no", null: false
21
21
  t.date "from_date", null: false
22
22
  t.date "to_date", null: false
23
- t.index ["dept_no"], name: "dept_no", <%= i cond(5.0, using: :btree) %>
24
- t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
23
+ t.index ["dept_no"], name: "dept_no"
24
+ t.index ["emp_no"], name: "emp_no"
25
25
  end
26
26
 
27
27
  create_table "dept_manager", id: false, force: :cascade do |t|
@@ -29,14 +29,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
29
29
  t.integer "emp_no", null: false
30
30
  t.date "from_date", null: false
31
31
  t.date "to_date", null: false
32
- t.index ["dept_no"], name: "dept_no", <%= i cond(5.0, using: :btree) %>
33
- t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
32
+ t.index ["dept_no"], name: "dept_no"
33
+ t.index ["emp_no"], name: "emp_no"
34
34
  end
35
35
 
36
36
  create_table "employee_clubs", force: :cascade do |t|
37
37
  t.integer "emp_no", null: false
38
38
  t.integer "club_id", null: false
39
- t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
39
+ t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id"
40
40
  end
41
41
 
42
42
  create_table "employees", primary_key: "emp_no", force: :cascade do |t|
@@ -52,7 +52,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
52
52
  t.integer "salary", null: false
53
53
  t.date "from_date", null: false
54
54
  t.date "to_date", null: false
55
- t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
55
+ t.index ["emp_no"], name: "emp_no"
56
56
  end
57
57
 
58
58
  create_table "titles", id: false, force: :cascade do |t|
@@ -60,7 +60,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
60
60
  t.string "title", limit: 50, null: false
61
61
  t.date "from_date", null: false
62
62
  t.date "to_date"
63
- t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
63
+ t.index ["emp_no"], name: "emp_no"
64
64
  end
65
65
  ERB
66
66
  end
@@ -69,12 +69,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
69
69
  erbh(<<-ERB)
70
70
  create_table "clubs", force: :cascade do |t|
71
71
  t.string "name", default: "", null: false
72
- t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
72
+ t.index ["name"], name: "idx_name", unique: true
73
73
  end
74
74
 
75
75
  create_table "departments", primary_key: "dept_no", force: :cascade do |t|
76
76
  t.string "dept_name", limit: 40, null: false
77
- t.index ["dept_name"], name: "dept_name", unique: true, <%= i cond(5.0, using: :btree) %>
77
+ t.index ["dept_name"], name: "dept_name", unique: true
78
78
  end
79
79
 
80
80
  create_table "dept_emp", id: false, force: :cascade do |t|
@@ -82,8 +82,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
82
82
  t.string "dept_no", null: false
83
83
  t.date "from_date", null: false
84
84
  t.date "to_date", null: false
85
- t.index ["dept_no"], name: "dept_no", <%= i cond(5.0, using: :btree) %>
86
- t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
85
+ t.index ["dept_no"], name: "dept_no"
86
+ t.index ["emp_no"], name: "emp_no"
87
87
  end
88
88
 
89
89
  create_table "dept_manager", id: false, force: :cascade do |t|
@@ -91,14 +91,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
91
91
  t.integer "emp_no", null: false
92
92
  t.date "from_date", null: false
93
93
  t.date "to_date", null: false
94
- t.index ["dept_no"], name: "dept_no", <%= i cond(5.0, using: :btree) %>
95
- t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
94
+ t.index ["dept_no"], name: "dept_no"
95
+ t.index ["emp_no"], name: "emp_no"
96
96
  end
97
97
 
98
98
  create_table "employee_clubs", force: :cascade do |t|
99
99
  t.integer "emp_no", null: false
100
100
  t.integer "club_id", null: false
101
- t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
101
+ t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id"
102
102
  end
103
103
 
104
104
  create_table "employees", primary_key: "emp_no", force: :cascade do |t|
@@ -122,7 +122,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
122
122
  t.integer "salary", null: false
123
123
  t.date "from_date", null: false
124
124
  t.date "to_date", null: false
125
- t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
125
+ t.index ["emp_no"], name: "emp_no"
126
126
  end
127
127
 
128
128
  create_table "titles", id: false, force: :cascade do |t|
@@ -130,7 +130,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
130
130
  t.string "title", limit: 50, null: false
131
131
  t.date "from_date", null: false
132
132
  t.date "to_date"
133
- t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
133
+ t.index ["emp_no"], name: "emp_no"
134
134
  end
135
135
  ERB
136
136
  end
data/spec/mysql/text_blob_types/text_blob_types_spec.rb CHANGED
@@ -26,8 +26,8 @@ describe 'Ridgepole::Client (with new text/blob types)' do
26
26
  delta.migrate
27
27
 
28
28
  expect(subject.dump).to match_ruby erbh(<<-ERB)
29
- create_table "foos", id: :integer, unsigned: true, force: :cascade do |t|
30
- t.binary "blob", <%= i cond(5.0, limit: 65535) %>
29
+ create_table "foos", <%= i cond(">= 6.1", { id: { type: :integer, unsigned: true } }, { id: :integer, unsigned: true }) %>, force: :cascade do |t|
30
+ t.binary "blob"
31
31
  t.<%= cond('< 6.0.0.beta2', :blob, :binary) %> "tiny_blob", <%= i cond('< 6.0.0.beta2', {limit: 255}, {size: :tiny}) %>
32
32
  t.binary "medium_blob", <%= i cond('< 6.0.0.beta2', {limit: 16777215}, {size: :medium}) %>
33
33
  t.binary "long_blob", <%= i cond('< 6.0.0.beta2', {limit: 4294967295}, {size: :long}) %>
data/spec/mysql/~default_name_fk/migrate_change_fk_spec.rb CHANGED
@@ -4,12 +4,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
4
4
  context 'when change fk' do
5
5
  let(:actual_dsl) do
6
6
  erbh(<<-ERB)
7
- create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
7
+ create_table "parent", id: :integer, force: :cascade do |t|
8
8
  end
9
9
 
10
10
  create_table "child", force: :cascade do |t|
11
11
  t.integer "parent_id"
12
- t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
12
+ t.index ["parent_id"], name: "par_id"
13
13
  end
14
14
 
15
15
  add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc", on_delete: :cascade
@@ -20,10 +20,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
20
20
  erbh(<<-ERB)
21
21
  create_table "child", force: :cascade do |t|
22
22
  t.integer "parent_id"
23
- t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
23
+ t.index ["parent_id"], name: "par_id"
24
24
  end
25
25
 
26
- create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
26
+ create_table "parent", id: :integer, force: :cascade do |t|
27
27
  end
28
28
 
29
29
  add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc", on_delete: :cascade
@@ -34,10 +34,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
34
34
  erbh(<<-ERB)
35
35
  create_table "child", force: :cascade do |t|
36
36
  t.integer "parent_id"
37
- t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
37
+ t.index ["parent_id"], name: "par_id"
38
38
  end
39
39
 
40
- create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
40
+ create_table "parent", id: :integer, force: :cascade do |t|
41
41
  end
42
42
 
43
43
  add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
data/spec/mysql/~default_name_fk/migrate_create_fk_spec.rb CHANGED
@@ -6,10 +6,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
6
6
  erbh(<<-ERB)
7
7
  create_table "child", force: :cascade do |t|
8
8
  t.integer "parent_id"
9
- t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
9
+ t.index ["parent_id"], name: "par_id"
10
10
  end
11
11
 
12
- create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
12
+ create_table "parent", id: :integer, force: :cascade do |t|
13
13
  end
14
14
  ERB
15
15
  end
@@ -47,12 +47,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
47
47
  let(:dsl) do
48
48
  erbh(<<-ERB)
49
49
  # Define parent before child
50
- create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
50
+ create_table "parent", id: :integer, force: :cascade do |t|
51
51
  end
52
52
 
53
53
  create_table "child", force: :cascade do |t|
54
54
  t.integer "parent_id"
55
- t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
55
+ t.index ["parent_id"], name: "par_id"
56
56
  end
57
57
 
58
58
  add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
@@ -63,10 +63,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
63
63
  erbh(<<-ERB)
64
64
  create_table "child", force: :cascade do |t|
65
65
  t.integer "parent_id"
66
- t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
66
+ t.index ["parent_id"], name: "par_id"
67
67
  end
68
68
 
69
- create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
69
+ create_table "parent", id: :integer, force: :cascade do |t|
70
70
  end
71
71
 
72
72
  add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
@@ -88,12 +88,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
88
88
  let(:dsl) do
89
89
  erbh(<<-ERB)
90
90
  # Define parent before child
91
- create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
91
+ create_table "parent", id: :integer, force: :cascade do |t|
92
92
  end
93
93
 
94
94
  create_table "child", force: :cascade do |t|
95
95
  t.integer "parent_id", unsigned: true
96
- t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
96
+ t.index ["parent_id"], name: "par_id"
97
97
  end
98
98
 
99
99
  add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
@@ -115,7 +115,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
115
115
  let(:dsl) do
116
116
  erbh(<<-ERB)
117
117
  # Define parent before child
118
- create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
118
+ create_table "parent", id: :integer, force: :cascade do |t|
119
119
  end
120
120
 
121
121
  add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
data/spec/mysql/~default_name_fk/migrate_drop_fk_spec.rb CHANGED
@@ -4,12 +4,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
4
4
  context 'when drop fk' do
5
5
  let(:actual_dsl) do
6
6
  erbh(<<-ERB)
7
- create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
7
+ create_table "parent", id: :integer, force: :cascade do |t|
8
8
  end
9
9
 
10
10
  create_table "child", force: :cascade do |t|
11
11
  t.integer "parent_id"
12
- t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
12
+ t.index ["parent_id"], name: "par_id"
13
13
  end
14
14
 
15
15
  add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
@@ -26,10 +26,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
26
26
  erbh(<<-ERB)
27
27
  create_table "child", force: :cascade do |t|
28
28
  t.integer "parent_id"
29
- t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
29
+ t.index ["parent_id"], name: "par_id"
30
30
  end
31
31
 
32
- create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
32
+ create_table "parent", id: :integer, force: :cascade do |t|
33
33
  end
34
34
  ERB
35
35
  end
@@ -60,12 +60,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
60
60
  context 'when drop fk when drop table' do
61
61
  let(:dsl) do
62
62
  erbh(<<-ERB)
63
- create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
63
+ create_table "parent", id: :integer, force: :cascade do |t|
64
64
  end
65
65
 
66
66
  create_table "child", force: :cascade do |t|
67
67
  t.integer "parent_id"
68
- t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
68
+ t.index ["parent_id"], name: "par_id"
69
69
  end
70
70
 
71
71
  add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
@@ -76,10 +76,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
76
76
  erbh(<<-ERB)
77
77
  create_table "child", force: :cascade do |t|
78
78
  t.integer "parent_id"
79
- t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
79
+ t.index ["parent_id"], name: "par_id"
80
80
  end
81
81
 
82
- create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
82
+ create_table "parent", id: :integer, force: :cascade do |t|
83
83
  end
84
84
 
85
85
  add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
data/spec/mysql/~dump_auto_increment/migrate_create_table_with_index_spec.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- describe 'Ridgepole::Client#diff -> migrate (with index)', condition: '>= 5.1.0' do
3
+ describe 'Ridgepole::Client#diff -> migrate (with index)' do
4
4
  context 'when create table with auto increment column' do
5
5
  let(:actual_dsl) { '' }
6
6
 
@@ -11,8 +11,8 @@ describe 'Ridgepole::Client#diff -> migrate (with index)', condition: '>= 5.1.0'
11
11
  t.integer "dept_no", null: false, auto_increment: true
12
12
  t.date "from_date", null: false
13
13
  t.date "to_date", null: false
14
- t.index ["dept_no"], name: "dept_no", <%= i cond(5.0, using: :btree) %>
15
- t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
14
+ t.index ["dept_no"], name: "dept_no"
15
+ t.index ["emp_no"], name: "emp_no"
16
16
  end
17
17
  ERB
18
18
  end
@@ -30,8 +30,8 @@ describe 'Ridgepole::Client#diff -> migrate (with index)', condition: '>= 5.1.0'
30
30
  t.column("dept_no", :"integer", **{:null=>false, :auto_increment=>true, :limit=>4})
31
31
  t.column("from_date", :"date", **{:null=>false})
32
32
  t.column("to_date", :"date", **{:null=>false})
33
- t.index(["dept_no"], **<%= {:name=>"dept_no"} + cond(5.0, using: :btree) %>)
34
- t.index(["emp_no"], **<%= {:name=>"emp_no"} + cond(5.0, using: :btree) %>)
33
+ t.index(["dept_no"], **{:name=>"dept_no"})
34
+ t.index(["emp_no"], **{:name=>"emp_no"})
35
35
  end
36
36
  ERB
37
37
 
data/spec/mysql57/json/add_json_column_spec.rb CHANGED
@@ -6,7 +6,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
6
6
  erbh(<<-ERB)
7
7
  create_table "books", force: :cascade do |t|
8
8
  t.string "title", null: false
9
- t.index ["title"], name: "index_books_on_title", <%= i cond(5.0, using: :btree) %>
9
+ t.index ["title"], name: "index_books_on_title"
10
10
  end
11
11
  ERB
12
12
  end
@@ -16,7 +16,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
16
16
  create_table "books", force: :cascade do |t|
17
17
  t.string "title", null: false
18
18
  t.json "attrs", null: false
19
- t.index ["title"], name: "index_books_on_title", <%= i cond(5.0, using: :btree) %>
19
+ t.index ["title"], name: "index_books_on_title"
20
20
  end
21
21
  ERB
22
22
  end