ridgepole 0.7.3.beta → 0.7.3.beta2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (154) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +38 -0
  3. data/Appraisals +2 -2
  4. data/README.md +3 -9
  5. data/Rakefile +7 -1
  6. data/bin/ridgepole +97 -108
  7. data/gemfiles/activerecord_5.2.gemfile +1 -1
  8. data/lib/ridgepole/cli/config.rb +43 -43
  9. data/lib/ridgepole/client.rb +65 -63
  10. data/lib/ridgepole/default_limit.rb +26 -24
  11. data/lib/ridgepole/delta.rb +367 -369
  12. data/lib/ridgepole/diff.rb +366 -377
  13. data/lib/ridgepole/dsl_parser.rb +22 -20
  14. data/lib/ridgepole/dsl_parser/context.rb +95 -93
  15. data/lib/ridgepole/dsl_parser/table_definition.rb +125 -123
  16. data/lib/ridgepole/dumper.rb +73 -71
  17. data/lib/ridgepole/execute_expander.rb +55 -55
  18. data/lib/ridgepole/ext/abstract_mysql_adapter/dump_auto_increment.rb +3 -3
  19. data/lib/ridgepole/ext/abstract_mysql_adapter/use_alter_index.rb +1 -1
  20. data/lib/ridgepole/ext/pp_sort_hash.rb +14 -14
  21. data/lib/ridgepole/ext/schema_dumper.rb +1 -1
  22. data/lib/ridgepole/external_sql_executer.rb +20 -20
  23. data/lib/ridgepole/logger.rb +17 -15
  24. data/lib/ridgepole/migration_ext.rb +6 -8
  25. data/lib/ridgepole/schema_statements_ext.rb +3 -3
  26. data/lib/ridgepole/version.rb +1 -1
  27. data/ridgepole.gemspec +11 -10
  28. data/spec/cli_helper.rb +2 -2
  29. data/spec/erb_helper.rb +6 -2
  30. data/spec/hide_pending_formatter.rb +5 -4
  31. data/spec/mysql/_migrate/migrate_change_table_option_spec.rb +8 -8
  32. data/spec/mysql/bigint_pk/bigint_pk_spec.rb +8 -8
  33. data/spec/mysql/bigint_pk/int_pk_spec.rb +13 -13
  34. data/spec/mysql/cli/config_spec.rb +52 -53
  35. data/spec/mysql/cli/ridgepole_spec.rb +111 -111
  36. data/spec/mysql/collation/collation_spec.rb +39 -39
  37. data/spec/mysql/comment/comment_spec.rb +36 -36
  38. data/spec/mysql/default_lambda/default_lambda_spec.rb +30 -30
  39. data/spec/mysql/diff/diff2_spec.rb +18 -18
  40. data/spec/mysql/diff/diff_spec.rb +11 -11
  41. data/spec/mysql/dump/dump_class_method_spec.rb +2 -2
  42. data/spec/mysql/dump/dump_some_tables_spec.rb +14 -14
  43. data/spec/mysql/dump/dump_spec.rb +2 -2
  44. data/spec/mysql/dump/dump_unknown_column_type_spec.rb +3 -3
  45. data/spec/mysql/dump/dump_without_table_options_spec.rb +8 -8
  46. data/spec/mysql/fk/migrate_change_fk_spec.rb +40 -40
  47. data/spec/mysql/fk/migrate_create_fk_spec.rb +40 -40
  48. data/spec/mysql/fk/migrate_drop_fk_spec.rb +60 -60
  49. data/spec/mysql/migrate/check_orphan_index_spec.rb +6 -6
  50. data/spec/mysql/migrate/migrate_add_column2_spec.rb +43 -43
  51. data/spec/mysql/migrate/migrate_add_column_order_spec.rb +50 -50
  52. data/spec/mysql/migrate/migrate_add_column_spec.rb +11 -11
  53. data/spec/mysql/migrate/migrate_add_column_with_alter_extra_spec.rb +8 -8
  54. data/spec/mysql/migrate/migrate_add_column_with_script_spec.rb +11 -11
  55. data/spec/mysql/migrate/migrate_change_column2_spec.rb +20 -20
  56. data/spec/mysql/migrate/migrate_change_column3_spec.rb +60 -60
  57. data/spec/mysql/migrate/migrate_change_column4_spec.rb +16 -16
  58. data/spec/mysql/migrate/migrate_change_column5_spec.rb +24 -24
  59. data/spec/mysql/migrate/migrate_change_column6_spec.rb +40 -40
  60. data/spec/mysql/migrate/migrate_change_column7_spec.rb +4 -4
  61. data/spec/mysql/migrate/migrate_change_column8_spec.rb +9 -9
  62. data/spec/mysql/migrate/migrate_change_column_default_spec.rb +48 -48
  63. data/spec/mysql/migrate/migrate_change_column_float_spec.rb +16 -16
  64. data/spec/mysql/migrate/migrate_change_column_spec.rb +11 -11
  65. data/spec/mysql/migrate/migrate_change_index2_spec.rb +20 -20
  66. data/spec/mysql/migrate/migrate_change_index3_spec.rb +43 -43
  67. data/spec/mysql/migrate/migrate_change_index4_spec.rb +24 -24
  68. data/spec/mysql/migrate/migrate_change_index5_spec.rb +16 -16
  69. data/spec/mysql/migrate/migrate_change_index6_spec.rb +12 -12
  70. data/spec/mysql/migrate/migrate_change_index7_spec.rb +20 -20
  71. data/spec/mysql/migrate/migrate_change_index8_spec.rb +20 -20
  72. data/spec/mysql/migrate/migrate_change_index_spec.rb +17 -17
  73. data/spec/mysql/migrate/migrate_change_table_comment_spec.rb +10 -10
  74. data/spec/mysql/migrate/migrate_change_table_option_spec.rb +18 -18
  75. data/spec/mysql/migrate/migrate_check_relation_column_type_spec.rb +37 -37
  76. data/spec/mysql/migrate/migrate_create_index2_spec.rb +12 -12
  77. data/spec/mysql/migrate/migrate_create_index_spec.rb +11 -11
  78. data/spec/mysql/migrate/migrate_create_table_spec.rb +8 -8
  79. data/spec/mysql/migrate/migrate_create_table_with_index_spec.rb +6 -6
  80. data/spec/mysql/migrate/migrate_create_table_with_options_spec.rb +12 -12
  81. data/spec/mysql/migrate/migrate_create_table_with_script_spec.rb +11 -11
  82. data/spec/mysql/migrate/migrate_drop_column_and_index2_spec.rb +9 -9
  83. data/spec/mysql/migrate/migrate_drop_column_and_index_spec.rb +12 -12
  84. data/spec/mysql/migrate/migrate_drop_column_and_unique_index_spec.rb +10 -10
  85. data/spec/mysql/migrate/migrate_drop_column_spec.rb +11 -11
  86. data/spec/mysql/migrate/migrate_drop_index_spec.rb +11 -11
  87. data/spec/mysql/migrate/migrate_drop_table_spec.rb +8 -8
  88. data/spec/mysql/migrate/migrate_duplicate_index_spec.rb +6 -6
  89. data/spec/mysql/migrate/migrate_duplicate_table_spec.rb +6 -6
  90. data/spec/mysql/migrate/migrate_empty_spec.rb +4 -4
  91. data/spec/mysql/migrate/migrate_execute_spec.rb +55 -55
  92. data/spec/mysql/migrate/migrate_log_file_spec.rb +9 -9
  93. data/spec/mysql/migrate/migrate_merge_mode_spec.rb +9 -9
  94. data/spec/mysql/migrate/migrate_noop_spec.rb +19 -19
  95. data/spec/mysql/migrate/migrate_primary_key_spec.rb +18 -18
  96. data/spec/mysql/migrate/migrate_rename_column_spec.rb +17 -17
  97. data/spec/mysql/migrate/migrate_rename_table_spec.rb +26 -26
  98. data/spec/mysql/migrate/migrate_same_default_null_spec.rb +16 -16
  99. data/spec/mysql/migrate/migrate_same_spec.rb +4 -4
  100. data/spec/mysql/migrate/migrate_script_error_spec.rb +8 -8
  101. data/spec/mysql/migrate/migrate_skip_column_comment_change_spec.rb +8 -8
  102. data/spec/mysql/migrate/migrate_skip_drop_table_spec.rb +9 -9
  103. data/spec/mysql/migrate/migrate_skip_rename_column_spec.rb +8 -8
  104. data/spec/mysql/migrate/migrate_skip_rename_table_spec.rb +9 -9
  105. data/spec/mysql/migrate/migrate_with_ignore_tables_spec.rb +64 -64
  106. data/spec/mysql/migrate/migrate_with_pre_post_query_spec.rb +12 -12
  107. data/spec/mysql/migrate/migrate_with_tables_spec.rb +29 -29
  108. data/spec/mysql/migrate/migrate_with_verbose_log_spec.rb +18 -18
  109. data/spec/mysql/migrate_/migrate_create_index_with_alter_spec.rb +8 -8
  110. data/spec/mysql/migrate_/migrate_drop_index_with_alter_spec.rb +8 -8
  111. data/spec/mysql/text_blob_types/text_blob_types_spec.rb +8 -8
  112. data/spec/mysql/~default_name_fk/migrate_change_fk_spec.rb +12 -12
  113. data/spec/mysql/~default_name_fk/migrate_create_fk_spec.rb +30 -30
  114. data/spec/mysql/~default_name_fk/migrate_drop_fk_spec.rb +22 -22
  115. data/spec/mysql/~dump_auto_increment/migrate_create_table_with_index_spec.rb +7 -7
  116. data/spec/mysql57/json/add_json_column_spec.rb +8 -8
  117. data/spec/mysql57/json/change_json_column_spec.rb +24 -24
  118. data/spec/mysql57/json/drop_json_column_spec.rb +8 -8
  119. data/spec/mysql57/virtual/add_virtual_column_spec.rb +9 -9
  120. data/spec/mysql57/virtual/change_virtual_column_spec.rb +9 -9
  121. data/spec/mysql57/virtual/drop_virtual_column_spec.rb +9 -9
  122. data/spec/postgresql/diff/diff_spec.rb +18 -18
  123. data/spec/postgresql/dump/dump_spec.rb +2 -2
  124. data/spec/postgresql/fk/migrate_change_fk_spec.rb +24 -24
  125. data/spec/postgresql/fk/migrate_create_fk_spec.rb +40 -40
  126. data/spec/postgresql/fk/migrate_drop_fk_spec.rb +44 -44
  127. data/spec/postgresql/migrate/migrate_add_column_spec.rb +21 -21
  128. data/spec/postgresql/migrate/migrate_add_expression_index_spec.rb +2 -2
  129. data/spec/postgresql/migrate/migrate_bigint_spec.rb +12 -12
  130. data/spec/postgresql/migrate/migrate_change_column_default_spec.rb +8 -8
  131. data/spec/postgresql/migrate/migrate_change_column_spec.rb +19 -19
  132. data/spec/postgresql/migrate/migrate_change_index_spec.rb +13 -13
  133. data/spec/postgresql/migrate/migrate_check_relation_column_type_spec.rb +19 -19
  134. data/spec/postgresql/migrate/migrate_create_table_spec.rb +8 -8
  135. data/spec/postgresql/migrate/migrate_create_table_with_default_proc_spec.rb +18 -18
  136. data/spec/postgresql/migrate/migrate_drop_column_spec.rb +11 -11
  137. data/spec/postgresql/migrate/migrate_drop_column_with_index_spec.rb +12 -12
  138. data/spec/postgresql/migrate/migrate_drop_expression_index_spec.rb +8 -8
  139. data/spec/postgresql/migrate/migrate_drop_index_spec.rb +11 -11
  140. data/spec/postgresql/migrate/migrate_drop_table_spec.rb +8 -8
  141. data/spec/postgresql/migrate/migrate_ext_cols_spec.rb +8 -8
  142. data/spec/postgresql/migrate/migrate_primary_key_spec.rb +97 -0
  143. data/spec/postgresql/migrate/migrate_references_spec.rb +24 -24
  144. data/spec/postgresql/migrate/migrate_rename_column_spec.rb +11 -11
  145. data/spec/postgresql/migrate/migrate_rename_table_spec.rb +16 -16
  146. data/spec/postgresql/migrate/migrate_same_spec.rb +4 -4
  147. data/spec/postgresql/~default_name_fk/migrate_change_fk_spec.rb +12 -12
  148. data/spec/postgresql/~default_name_fk/migrate_create_fk_spec.rb +30 -30
  149. data/spec/postgresql/~default_name_fk/migrate_drop_fk_spec.rb +22 -22
  150. data/spec/processing_for_travis.rb +1 -1
  151. data/spec/spec_condition.rb +2 -2
  152. data/spec/spec_const.rb +9 -9
  153. data/spec/spec_helper.rb +21 -23
  154. metadata +54 -37
