ridgepole 0.6.6 → 0.7.0.alpha

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (73) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +2 -7
  3. data/Appraisals +4 -5
  4. data/README.md +3 -0
  5. data/gemfiles/activerecord_5.0.gemfile +1 -1
  6. data/gemfiles/{activerecord_4.2.gemfile → activerecord_5.1.gemfile} +1 -2
  7. data/lib/ridgepole.rb +1 -0
  8. data/lib/ridgepole/client.rb +1 -3
  9. data/lib/ridgepole/connection_adapters.rb +11 -0
  10. data/lib/ridgepole/delta.rb +5 -0
  11. data/lib/ridgepole/diff.rb +5 -10
  12. data/lib/ridgepole/dsl_parser/context.rb +1 -4
  13. data/lib/ridgepole/dumper.rb +0 -11
  14. data/lib/ridgepole/schema_statements_ext.rb +1 -1
  15. data/lib/ridgepole/version.rb +1 -1
  16. data/ridgepole.gemspec +2 -2
  17. data/ridgepole.iml +9 -0
  18. data/spec/erb_helper.rb +25 -15
  19. data/spec/mysql/bigint_pk/bigint_pk_spec.rb +15 -15
  20. data/spec/mysql/bigint_pk/int_pk_spec.rb +45 -0
  21. data/spec/mysql/cli/config_spec.rb +7 -7
  22. data/spec/mysql/cli/ridgepole_spec.rb +20 -20
  23. data/spec/mysql/collation/collation_spec.rb +40 -41
  24. data/spec/mysql/comment/comment_spec.rb +19 -19
  25. data/spec/mysql/default_lambda/default_lambda_spec.rb +3 -3
  26. data/spec/mysql/diff/diff2_spec.rb +8 -5
  27. data/spec/mysql/diff/diff_spec.rb +8 -5
  28. data/spec/mysql/dump/dump_class_method_spec.rb +18 -68
  29. data/spec/mysql/dump/dump_some_tables_spec.rb +10 -30
  30. data/spec/mysql/dump/dump_spec.rb +21 -54
  31. data/spec/mysql/dump/dump_without_table_options_spec.rb +8 -35
  32. data/spec/mysql/fk/migrate_change_fk_spec.rb +8 -8
  33. data/spec/mysql/fk/migrate_create_fk_spec.rb +21 -35
  34. data/spec/mysql/fk/migrate_drop_fk_spec.rb +16 -30
  35. data/spec/mysql/migrate/migrate_add_column2_spec.rb +3 -5
  36. data/spec/mysql/migrate/migrate_add_column_order_spec.rb +21 -39
  37. data/spec/mysql/migrate/migrate_change_column5_spec.rb +8 -8
  38. data/spec/mysql/migrate/migrate_change_column6_spec.rb +18 -18
  39. data/spec/mysql/migrate/migrate_change_column_default_spec.rb +23 -16
  40. data/spec/mysql/migrate/migrate_change_column_spec.rb +34 -34
  41. data/spec/mysql/migrate/migrate_change_index3_spec.rb +19 -9
  42. data/spec/mysql/migrate/migrate_create_index_spec.rb +32 -32
  43. data/spec/mysql/migrate/migrate_create_table_spec.rb +0 -9
  44. data/spec/mysql/migrate/migrate_drop_index_spec.rb +32 -32
  45. data/spec/mysql/migrate/migrate_drop_table_spec.rb +30 -30
  46. data/spec/mysql/migrate/migrate_execute_spec.rb +68 -81
  47. data/spec/mysql/migrate/migrate_merge_mode_spec.rb +1 -3
  48. data/spec/mysql/migrate/migrate_noop_spec.rb +34 -61
  49. data/spec/mysql/migrate/migrate_rename_table_spec.rb +3 -24
  50. data/spec/mysql/migrate/migrate_same_spec.rb +12 -45
  51. data/spec/mysql/migrate/migrate_with_ignore_tables_spec.rb +6 -6
  52. data/spec/mysql/migrate/migrate_with_tables_spec.rb +2 -2
  53. data/spec/mysql/migrate/migrate_with_verbose_log_spec.rb +1 -6
  54. data/spec/mysql/migrate_/migrate_drop_index_with_alter_spec.rb +10 -10
  55. data/spec/mysql/text_blob_types/text_blob_types_spec.rb +3 -3
  56. data/spec/mysql/~default_name_fk/migrate_change_fk_spec.rb +6 -6
  57. data/spec/mysql/~default_name_fk/migrate_create_fk_spec.rb +10 -10
  58. data/spec/mysql/~default_name_fk/migrate_drop_fk_spec.rb +6 -6
  59. data/spec/postgresql/diff/diff_spec.rb +6 -0
  60. data/spec/postgresql/dump/dump_spec.rb +9 -33
  61. data/spec/postgresql/migrate/migrate_add_expression_index_spec.rb +3 -3
  62. data/spec/postgresql/migrate/migrate_bigint_spec.rb +10 -26
  63. data/spec/postgresql/migrate/migrate_create_table_spec.rb +0 -9
  64. data/spec/postgresql/migrate/migrate_create_table_with_default_proc_spec.rb +1 -1
  65. data/spec/postgresql/migrate/migrate_drop_column_with_index_spec.rb +2 -2
  66. data/spec/postgresql/migrate/migrate_drop_expression_index_spec.rb +7 -7
  67. data/spec/postgresql/migrate/migrate_drop_index_spec.rb +4 -4
  68. data/spec/postgresql/migrate/migrate_drop_table_spec.rb +3 -3
  69. data/spec/postgresql/migrate/migrate_ext_cols_spec.rb +0 -3
  70. data/spec/postgresql/migrate/migrate_same_spec.rb +9 -33
  71. data/spec/spec_condition.rb +15 -6
  72. data/spec/spec_helper.rb +2 -15
  73. metadata +14 -10
data/spec/mysql/migrate/migrate_create_index_spec.rb CHANGED
@@ -2,21 +2,21 @@ describe 'Ridgepole::Client#diff -> migrate' do
2
2
  context 'when create index' do
3
3
  let(:dsl) {
4
4
  erbh(<<-EOS)
5
- create_table "clubs", <%= i unsigned(true) + {force: :cascade} %> do |t|
6
- t.string "name", <%= i limit(255) + {default: "", null: false} %>
5
+ create_table "clubs", force: :cascade do |t|
6
+ t.string "name", default: "", null: false
7
7
  end
8
8
 
9
9
  <%= add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree %>
10
10
 
11
- create_table "departments", primary_key: "dept_no", <%= i unsigned(true) + {force: :cascade} %> do |t|
11
+ create_table "departments", primary_key: "dept_no", force: :cascade do |t|
12
12
  t.string "dept_name", limit: 40, null: false
13
13
  end
14
14
 
15
15
  <%= add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree %>
16
16
 
17
17
  create_table "dept_emp", id: false, force: :cascade do |t|
18
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
19
- t.string "dept_no", <%= i limit(4) + {null: false} %>
18
+ t.integer "emp_no", null: false
19
+ t.string "dept_no", null: false
20
20
  t.date "from_date", null: false
21
21
  t.date "to_date", null: false
22
22
  end
@@ -25,8 +25,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
25
25
  <%= add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree %>
26
26
 
27
27
  create_table "dept_manager", id: false, force: :cascade do |t|
28
- t.string "dept_no", <%= i limit(4) + {null: false} %>
29
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
28
+ t.string "dept_no", null: false
29
+ t.integer "emp_no", null: false
30
30
  t.date "from_date", null: false
31
31
  t.date "to_date", null: false
32
32
  end
@@ -34,14 +34,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
34
34
  <%= add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree %>
35
35
  <%= add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree %>
36
36
 
37
- create_table "employee_clubs", <%= i unsigned(true) + {force: :cascade} %> do |t|
38
- t.integer "emp_no", <%= i limit(4) + {null: false} + unsigned(true) %>
39
- t.integer "club_id", <%= i limit(4) + {null: false} + unsigned(true) %>
37
+ create_table "employee_clubs", force: :cascade do |t|
38
+ t.integer "emp_no", null: false
39
+ t.integer "club_id", null: false
40
40
  end
41
41
 
42
42
  <%= add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree %>
43
43
 
44
- create_table "employees", primary_key: "emp_no", <%= i unsigned(true) + {force: :cascade} %> do |t|
44
+ create_table "employees", primary_key: "emp_no", force: :cascade do |t|
45
45
  t.date "birth_date", null: false
46
46
  t.string "first_name", limit: 14, null: false
47
47
  t.string "last_name", limit: 16, null: false
@@ -50,8 +50,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
50
50
  end
51
51
 
52
52
  create_table "salaries", id: false, force: :cascade do |t|
53
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
54
- t.integer "salary", <%= i limit(4) + {null: false} %>
53
+ t.integer "emp_no", null: false
54
+ t.integer "salary", null: false
55
55
  t.date "from_date", null: false
56
56
  t.date "to_date", null: false
57
57
  end
@@ -59,7 +59,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
59
59
  <%= add_index "salaries", ["emp_no"], name: "emp_no", using: :btree %>
60
60
 
61
61
  create_table "titles", id: false, force: :cascade do |t|
62
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
62
+ t.integer "emp_no", null: false
63
63
  t.string "title", limit: 50, null: false
64
64
  t.date "from_date", null: false
65
65
  t.date "to_date"
@@ -71,19 +71,19 @@ describe 'Ridgepole::Client#diff -> migrate' do
71
71
 
72
72
  let(:actual_dsl) {
73
73
  erbh(<<-EOS)
74
- create_table "clubs", <%= i unsigned(true) + {force: :cascade} %> do |t|
75
- t.string "name", <%= i limit(255) + {default: "", null: false} %>
74
+ create_table "clubs", force: :cascade do |t|
75
+ t.string "name", default: "", null: false
76
76
  end
77
77
 
78
- create_table "departments", primary_key: "dept_no", <%= i unsigned(true) + {force: :cascade} %> do |t|
78
+ create_table "departments", primary_key: "dept_no", force: :cascade do |t|
79
79
  t.string "dept_name", limit: 40, null: false
80
80
  end
81
81
 
82
82
  <%= add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree %>
83
83
 
84
84
  create_table "dept_emp", id: false, force: :cascade do |t|
85
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
86
- t.string "dept_no", <%= i limit(4) + {null: false} %>
85
+ t.integer "emp_no", null: false
86
+ t.string "dept_no", null: false
87
87
  t.date "from_date", null: false
88
88
  t.date "to_date", null: false
89
89
  end
@@ -92,8 +92,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
92
92
  <%= add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree %>
93
93
 
94
94
  create_table "dept_manager", id: false, force: :cascade do |t|
95
- t.string "dept_no", <%= i limit(4) + {null: false} %>
96
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
95
+ t.string "dept_no", null: false
96
+ t.integer "emp_no", null: false
97
97
  t.date "from_date", null: false
98
98
  t.date "to_date", null: false
99
99
  end
@@ -101,12 +101,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
101
101
  <%= add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree %>
102
102
  <%= add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree %>
103
103
 
104
- create_table "employee_clubs", <%= i unsigned(true) + {force: :cascade} %> do |t|
105
- t.integer "emp_no", <%= i limit(4) + {null: false} + unsigned(true) %>
106
- t.integer "club_id", <%= i limit(4) + {null: false} + unsigned(true) %>
104
+ create_table "employee_clubs", force: :cascade do |t|
105
+ t.integer "emp_no", null: false
106
+ t.integer "club_id", null: false
107
107
  end
108
108
 
109
- create_table "employees", primary_key: "emp_no", <%= i unsigned(true) + {force: :cascade} %> do |t|
109
+ create_table "employees", primary_key: "emp_no", force: :cascade do |t|
110
110
  t.date "birth_date", null: false
111
111
  t.string "first_name", limit: 14, null: false
112
112
  t.string "last_name", limit: 16, null: false
@@ -115,8 +115,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
115
115
  end
116
116
 
117
117
  create_table "salaries", id: false, force: :cascade do |t|
118
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
119
- t.integer "salary", <%= i limit(4) + {null: false} %>
118
+ t.integer "emp_no", null: false
119
+ t.integer "salary", null: false
120
120
  t.date "from_date", null: false
121
121
  t.date "to_date", null: false
122
122
  end
@@ -124,7 +124,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
124
124
  <%= add_index "salaries", ["emp_no"], name: "emp_no", using: :btree %>
125
125
 
126
126
  create_table "titles", id: false, force: :cascade do |t|
127
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
127
+ t.integer "emp_no", null: false
128
128
  t.string "title", limit: 50, null: false
129
129
  t.date "from_date", null: false
130
130
  t.date "to_date"
@@ -161,17 +161,17 @@ describe 'Ridgepole::Client#diff -> migrate' do
161
161
  delta = client(:bulk_change => true).diff(expected_dsl)
162
162
  expect(delta.differ?).to be_truthy
163
163
  expect(subject.dump).to match_fuzzy actual_dsl
164
- expect(delta.script).to match_fuzzy <<-EOS
164
+ expect(delta.script).to match_fuzzy erbh(<<-EOS)
165
165
  change_table("clubs", {:bulk => true}) do |t|
166
- t.index(["name"], {:name=>"idx_name", :unique=>true, :using=>:btree})
166
+ t.index(["name"], <%= {:name=>"idx_name", :unique=>true} + cond(5.0, using: :btree) %>)
167
167
  end
168
168
 
169
169
  change_table("employee_clubs", {:bulk => true}) do |t|
170
- t.index(["emp_no", "club_id"], {:name=>"idx_emp_no_club_id", :using=>:btree})
170
+ t.index(["emp_no", "club_id"], <%= {:name=>"idx_emp_no_club_id"} + cond(5.0, using: :btree) %>)
171
171
  end
172
172
 
173
173
  change_table("titles", {:bulk => true}) do |t|
174
- t.index(["emp_no"], {:name=>"emp_no", :using=>:btree})
174
+ t.index(["emp_no"], <%= {:name=>"emp_no"} + cond(5.0, using: :btree) %>)
175
175
  end
176
176
  EOS
177
177
  delta.migrate
data/spec/mysql/migrate/migrate_create_table_spec.rb CHANGED
@@ -7,15 +7,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
7
7
  titles_pk: {primary_key: ["emp_no", "title", "from_date"]},
8
8
  }
9
9
 
10
- if condition(:activerecord_4)
11
- opts.merge!(
12
- dept_manager_pk: {id: false},
13
- dept_emp_pk: {id: false},
14
- salaries_pk: {id: false},
15
- titles_pk: {id: false}
16
- )
17
- end
18
-
19
10
  opts
20
11
  }