data/spec/mysql/migrate/migrate_change_column_float_spec.rb CHANGED
@@ -1,26 +1,26 @@
1
1
  describe 'Ridgepole::Client#diff -> migrate' do
2
2
  context 'when change float column' do
3
- let(:actual_dsl) {
4
- erbh(<<-EOS)
3
+ let(:actual_dsl) do
4
+ erbh(<<-ERB)
5
5
  create_table "salaries", id: false, force: :cascade do |t|
6
6
  t.integer "emp_no", null: false
7
7
  t.float "salary", limit: 24, null: false
8
8
  t.date "from_date", null: false
9
9
  t.date "to_date", null: false
10
10
  end
11
- EOS
12
- }
11
+ ERB
12
+ end
13
13
 
14
- let(:expected_dsl) {
15
- <<-EOS
14
+ let(:expected_dsl) do
15
+ <<-RUBY
16
16
  create_table "salaries", id: false, force: :cascade do |t|
17
17
  t.integer "emp_no", null: false
18
18
  t.float "salary", null: false
19
19
  t.date "from_date", null: false
20
20
  t.date "to_date", null: false
21
21
  end
22
- EOS
23
- }
22
+ RUBY
23
+ end
24
24
 
25
25
  before { subject.diff(actual_dsl).migrate }
26
26
  subject { client(default_float_limit: 0) }
@@ -40,27 +40,27 @@ describe 'Ridgepole::Client#diff -> migrate' do
40
40
  end
41
41
 
42
42
  context 'when change float column (no change)' do
43
- let(:actual_dsl) {
44
- <<-EOS
43
+ let(:actual_dsl) do
44
+ <<-RUBY
45
45
  create_table "salaries", id: false, force: :cascade do |t|
46
46
  t.integer "emp_no", null: false
47
47
  t.float "salary", limit: 24, null: false
48
48
  t.date "from_date", null: false
49
49
  t.date "to_date", null: false
50
50
  end
51
- EOS
52
- }
51
+ RUBY
52
+ end
53
53
 
54
- let(:expected_dsl) {
55
- <<-EOS
54
+ let(:expected_dsl) do
55
+ <<-RUBY
56
56
  create_table "salaries", id: false, force: :cascade do |t|
57
57
  t.integer "emp_no", null: false
58
58
  t.float "salary", null: false
59
59
  t.date "from_date", null: false
60
60
  t.date "to_date", null: false
61
61
  end
62
- EOS
63
- }
62
+ RUBY
63
+ end
64
64
 
65
65
  before { subject.diff(actual_dsl).migrate }
66
66
  subject { client }