21
12
 
data/spec/mysql/migrate/migrate_drop_index_spec.rb CHANGED
@@ -2,21 +2,21 @@ describe 'Ridgepole::Client#diff -> migrate' do
2
2
  context 'when drop index' do
3
3
  let(:dsl) {
4
4
  erbh(<<-EOS)
5
- create_table "clubs", <%= i unsigned(true) + {force: :cascade} %> do |t|
6
- t.string "name", <%= i limit(255) + {default: "", null: false} %>
5
+ create_table "clubs", force: :cascade do |t|
6
+ t.string "name", default: "", null: false
7
7
  end
8
8
 
9
9
  <%= add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree %>
10
10
 
11
- create_table "departments", primary_key: "dept_no", <%= i unsigned(true) + {force: :cascade} %> do |t|
11
+ create_table "departments", primary_key: "dept_no", force: :cascade do |t|
12
12
  t.string "dept_name", limit: 40, null: false
13
13
  end
14
14
 
15
15
  <%= add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree %>
16
16
 
17
17
  create_table "dept_emp", id: false, force: :cascade do |t|
18
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
19
- t.string "dept_no", <%= i limit(4) + {null: false} %>
18
+ t.integer "emp_no", null: false
19
+ t.string "dept_no", null: false
20
20
  t.date "from_date", null: false
21
21
  t.date "to_date", null: false
22
22
  end
@@ -25,8 +25,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
25
25
  <%= add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree %>
26
26
 
27
27
  create_table "dept_manager", id: false, force: :cascade do |t|
28
- t.string "dept_no", <%= i limit(4) + {null: false} %>
29
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
28
+ t.string "dept_no", null: false
29
+ t.integer "emp_no", null: false
30
30
  t.date "from_date", null: false
31
31
  t.date "to_date", null: false
32
32
  end
@@ -34,14 +34,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
34
34
  <%= add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree %>
35
35
  <%= add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree %>
36
36
 
37
- create_table "employee_clubs", <%= i unsigned(true) + {force: :cascade} %> do |t|
38
- t.integer "emp_no", <%= i limit(4) + {null: false} + unsigned(true) %>
39
- t.integer "club_id", <%= i limit(4) + {null: false} + unsigned(true) %>
37
+ create_table "employee_clubs", force: :cascade do |t|
38
+ t.integer "emp_no", null: false
39
+ t.integer "club_id", null: false
40
40
  end
41
41
 
42
42
  <%= add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree %>
43
43
 
44
- create_table "employees", primary_key: "emp_no", <%= i unsigned(true) + {force: :cascade} %> do |t|
44
+ create_table "employees", primary_key: "emp_no", force: :cascade do |t|
45
45
  t.date "birth_date", null: false
46
46
  t.string "first_name", limit: 14, null: false
47
47
  t.string "last_name", limit: 16, null: false
@@ -50,8 +50,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
50
50
  end
51
51
 
52
52
  create_table "salaries", id: false, force: :cascade do |t|
53
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
54
- t.integer "salary", <%= i limit(4) + {null: false} %>
53
+ t.integer "emp_no", null: false
54
+ t.integer "salary", null: false
55
55
  t.date "from_date", null: false
56
56
  t.date "to_date", null: false
57
57
  end
@@ -59,7 +59,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
59
59
  <%= add_index "salaries", ["emp_no"], name: "emp_no", using: :btree %>
60
60
 
61
61
  create_table "titles", id: false, force: :cascade do |t|
62
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
62
+ t.integer "emp_no", null: false
63
63
  t.string "title", limit: 50, null: false
64
64
  t.date "from_date", null: false
65
65
  t.date "to_date"
@@ -73,19 +73,19 @@ describe 'Ridgepole::Client#diff -> migrate' do
73
73
 
74
74
  let(:expected_dsl) {
75
75
  erbh(<<-EOS)
76
- create_table "clubs", <%= i unsigned(true) + {force: :cascade} %> do |t|
77
- t.string "name", <%= i limit(255) + {default: "", null: false} %>
76
+ create_table "clubs", force: :cascade do |t|
77
+ t.string "name", default: "", null: false
78
78
  end
79
79
 
80
- create_table "departments", primary_key: "dept_no", <%= i unsigned(true) + {force: :cascade} %> do |t|
80
+ create_table "departments", primary_key: "dept_no", force: :cascade do |t|
81
81
  t.string "dept_name", limit: 40, null: false
82
82
  end
83
83
 
84
84
  <%= add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree %>
85
85
 
86
86
  create_table "dept_emp", id: false, force: :cascade do |t|
87
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
88
- t.string "dept_no", <%= i limit(4) + {null: false} %>
87
+ t.integer "emp_no", null: false
88
+ t.string "dept_no", null: false
89
89
  t.date "from_date", null: false
90
90
  t.date "to_date", null: false
91
91
  end
@@ -94,8 +94,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
94
94
  <%= add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree %>
95
95
 
96
96
  create_table "dept_manager", id: false, force: :cascade do |t|
97
- t.string "dept_no", <%= i limit(4) + {null: false} %>
98
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
97
+ t.string "dept_no", null: false
98
+ t.integer "emp_no", null: false
99
99
  t.date "from_date", null: false
100
100
  t.date "to_date", null: false
101
101
  end
@@ -103,12 +103,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
103
103
  <%= add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree %>
104
104
  <%= add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree %>
105
105
 
106
- create_table "employee_clubs", <%= i unsigned(true) + {force: :cascade} %> do |t|
107
- t.integer "emp_no", <%= i limit(4) + {null: false} + unsigned(true) %>
108
- t.integer "club_id", <%= i limit(4) + {null: false} + unsigned(true) %>
106
+ create_table "employee_clubs", force: :cascade do |t|
107
+ t.integer "emp_no", null: false
108
+ t.integer "club_id", null: false
109
109
  end
110
110
 
111
- create_table "employees", primary_key: "emp_no", <%= i unsigned(true) + {force: :cascade} %> do |t|
111
+ create_table "employees", primary_key: "emp_no", force: :cascade do |t|
112
112
  t.date "birth_date", null: false
113
113
  t.string "first_name", limit: 14, null: false
114
114
  t.string "last_name", limit: 16, null: false
@@ -117,8 +117,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
117
117
  end
118
118
 
119
119
  create_table "salaries", id: false, force: :cascade do |t|
120
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
121
- t.integer "salary", <%= i limit(4) + {null: false} %>
120
+ t.integer "emp_no", null: false
121
+ t.integer "salary", null: false
122
122
  t.date "from_date", null: false
123
123
  t.date "to_date", null: false
124
124
  end
@@ -126,7 +126,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
126
126
  <%= add_index "salaries", ["emp_no"], name: "emp_no", using: :btree %>
127
127
 
128
128
  create_table "titles", id: false, force: :cascade do |t|
129
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
129
+ t.integer "emp_no", null: false
130
130
  t.string "title", limit: 50, null: false
131
131
  t.date "from_date", null: false
132
132
  t.date "to_date"
@@ -148,12 +148,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
148
148
  it {
149
149
  delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
150
150
  expect(delta.differ?).to be_truthy
151
- expect(delta.script).to match_fuzzy <<-EOS
152
- add_index("clubs", ["name"], {:name=>"idx_name", :unique=>true, :using=>:btree})
151
+ expect(delta.script).to match_fuzzy erbh(<<-EOS)
152
+ add_index("clubs", ["name"], <%= {:name=>"idx_name", :unique=>true} + cond(5.0, using: :btree) %>)
153
153
 
154
- add_index("employee_clubs", ["emp_no", "club_id"], {:name=>"idx_emp_no_club_id", :using=>:btree})
154
+ add_index("employee_clubs", ["emp_no", "club_id"], <%= {:name=>"idx_emp_no_club_id"} + cond(5.0, using: :btree) %>)
155
155
 
156
- add_index("titles", ["emp_no"], {:name=>"emp_no", :using=>:btree})
156
+ add_index("titles", ["emp_no"], <%= {:name=>"emp_no"} + cond(5.0, using: :btree) %>)
157
157
  EOS
158
158
  }
159
159
 
data/spec/mysql/migrate/migrate_drop_table_spec.rb CHANGED
@@ -2,21 +2,21 @@ describe 'Ridgepole::Client#diff -> migrate' do
2
2
  context 'when drop table' do
3
3
  let(:dsl) {
4
4
  erbh(<<-EOS)
5
- create_table "clubs", <%= i unsigned(true) + {force: :cascade} %> do |t|
6
- t.string "name", <%= i limit(255) + {default: "", null: false} %>
5
+ create_table "clubs", force: :cascade do |t|
6
+ t.string "name", default: "", null: false
7
7
  end
8
8
 
9
9
  <%= add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree %>
10
10
 
11
- create_table "departments", primary_key: "dept_no", <%= i unsigned(true) + {force: :cascade} %> do |t|
11
+ create_table "departments", primary_key: "dept_no", force: :cascade do |t|
12
12
  t.string "dept_name", limit: 40, null: false
13
13
  end
14
14
 
15
15
  <%= add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree %>
16
16
 
17
17
  create_table "dept_emp", id: false, force: :cascade do |t|
18
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
19
- t.string "dept_no", <%= i limit(4) + {null: false} %>
18
+ t.integer "emp_no", null: false
19
+ t.string "dept_no", null: false
20
20
  t.date "from_date", null: false
21
21
  t.date "to_date", null: false
22
22
  end
@@ -25,8 +25,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
25
25
  <%= add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree %>
26
26
 
27
27
  create_table "dept_manager", id: false, force: :cascade do |t|
28
- t.string "dept_no", <%= i limit(4) + {null: false} %>
29
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
28
+ t.string "dept_no", null: false
29
+ t.integer "emp_no", null: false
30
30
  t.date "from_date", null: false
31
31
  t.date "to_date", null: false
32
32
  end
@@ -34,14 +34,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
34
34
  <%= add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree %>
35
35
  <%= add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree %>
36
36
 
37
- create_table "employee_clubs", <%= i unsigned(true) + {force: :cascade} %> do |t|
38
- t.integer "emp_no", <%= i limit(4) + {null: false} + unsigned(true) %>
39
- t.integer "club_id", <%= i limit(4) + {null: false} + unsigned(true) %>
37
+ create_table "employee_clubs", force: :cascade do |t|
38
+ t.integer "emp_no", null: false
39
+ t.integer "club_id", null: false
40
40
  end
41
41
 
42
42
  <%= add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree %>
43
43
 
44
- create_table "employees", primary_key: "emp_no", <%= i unsigned(true) + {force: :cascade} %> do |t|
44
+ create_table "employees", primary_key: "emp_no", force: :cascade do |t|
45
45
  t.date "birth_date", null: false
46
46
  t.string "first_name", limit: 14, null: false
47
47
  t.string "last_name", limit: 16, null: false
@@ -50,8 +50,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
50
50
  end
51
51
 
52
52
  create_table "salaries", id: false, force: :cascade do |t|
53
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
54
- t.integer "salary", <%= i limit(4) + {null: false} %>
53
+ t.integer "emp_no", null: false
54
+ t.integer "salary", null: false
55
55
  t.date "from_date", null: false
56
56
  t.date "to_date", null: false
57
57
  end
@@ -59,7 +59,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
59
59
  <%= add_index "salaries", ["emp_no"], name: "emp_no", using: :btree %>
60
60
 
61
61
  create_table "titles", id: false, force: :cascade do |t|
62
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
62
+ t.integer "emp_no", null: false
63
63
  t.string "title", limit: 50, null: false
64
64
  t.date "from_date", null: false
65
65
  t.date "to_date"
@@ -73,15 +73,15 @@ describe 'Ridgepole::Client#diff -> migrate' do
73
73
 
74
74
  let(:expected_dsl) {
75
75
  erbh(<<-EOS)
76
- create_table "departments", primary_key: "dept_no", <%= i unsigned(true) + {force: :cascade} %> do |t|
76
+ create_table "departments", primary_key: "dept_no", force: :cascade do |t|
77
77
  t.string "dept_name", limit: 40, null: false
78
78
  end
79
79
 
80
80
  <%= add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree %>
81
81
 
82
82
  create_table "dept_emp", id: false, force: :cascade do |t|
83
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
84
- t.string "dept_no", <%= i limit(4) + {null: false} %>
83
+ t.integer "emp_no", null: false
84
+ t.string "dept_no", null: false
85
85
  t.date "from_date", null: false
86
86
  t.date "to_date", null: false
87
87
  end
@@ -90,8 +90,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
90
90
  <%= add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree %>
91
91
 
92
92
  create_table "dept_manager", id: false, force: :cascade do |t|
93
- t.string "dept_no", <%= i limit(4) + {null: false} %>
94
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
93
+ t.string "dept_no", null: false
94
+ t.integer "emp_no", null: false
95
95
  t.date "from_date", null: false
96
96
  t.date "to_date", null: false
97
97
  end
@@ -100,8 +100,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
100
100
  <%= add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree %>
101
101
 
102
102
  create_table "salaries", id: false, force: :cascade do |t|
103
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
104
- t.integer "salary", <%= i limit(4) + {null: false} %>
103
+ t.integer "emp_no", null: false
104
+ t.integer "salary", null: false
105
105
  t.date "from_date", null: false
106
106
  t.date "to_date", null: false
107
107
  end
@@ -109,7 +109,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
109
109
  <%= add_index "salaries", ["emp_no"], name: "emp_no", using: :btree %>
110
110
 
111
111
  create_table "titles", id: false, force: :cascade do |t|
112
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
112
+ t.integer "emp_no", null: false
113
113
  t.string "title", limit: 50, null: false
114
114
  t.date "from_date", null: false
115
115
  t.date "to_date"
@@ -134,18 +134,18 @@ describe 'Ridgepole::Client#diff -> migrate' do
134
134
  delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
135
135
  expect(delta.differ?).to be_truthy
136
136
  expect(delta.script).to match_fuzzy erbh(<<-EOS)
137
- create_table("clubs", <%= unsigned(true) %>) do |t|
138
- t.column("name", :"string", <%= limit(255) >> {default: "", null: false, limit: 255} %>)
137
+ create_table("clubs", {}) do |t|
138
+ t.column("name", :"string", {:default=>"", :null=>false, :limit=>255})
139
139
  end
140
- add_index("clubs", ["name"], {:name=>"idx_name", :unique=>true, :using=>:btree})
140
+ add_index("clubs", ["name"], <%= {:name=>"idx_name", :unique=>true} + cond(5.0, using: :btree) %>)
141
141
 
142
- create_table("employee_clubs", <%= unsigned(true) %>) do |t|
143
- t.column("emp_no", :"integer", <%= limit(4) >> {null: false, limit: 4} + unsigned(true) %>)
144
- t.column("club_id", :"integer", <%= limit(4) >> {null: false, limit: 4} + unsigned(true) %>)
142
+ create_table("employee_clubs", {}) do |t|
143
+ t.column("emp_no", :"integer", {:null=>false, :limit=>4})
144
+ t.column("club_id", :"integer", {:null=>false, :limit=>4})
145
145
  end
146
- add_index("employee_clubs", ["emp_no", "club_id"], {:name=>"idx_emp_no_club_id", :using=>:btree})
146
+ add_index("employee_clubs", ["emp_no", "club_id"], <%= {:name=>"idx_emp_no_club_id"} + cond(5.0, using: :btree) %>)
147
147
 
148
- create_table("employees", <%= {primary_key: "emp_no"} + unsigned(true) %>) do |t|
148
+ create_table("employees", {:primary_key=>"emp_no"}) do |t|
149
149
  t.column("birth_date", :"date", {:null=>false})
150
150
  t.column("first_name", :"string", {:limit=>14, :null=>false})
151
151
  t.column("last_name", :"string", {:limit=>16, :null=>false})