data/spec/mysql/migrate/migrate_change_column_spec.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  describe 'Ridgepole::Client#diff -> migrate' do
2
2
  context 'when change column' do
3
- let(:actual_dsl) {
4
- erbh(<<-EOS)
3
+ let(:actual_dsl) do
4
+ erbh(<<-ERB)
5
5
  create_table "clubs", force: :cascade do |t|
6
6
  t.string "name", default: "", null: false
7
7
  t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
@@ -59,11 +59,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
59
59
  t.date "to_date"
60
60
  t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
61
61
  end
62
- EOS
63
- }
62
+ ERB
63
+ end
64
64
 
65
- let(:expected_dsl) {
66
- erbh(<<-EOS)
65
+ let(:expected_dsl) do
66
+ erbh(<<-ERB)
67
67
  create_table "clubs", force: :cascade do |t|
68
68
  t.string "name", default: "", null: false
69
69
  t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
@@ -121,8 +121,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
121
121
  t.date "to_date"
122
122
  t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
123
123
  end
124
- EOS
125
- }
124
+ ERB
125
+ end
126
126
 
127
127
  before { subject.diff(actual_dsl).migrate }
128
128
  subject { client }
@@ -136,10 +136,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
136
136
  }
137
137
 
138
138
  it {
139
- delta = client(:bulk_change => true).diff(expected_dsl)
139
+ delta = client(bulk_change: true).diff(expected_dsl)
140
140
  expect(delta.differ?).to be_truthy
141
141
  expect(subject.dump).to match_ruby actual_dsl
142
- expect(delta.script).to match_fuzzy erbh(<<-EOS)
142
+ expect(delta.script).to match_fuzzy erbh(<<-ERB)
143
143
  change_table("employee_clubs", {:bulk => true}) do |t|
144
144
  t.change("club_id", :integer, <%= {:null=>true, :default=>nil, :unsigned=>false} + cond('>= 5.1',comment: nil) %>)
145
145
  end
@@ -148,7 +148,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
148
148
  t.change("last_name", :string, <%= {:limit=>20, :default=>"XXX", :unsigned=>false} + cond('>= 5.1',comment: nil) %>)
149
149
  t.change("gender", :string, <%= {:limit=>2, :null=>false, :default=>nil, :unsigned=>false} + cond('>= 5.1',comment: nil) %>)
150
150
  end
151
- EOS
151
+ ERB
152
152
  delta.migrate
153
153
  expect(subject.dump).to match_ruby expected_dsl
154
154
  }
data/spec/mysql/migrate/migrate_change_index2_spec.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  describe 'Ridgepole::Client#diff -> migrate' do
2
2
  context 'when change index (no change)' do
3
- let(:actual_dsl) {
4
- erbh(<<-EOS)
3
+ let(:actual_dsl) do
4
+ erbh(<<-ERB)
5
5
  create_table "salaries", id: false, force: :cascade do |t|
6
6
  t.integer "emp_no", null: false
7
7
  t.integer "salary", null: false
@@ -9,11 +9,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
9
9
  t.date "to_date", null: false
10
10
  t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
11
11
  end
12
- EOS
13
- }
12
+ ERB
13
+ end
14
14
 
15
- let(:expected_dsl) {
16
- erbh(<<-EOS)
15
+ let(:expected_dsl) do
16
+ erbh(<<-ERB)
17
17
  create_table "salaries", id: false, force: :cascade do |t|
18
18
  t.integer "emp_no", null: false
19
19
  t.integer "salary", null: false
@@ -21,8 +21,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
21
21
  t.date "to_date", null: false
22
22
  t.index "emp_no", name: "emp_no", <%= i cond(5.0, using: :btree) %>
23
23
  end
24
- EOS
25
- }
24
+ ERB
25
+ end
26
26
 
27
27
  before { subject.diff(actual_dsl).migrate }
28
28
  subject { client }
@@ -34,8 +34,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
34
34
  end
35
35
 
36
36
  context 'when change index (change)' do
37
- let(:actual_dsl) {
38
- erbh(<<-EOS)
37
+ let(:actual_dsl) do
38
+ erbh(<<-ERB)
39
39
  create_table "salaries", id: false, force: :cascade do |t|
40
40
  t.integer "emp_no", null: false
41
41
  t.integer "salary", null: false
@@ -43,11 +43,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
43
43
  t.date "to_date", null: false
44
44
  t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
45
45
  end
46
- EOS
47
- }
46
+ ERB
47
+ end
48
48
 
49
- let(:dsl) {
50
- erbh(<<-EOS)
49
+ let(:dsl) do
50
+ erbh(<<-ERB)
51
51
  create_table "salaries", id: false, force: :cascade do |t|
52
52
  t.integer "emp_no", null: false
53
53
  t.integer "salary", null: false
@@ -55,11 +55,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
55
55
  t.date "to_date", null: false
56
56
  t.index "salary", name: "emp_no", <%= i cond(5.0, using: :btree) %>
57
57
  end
58
- EOS
59
- }
58
+ ERB
59
+ end
60
60
 
61
- let(:expected_dsl) {
62
- erbh(<<-EOS)
61
+ let(:expected_dsl) do
62
+ erbh(<<-ERB)
63
63
  create_table "salaries", id: false, force: :cascade do |t|
64
64
  t.integer "emp_no", null: false
65
65
  t.integer "salary", null: false
@@ -67,8 +67,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
67
67
  t.date "to_date", null: false
68
68
  t.index ["salary"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
69
69
  end
70
- EOS
71
- }
70
+ ERB
71
+ end
72
72
 
73
73
  before { subject.diff(actual_dsl).migrate }
74
74
  subject { client }
data/spec/mysql/migrate/migrate_change_index3_spec.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  describe 'Ridgepole::Client#diff -> migrate' do
2
2
  context 'when change index without using (no change)' do
3
- let(:actual_dsl) {
4
- erbh(<<-EOS)
3
+ let(:actual_dsl) do
4
+ erbh(<<-ERB)
5
5
  create_table "salaries", id: false, force: :cascade do |t|
6
6
  t.integer "emp_no", null: false
7
7
  t.integer "salary", null: false
@@ -9,11 +9,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
9
9
  t.date "to_date", null: false
10
10
  t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
11
11
  end
12
- EOS
13
- }
12
+ ERB
13
+ end
14
14
 
15
- let(:expected_dsl) {
16
- <<-EOS
15
+ let(:expected_dsl) do
16
+ <<-RUBY
17
17
  create_table "salaries", id: false, force: :cascade do |t|
18
18
  t.integer "emp_no", null: false
19
19
  t.integer "salary", null: false
@@ -21,8 +21,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
21
21
  t.date "to_date", null: false
22
22
  t.index ["emp_no"], name: "emp_no"
23
23
  end
24
- EOS
25
- }
24
+ RUBY
25
+ end
26
26
 
27
27
  before { subject.diff(actual_dsl).migrate }
28
28
  subject { client }
@@ -34,8 +34,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
34
34
  end
35
35
 
36
36
  context 'when change index without using (change)' do
37
- let(:actual_dsl) {
38
- erbh(<<-EOS)
37
+ let(:actual_dsl) do
38
+ erbh(<<-ERB)
39
39
  create_table "salaries", id: false, force: :cascade do |t|
40
40
  t.integer "emp_no", null: false
41
41
  t.integer "salary", null: false
@@ -43,11 +43,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
43
43
  t.date "to_date", null: false
44
44
  t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
45
45
  end
46
- EOS
47
- }
46
+ ERB
47
+ end
48
48
 
49
- let(:dsl) {
50
- <<-EOS
49
+ let(:dsl) do
50
+ <<-RUBY
51
51
  create_table "salaries", id: false, force: :cascade do |t|
52
52
  t.integer "emp_no", null: false
53
53
  t.integer "salary", null: false
@@ -55,11 +55,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
55
55
  t.date "to_date", null: false
56
56
  t.index ["salary"], using: :hash
57
57
  end
58
- EOS
59
- }
58
+ RUBY
59
+ end
60
60
 
61
- let(:expected_dsl) {
62
- <<-EOS
61
+ let(:expected_dsl) do
62
+ <<-RUBY
63
63
  create_table "salaries", id: false, force: :cascade do |t|
64
64
  t.integer "emp_no", null: false
65
65
  t.integer "salary", null: false
@@ -67,10 +67,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
67
67
  t.date "to_date", null: false
68
68
  t.index ["salary"], name: "index_salaries_on_salary", using: :hash
69
69
  end
70
- EOS
71
- }
70
+ RUBY
71
+ end
72
72
 
73
- before { subject.diff(<<-EOS).migrate }
73
+ before { subject.diff(<<-RUBY).migrate }
74
74
  create_table "salaries", id: false, force: :cascade do |t|
75
75
  t.integer "emp_no", null: false
76
76
  t.integer "salary", null: false
@@ -79,9 +79,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
79
79
  end
80
80
 
81
81
  add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
82
- EOS
82
+ RUBY
83
83
 
84
- subject { client(:table_options => 'ENGINE=MEMORY') }
84
+ subject { client(table_options: 'ENGINE=MEMORY') }
85
85
 
86
86
  it {
87
87
  delta = subject.diff(dsl)
@@ -93,8 +93,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
93
93
  end
94
94
 
95
95
  context 'when change index without name (no change)' do
96
- let(:actual_dsl) {
97
- erbh(<<-EOS)
96
+ let(:actual_dsl) do
97
+ erbh(<<-ERB)
98
98
  create_table "salaries", id: false, force: :cascade do |t|
99
99
  t.integer "emp_no", null: false
100
100
  t.integer "salary", null: false
@@ -102,11 +102,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
102
102
  t.date "to_date", null: false
103
103
  t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
104
104
  end
105
- EOS
106
- }
105
+ ERB
106
+ end
107
107
 
108
- let(:expected_dsl) {
109
- erbh(<<-EOS)
108
+ let(:expected_dsl) do
109
+ erbh(<<-ERB)
110
110
  create_table "salaries", id: false, force: :cascade do |t|
111
111
  t.integer "emp_no", null: false
112
112
  t.integer "salary", null: false
@@ -114,8 +114,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
114
114
  t.date "to_date", null: false
115
115
  t.index ["emp_no"], <%= i cond(5.0, using: :btree) %>
116
116
  end
117
- EOS
118
- }
117
+ ERB
118
+ end
119
119
 
120
120
  before { subject.diff(actual_dsl).migrate }
121
121
  subject { client }
@@ -127,8 +127,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
127
127
  end
128
128
 
129
129
  context 'when change index without name (change)' do
130
- let(:actual_dsl) {
131
- erbh(<<-EOS)
130
+ let(:actual_dsl) do
131
+ erbh(<<-ERB)
132
132
  create_table "salaries", id: false, force: :cascade do |t|
133
133
  t.integer "emp_no", null: false
134
134
  t.integer "salary", null: false
@@ -136,11 +136,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
136
136
  t.date "to_date", null: false
137
137
  t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
138
138
  end
139
- EOS
140
- }
139
+ ERB
140
+ end
141
141
 
142
- let(:dsl) {
143
- erbh(<<-EOS)
142
+ let(:dsl) do
143
+ erbh(<<-ERB)
144
144
  create_table "salaries", id: false, force: :cascade do |t|
145
145
  t.integer "emp_no", null: false
146
146
  t.integer "salary", null: false
@@ -148,11 +148,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
148
148
  t.date "to_date", null: false
149
149
  t.index ["salary"], <%= i cond(5.0, using: :btree) %>
150
150
  end
151
- EOS
152
- }
151
+ ERB
152
+ end
153
153
 
154
- let(:expected_dsl) {
155
- erbh(<<-EOS)
154
+ let(:expected_dsl) do
155
+ erbh(<<-ERB)
156
156
  create_table "salaries", id: false, force: :cascade do |t|
157
157
  t.integer "emp_no", null: false
158
158
  t.integer "salary", null: false
@@ -160,8 +160,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
160
160
  t.date "to_date", null: false
161
161
  t.index ["salary"], name: "index_salaries_on_salary", <%= i cond(5.0, using: :btree) %>
162
162
  end
163
- EOS
164
- }
163
+ ERB
164
+ end
165
165
 
166
166
  before { subject.diff(actual_dsl).migrate }
167
167
  subject { client }
data/spec/mysql/migrate/migrate_change_index4_spec.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  describe 'Ridgepole::Client#diff -> migrate' do
2
2
  context 'when change index (same name)' do
3
- let(:actual_dsl) {
4
- erbh(<<-EOS)
3
+ let(:actual_dsl) do
4
+ erbh(<<-ERB)
5
5
  create_table "salaries", force: :cascade do |t|
6
6
  t.integer "emp_no", null: false
7
7
  t.integer "salary", null: false
@@ -9,11 +9,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
9
9
  t.date "to_date", null: false
10
10
  t.index ["emp_no", "id"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
11
11
  end
12
- EOS
13
- }
12
+ ERB
13
+ end
14
14
 
15
- let(:expected_dsl) {
16
- erbh(<<-EOS)
15
+ let(:expected_dsl) do
16
+ erbh(<<-ERB)
17
17
  create_table "salaries", force: :cascade do |t|
18
18
  t.integer "emp_no", null: false
19
19
  t.integer "salary", null: false
@@ -21,8 +21,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
21
21
  t.date "to_date", null: false
22
22
  t.index ["salary", "id"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
23
23
  end
24
- EOS
25
- }
24
+ ERB
25
+ end
26
26
 
27
27
  before { subject.diff(actual_dsl).migrate }
28
28
  subject { client }
@@ -37,8 +37,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
37
37
  end
38
38
 
39
39
  context 'when change index (same name) (2)' do
40
- let(:actual_dsl) {
41
- erbh(<<-EOS)
40
+ let(:actual_dsl) do
41
+ erbh(<<-ERB)
42
42
  create_table "salaries", id: false, force: :cascade do |t|
43
43
  t.integer "emp_no", null: false
44
44
  t.integer "salary", null: false
@@ -46,11 +46,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
46
46
  t.date "to_date", null: false
47
47
  t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
48
48
  end
49
- EOS
50
- }
49
+ ERB
50
+ end
51
51
 
52
- let(:expected_dsl) {
53
- erbh(<<-EOS)
52
+ let(:expected_dsl) do
53
+ erbh(<<-ERB)
54
54
  create_table "salaries", id: false, force: :cascade do |t|
55
55
  t.integer "emp_no", null: false
56
56
  t.integer "salary", null: false
@@ -58,8 +58,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
58
58
  t.date "to_date", null: false
59
59
  t.index ["salary"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
60
60
  end
61
- EOS
62
- }
61
+ ERB
62
+ end
63
63
 
64
64
  before { subject.diff(actual_dsl).migrate }
65
65
  subject { client }
@@ -74,27 +74,27 @@ describe 'Ridgepole::Client#diff -> migrate' do
74
74
  end
75
75
 
76
76
  context 'when change index (same name) (3)' do
77
- let(:actual_dsl) {
78
- erbh(<<-EOS)
77
+ let(:actual_dsl) do
78
+ erbh(<<-ERB)
79
79
  create_table "salaries", primary_key: "emp_no", force: :cascade do |t|
80
80
  t.integer "salary", null: false
81
81
  t.date "from_date", null: false
82
82
  t.date "to_date", null: false
83
83
  t.index ["salary", "emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
84
84
  end
85
- EOS
86
- }
85
+ ERB
86
+ end
87
87
 
88
- let(:expected_dsl) {
89
- erbh(<<-EOS)
88
+ let(:expected_dsl) do
89
+ erbh(<<-ERB)
90
90
  create_table "salaries", primary_key: "emp_no", force: :cascade do |t|
91
91
  t.integer "salary", null: false
92
92
  t.date "from_date", null: false
93
93
  t.date "to_date", null: false
94
94
  t.index ["from_date", "emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
95
95
  end
96
- EOS
97
- }
96
+ ERB
97
+ end
98
98
 
99
99
  before { subject.diff(actual_dsl).migrate }
100
100
  subject { client }