ridgepole 0.7.0.alpha → 0.7.0.alpha2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (113) hide show
  1. checksums.yaml +4 -4
  2. data/.rspec +1 -0
  3. data/.travis.yml +1 -0
  4. data/README.md +7 -5
  5. data/bin/ridgepole +14 -14
  6. data/lib/ridgepole/cli/config.rb +1 -1
  7. data/lib/ridgepole/client.rb +0 -4
  8. data/lib/ridgepole/delta.rb +15 -9
  9. data/lib/ridgepole/diff.rb +13 -9
  10. data/lib/ridgepole/dsl_parser/context.rb +2 -6
  11. data/lib/ridgepole/version.rb +1 -1
  12. data/ridgepole.gemspec +3 -1
  13. data/spec/erb_helper.rb +0 -39
  14. data/spec/hide_pending_formatter.rb +6 -0
  15. data/spec/mysql/bigint_pk/bigint_pk_spec.rb +9 -9
  16. data/spec/mysql/bigint_pk/int_pk_spec.rb +9 -9
  17. data/spec/mysql/cli/ridgepole_spec.rb +2 -2
  18. data/spec/mysql/collation/collation_spec.rb +28 -28
  19. data/spec/mysql/comment/comment_spec.rb +36 -36
  20. data/spec/mysql/default_lambda/default_lambda_spec.rb +1 -1
  21. data/spec/mysql/diff/diff2_spec.rb +41 -41
  22. data/spec/mysql/diff/diff_spec.rb +41 -41
  23. data/spec/mysql/dump/dump_class_method_spec.rb +26 -33
  24. data/spec/mysql/dump/dump_some_tables_spec.rb +16 -18
  25. data/spec/mysql/dump/dump_spec.rb +27 -34
  26. data/spec/mysql/dump/dump_without_table_options_spec.rb +5 -5
  27. data/spec/mysql/fk/migrate_change_fk_spec.rb +76 -23
  28. data/spec/mysql/fk/migrate_create_fk_spec.rb +70 -50
  29. data/spec/mysql/fk/migrate_drop_fk_spec.rb +131 -32
  30. data/spec/mysql/migrate/check_orphan_index_spec.rb +19 -19
  31. data/spec/mysql/migrate/migrate_add_column2_spec.rb +33 -45
  32. data/spec/mysql/migrate/migrate_add_column_order_spec.rb +47 -47
  33. data/spec/mysql/migrate/migrate_add_column_spec.rb +75 -89
  34. data/spec/mysql/migrate/migrate_add_column_with_alter_extra_spec.rb +72 -86
  35. data/spec/mysql/migrate/migrate_add_column_with_script_spec.rb +72 -86
  36. data/spec/mysql/migrate/migrate_change_column2_spec.rb +27 -32
  37. data/spec/mysql/migrate/migrate_change_column3_spec.rb +78 -78
  38. data/spec/mysql/migrate/migrate_change_column4_spec.rb +24 -24
  39. data/spec/mysql/migrate/migrate_change_column5_spec.rb +42 -42
  40. data/spec/mysql/migrate/migrate_change_column6_spec.rb +60 -60
  41. data/spec/mysql/migrate/migrate_change_column_default_spec.rb +47 -47
  42. data/spec/mysql/migrate/migrate_change_column_float_spec.rb +16 -16
  43. data/spec/mysql/migrate/migrate_change_column_spec.rb +65 -79
  44. data/spec/mysql/migrate/migrate_change_index2_spec.rb +22 -27
  45. data/spec/mysql/migrate/migrate_change_index3_spec.rb +52 -62
  46. data/spec/mysql/migrate/migrate_change_index4_spec.rb +32 -38
  47. data/spec/mysql/migrate/migrate_change_index5_spec.rb +24 -28
  48. data/spec/mysql/migrate/migrate_change_index6_spec.rb +105 -119
  49. data/spec/mysql/migrate/migrate_change_index7_spec.rb +27 -30
  50. data/spec/mysql/migrate/migrate_change_index_spec.rb +99 -120
  51. data/spec/mysql/migrate/migrate_change_table_option_spec.rb +14 -14
  52. data/spec/mysql/migrate/migrate_create_index2_spec.rb +101 -112
  53. data/spec/mysql/migrate/migrate_create_index_spec.rb +55 -66
  54. data/spec/mysql/migrate/migrate_create_table_spec.rb +68 -91
  55. data/spec/mysql/migrate/migrate_create_table_with_options_spec.rb +1 -1
  56. data/spec/mysql/migrate/migrate_create_table_with_script_spec.rb +58 -70
  57. data/spec/mysql/migrate/migrate_drop_column_and_index2_spec.rb +62 -76
  58. data/spec/mysql/migrate/migrate_drop_column_and_index_spec.rb +58 -72
  59. data/spec/mysql/migrate/migrate_drop_column_spec.rb +63 -77
  60. data/spec/mysql/migrate/migrate_drop_index_spec.rb +55 -66
  61. data/spec/mysql/migrate/migrate_drop_table_spec.rb +51 -63
  62. data/spec/mysql/migrate/migrate_duplicate_index_spec.rb +3 -3
  63. data/spec/mysql/migrate/migrate_duplicate_table_spec.rb +12 -12
  64. data/spec/mysql/migrate/migrate_empty_spec.rb +35 -42
  65. data/spec/mysql/migrate/migrate_execute_spec.rb +16 -24
  66. data/spec/mysql/migrate/migrate_log_file_spec.rb +58 -70
  67. data/spec/mysql/migrate/migrate_merge_mode_spec.rb +75 -99
  68. data/spec/mysql/migrate/migrate_noop_spec.rb +38 -38
  69. data/spec/mysql/migrate/migrate_rename_column_spec.rb +74 -88
  70. data/spec/mysql/migrate/migrate_rename_table_spec.rb +100 -97
  71. data/spec/mysql/migrate/migrate_same_default_null_spec.rb +18 -18
  72. data/spec/mysql/migrate/migrate_same_spec.rb +29 -37
  73. data/spec/mysql/migrate/migrate_script_error_spec.rb +19 -19
  74. data/spec/mysql/migrate/migrate_skip_drop_table_spec.rb +148 -0
  75. data/spec/mysql/migrate/migrate_skip_rename_column_spec.rb +70 -84
  76. data/spec/mysql/migrate/migrate_skip_rename_table_spec.rb +70 -84
  77. data/spec/mysql/migrate/migrate_with_ignore_tables_spec.rb +87 -87
  78. data/spec/mysql/migrate/migrate_with_pre_post_query_spec.rb +61 -75
  79. data/spec/mysql/migrate/migrate_with_tables_spec.rb +41 -41
  80. data/spec/mysql/migrate/migrate_with_verbose_log_spec.rb +10 -10
  81. data/spec/mysql/migrate_/migrate_create_index_with_alter_spec.rb +67 -78
  82. data/spec/mysql/migrate_/migrate_drop_index_with_alter_spec.rb +67 -78
  83. data/spec/mysql/text_blob_types/text_blob_types_spec.rb +9 -9
  84. data/spec/mysql/~default_name_fk/migrate_change_fk_spec.rb +21 -24
  85. data/spec/mysql/~default_name_fk/migrate_create_fk_spec.rb +35 -67
  86. data/spec/mysql/~default_name_fk/migrate_drop_fk_spec.rb +28 -34
  87. data/spec/postgresql/diff/diff_spec.rb +37 -37
  88. data/spec/postgresql/dump/dump_spec.rb +27 -34
  89. data/spec/postgresql/fk/migrate_change_fk_spec.rb +76 -23
  90. data/spec/postgresql/fk/migrate_create_fk_spec.rb +73 -54
  91. data/spec/postgresql/fk/migrate_drop_fk_spec.rb +131 -32
  92. data/spec/postgresql/migrate/migrate_add_column_spec.rb +63 -75
  93. data/spec/postgresql/migrate/migrate_add_expression_index_spec.rb +1 -1
  94. data/spec/postgresql/migrate/migrate_change_column_default_spec.rb +7 -7
  95. data/spec/postgresql/migrate/migrate_change_column_spec.rb +53 -65
  96. data/spec/postgresql/migrate/migrate_change_index_spec.rb +54 -68
  97. data/spec/postgresql/migrate/migrate_create_table_spec.rb +56 -77
  98. data/spec/postgresql/migrate/migrate_drop_column_spec.rb +46 -60
  99. data/spec/postgresql/migrate/migrate_drop_column_with_index_spec.rb +41 -55
  100. data/spec/postgresql/migrate/migrate_drop_expression_index_spec.rb +3 -3
  101. data/spec/postgresql/migrate/migrate_drop_index_spec.rb +51 -62
  102. data/spec/postgresql/migrate/migrate_drop_table_spec.rb +48 -60
  103. data/spec/postgresql/migrate/migrate_ext_cols_spec.rb +6 -6
  104. data/spec/postgresql/migrate/migrate_rename_column_spec.rb +54 -68
  105. data/spec/postgresql/migrate/migrate_rename_table_spec.rb +62 -78
  106. data/spec/postgresql/migrate/migrate_same_spec.rb +27 -34
  107. data/spec/postgresql/~default_name_fk/migrate_change_fk_spec.rb +21 -24
  108. data/spec/postgresql/~default_name_fk/migrate_create_fk_spec.rb +35 -66
  109. data/spec/postgresql/~default_name_fk/migrate_drop_fk_spec.rb +28 -34
  110. data/spec/spec_helper.rb +1 -1
  111. metadata +9 -8
  112. data/ridgepole.iml +0 -9
  113. data/spec/string_ext.rb +0 -40
data/spec/postgresql/migrate/migrate_add_column_spec.rb CHANGED
@@ -4,65 +4,59 @@ describe 'Ridgepole::Client#diff -> migrate' do
4
4
  erbh(<<-EOS)
5
5
  create_table "clubs", force: :cascade do |t|
6
6
  t.string "name", limit: 255, default: "", null: false
7
+ t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
7
8
  end
8
9
 
9
- <%= add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree %>
10
-
11
10
  create_table "departments", primary_key: "dept_no", force: :cascade do |t|
12
11
  t.string "dept_name", limit: 40, null: false
13
12
  end
14
13
 
15
14
  create_table "dept_emp", id: false, force: :cascade do |t|
16
- t.integer "emp_no", null: false
17
- t.string "dept_no", limit: 4, null: false
18
- t.date "from_date", null: false
19
- t.date "to_date", null: false
15
+ t.integer "emp_no", null: false
16
+ t.string "dept_no", limit: 4, null: false
17
+ t.date "from_date", null: false
18
+ t.date "to_date", null: false
19
+ t.index ["dept_no"], name: "idx_dept_emp_dept_no", <%= i cond(5.0, using: :btree) %>
20
+ t.index ["emp_no"], name: "idx_dept_emp_emp_no", <%= i cond(5.0, using: :btree) %>
20
21
  end
21
22
 
22
- <%= add_index "dept_emp", ["dept_no"], name: "idx_dept_emp_dept_no", using: :btree %>
23
- <%= add_index "dept_emp", ["emp_no"], name: "idx_dept_emp_emp_no", using: :btree %>
24
-
25
23
  create_table "dept_manager", id: false, force: :cascade do |t|
26
- t.string "dept_no", limit: 4, null: false
27
- t.integer "emp_no", null: false
28
- t.date "from_date", null: false
29
- t.date "to_date", null: false
24
+ t.string "dept_no", limit: 4, null: false
25
+ t.integer "emp_no", null: false
26
+ t.date "from_date", null: false
27
+ t.date "to_date", null: false
28
+ t.index ["dept_no"], name: "idx_dept_manager_dept_no", <%= i cond(5.0, using: :btree) %>
29
+ t.index ["emp_no"], name: "idx_dept_manager_emp_no", <%= i cond(5.0, using: :btree) %>
30
30
  end
31
31
 
32
- <%= add_index "dept_manager", ["dept_no"], name: "idx_dept_manager_dept_no", using: :btree %>
33
- <%= add_index "dept_manager", ["emp_no"], name: "idx_dept_manager_emp_no", using: :btree %>
34
-
35
32
  create_table "employee_clubs", force: :cascade do |t|
36
- t.integer "emp_no", null: false
33
+ t.integer "emp_no", null: false
37
34
  t.integer "club_id", null: false
35
+ t.index ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
38
36
  end
39
37
 
40
- <%= add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id", using: :btree %>
41
-
42
38
  create_table "employees", primary_key: "emp_no", force: :cascade do |t|
43
- t.date "birth_date", null: false
39
+ t.date "birth_date", null: false
44
40
  t.string "first_name", limit: 14, null: false
45
- t.string "last_name", limit: 16, null: false
46
- t.date "hire_date", null: false
41
+ t.string "last_name", limit: 16, null: false
42
+ t.date "hire_date", null: false
47
43
  end
48
44
 
49
45
  create_table "salaries", id: false, force: :cascade do |t|
50
- t.integer "emp_no", null: false
51
- t.integer "salary", null: false
46
+ t.integer "emp_no", null: false
47
+ t.integer "salary", null: false
52
48
  t.date "from_date", null: false
53
- t.date "to_date", null: false
49
+ t.date "to_date", null: false
50
+ t.index ["emp_no"], name: "idx_salaries_emp_no", <%= i cond(5.0, using: :btree) %>
54
51
  end
55
52
 
56
- <%= add_index "salaries", ["emp_no"], name: "idx_salaries_emp_no", using: :btree %>
57
-
58
53
  create_table "titles", id: false, force: :cascade do |t|
59
- t.integer "emp_no", null: false
60
- t.string "title", limit: 50, null: false
61
- t.date "from_date", null: false
54
+ t.integer "emp_no", null: false
55
+ t.string "title", limit: 50, null: false
56
+ t.date "from_date", null: false
62
57
  t.date "to_date"
58
+ t.index ["emp_no"], name: "idx_titles_emp_no", <%= i cond(5.0, using: :btree) %>
63
59
  end
64
-
65
- <%= add_index "titles", ["emp_no"], name: "idx_titles_emp_no", using: :btree %>
66
60
  EOS
67
61
  }
68
62
 
@@ -70,68 +64,62 @@ describe 'Ridgepole::Client#diff -> migrate' do
70
64
  erbh(<<-EOS)
71
65
  create_table "clubs", force: :cascade do |t|
72
66
  t.string "name", limit: 255, default: "", null: false
67
+ t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
73
68
  end
74
69
 
75
- <%= add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree %>
76
-
77
70
  create_table "departments", primary_key: "dept_no", force: :cascade do |t|
78
71
  t.string "dept_name", limit: 40, null: false
79
72
  end
80
73
 
81
74
  create_table "dept_emp", id: false, force: :cascade do |t|
82
- t.integer "emp_no", null: false
83
- t.string "dept_no", limit: 4, null: false
84
- t.date "from_date", null: false
85
- t.date "to_date", null: false
75
+ t.integer "emp_no", null: false
76
+ t.string "dept_no", limit: 4, null: false
77
+ t.date "from_date", null: false
78
+ t.date "to_date", null: false
79
+ t.index ["dept_no"], name: "idx_dept_emp_dept_no", <%= i cond(5.0, using: :btree) %>
80
+ t.index ["emp_no"], name: "idx_dept_emp_emp_no", <%= i cond(5.0, using: :btree) %>
86
81
  end
87
82
 
88
- <%= add_index "dept_emp", ["dept_no"], name: "idx_dept_emp_dept_no", using: :btree %>
89
- <%= add_index "dept_emp", ["emp_no"], name: "idx_dept_emp_emp_no", using: :btree %>
90
-
91
83
  create_table "dept_manager", id: false, force: :cascade do |t|
92
- t.string "dept_no", limit: 4, null: false
93
- t.integer "emp_no", null: false
94
- t.date "from_date", null: false
95
- t.date "to_date", null: false
84
+ t.string "dept_no", limit: 4, null: false
85
+ t.integer "emp_no", null: false
86
+ t.date "from_date", null: false
87
+ t.date "to_date", null: false
88
+ t.index ["dept_no"], name: "idx_dept_manager_dept_no", <%= i cond(5.0, using: :btree) %>
89
+ t.index ["emp_no"], name: "idx_dept_manager_emp_no", <%= i cond(5.0, using: :btree) %>
96
90
  end
97
91
 
98
- <%= add_index "dept_manager", ["dept_no"], name: "idx_dept_manager_dept_no", using: :btree %>
99
- <%= add_index "dept_manager", ["emp_no"], name: "idx_dept_manager_emp_no", using: :btree %>
100
-
101
92
  create_table "employee_clubs", force: :cascade do |t|
102
- t.integer "emp_no", null: false
103
- t.integer "club_id", null: false
93
+ t.integer "emp_no", null: false
94
+ t.integer "club_id", null: false
104
95
  t.string "any_col", limit: 255, null: false
96
+ t.index ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
105
97
  end
106
98
 
107
- <%= add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id", using: :btree %>
108
-
109
99
  create_table "employees", primary_key: "emp_no", force: :cascade do |t|
110
- t.date "birth_date", null: false
100
+ t.date "birth_date", null: false
111
101
  t.string "first_name", limit: 14, null: false
112
- t.string "last_name", limit: 16, null: false
113
- t.date "hire_date", null: false
114
- t.integer "age", null: false
102
+ t.string "last_name", limit: 16, null: false
103
+ t.date "hire_date", null: false
104
+ t.integer "age", null: false
115
105
  t.date "updated_at"
116
106
  end
117
107
 
118
108
  create_table "salaries", id: false, force: :cascade do |t|
119
- t.integer "emp_no", null: false
120
- t.integer "salary", null: false
109
+ t.integer "emp_no", null: false
110
+ t.integer "salary", null: false
121
111
  t.date "from_date", null: false
122
- t.date "to_date", null: false
112
+ t.date "to_date", null: false
113
+ t.index ["emp_no"], name: "idx_salaries_emp_no", <%= i cond(5.0, using: :btree) %>
123
114
  end
124
115
 
125
- <%= add_index "salaries", ["emp_no"], name: "idx_salaries_emp_no", using: :btree %>
126
-
127
116
  create_table "titles", id: false, force: :cascade do |t|
128
- t.integer "emp_no", null: false
129
- t.string "title", limit: 50, null: false
130
- t.date "from_date", null: false
117
+ t.integer "emp_no", null: false
118
+ t.string "title", limit: 50, null: false
119
+ t.date "from_date", null: false
131
120
  t.date "to_date"
121
+ t.index ["emp_no"], name: "idx_titles_emp_no", <%= i cond(5.0, using: :btree) %>
132
122
  end
133
-
134
- <%= add_index "titles", ["emp_no"], name: "idx_titles_emp_no", using: :btree %>
135
123
  EOS
136
124
  }
137
125
 
@@ -180,10 +168,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
180
168
  let(:actual_dsl) {
181
169
  erbh(<<-EOS)
182
170
  create_table "dept_emp", id: false, force: :cascade do |t|
183
- t.integer "emp_no", null: false
184
- t.string "dept_no", limit: 4, null: false
185
- t.date "from_date", null: false
186
- t.date "to_date", null: false
171
+ t.integer "emp_no", null: false
172
+ t.string "dept_no", limit: 4, null: false
173
+ t.date "from_date", null: false
174
+ t.date "to_date", null: false
187
175
  end
188
176
  EOS
189
177
  }
@@ -191,11 +179,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
191
179
  let(:expected_dsl) {
192
180
  erbh(<<-EOS)
193
181
  create_table "dept_emp", id: false, force: :cascade do |t|
194
- t.integer "emp_no", null: false
195
- t.integer "emp_no2", null: false
196
- t.string "dept_no", limit: 4, null: false
197
- t.date "from_date", null: false
198
- t.date "to_date", null: false
182
+ t.integer "emp_no", null: false
183
+ t.integer "emp_no2", null: false
184
+ t.string "dept_no", limit: 4, null: false
185
+ t.date "from_date", null: false
186
+ t.date "to_date", null: false
199
187
  end
200
188
  EOS
201
189
  }
data/spec/postgresql/migrate/migrate_add_expression_index_spec.rb CHANGED
@@ -8,7 +8,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
8
8
  t.string "name", null: false
9
9
  t.datetime "created_at", null: false
10
10
  t.datetime "updated_at", null: false
11
- t.index "lower((name)::text)", <%= i({name: "index_users_on_lower_name"} + cond(5.0, using: :btree)) %>
11
+ t.index "lower((name)::text)", name: "index_users_on_lower_name", <%= i cond(5.0, using: :btree) %>
12
12
  end
13
13
  EOS
14
14
 
data/spec/postgresql/migrate/migrate_change_column_default_spec.rb CHANGED
@@ -3,10 +3,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
3
3
  let(:actual_dsl) {
4
4
  <<-EOS
5
5
  create_table "salaries", id: false, force: :cascade do |t|
6
- t.integer "emp_no", default: 0, null: false
7
- t.integer "salary", null: false
8
- t.date "from_date", null: false
9
- t.date "to_date", null: false
6
+ t.integer "emp_no", default: 0, null: false
7
+ t.integer "salary", null: false
8
+ t.date "from_date", null: false
9
+ t.date "to_date", null: false
10
10
  end
11
11
  EOS
12
12
  }
@@ -14,10 +14,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
14
14
  let(:expected_dsl) {
15
15
  <<-EOS
16
16
  create_table "salaries", id: false, force: :cascade do |t|
17
- t.integer "emp_no", null: false
18
- t.integer "salary", null: false
17
+ t.integer "emp_no", null: false
18
+ t.integer "salary", null: false
19
19
  t.date "from_date", null: false
20
- t.date "to_date", null: false
20
+ t.date "to_date", null: false
21
21
  end
22
22
  EOS
23
23
  }
data/spec/postgresql/migrate/migrate_change_column_spec.rb CHANGED
@@ -4,65 +4,59 @@ describe 'Ridgepole::Client#diff -> migrate' do
4
4
  erbh(<<-EOS)
5
5
  create_table "clubs", force: :cascade do |t|
6
6
  t.string "name", limit: 255, default: "", null: false
7
+ t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
7
8
  end
8
9
 
9
- <%= add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree %>
10
-
11
10
  create_table "departments", primary_key: "dept_no", force: :cascade do |t|
12
11
  t.string "dept_name", limit: 40, null: false
13
12
  end
14
13
 
15
14
  create_table "dept_emp", id: false, force: :cascade do |t|
16
- t.integer "emp_no", null: false
17
- t.string "dept_no", limit: 4, null: false
18
- t.date "from_date", null: false
19
- t.date "to_date", null: false
15
+ t.integer "emp_no", null: false
16
+ t.string "dept_no", limit: 4, null: false
17
+ t.date "from_date", null: false
18
+ t.date "to_date", null: false
19
+ t.index ["dept_no"], name: "idx_dept_emp_dept_no", <%= i cond(5.0, using: :btree) %>
20
+ t.index ["emp_no"], name: "idx_dept_emp_emp_no", <%= i cond(5.0, using: :btree) %>
20
21
  end
21
22
 
22
- <%= add_index "dept_emp", ["dept_no"], name: "idx_dept_emp_dept_no", using: :btree %>
23
- <%= add_index "dept_emp", ["emp_no"], name: "idx_dept_emp_emp_no", using: :btree %>
24
-
25
23
  create_table "dept_manager", id: false, force: :cascade do |t|
26
- t.string "dept_no", limit: 4, null: false
27
- t.integer "emp_no", null: false
28
- t.date "from_date", null: false
29
- t.date "to_date", null: false
24
+ t.string "dept_no", limit: 4, null: false
25
+ t.integer "emp_no", null: false
26
+ t.date "from_date", null: false
27
+ t.date "to_date", null: false
28
+ t.index ["dept_no"], name: "idx_dept_manager_dept_no", <%= i cond(5.0, using: :btree) %>
29
+ t.index ["emp_no"], name: "idx_dept_manager_emp_no", <%= i cond(5.0, using: :btree) %>
30
30
  end
31
31
 
32
- <%= add_index "dept_manager", ["dept_no"], name: "idx_dept_manager_dept_no", using: :btree %>
33
- <%= add_index "dept_manager", ["emp_no"], name: "idx_dept_manager_emp_no", using: :btree %>
34
-
35
32
  create_table "employee_clubs", force: :cascade do |t|
36
- t.integer "emp_no", null: false
33
+ t.integer "emp_no", null: false
37
34
  t.integer "club_id", null: false
35
+ t.index ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
38
36
  end
39
37
 
40
- <%= add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id", using: :btree %>
41
-
42
38
  create_table "employees", primary_key: "emp_no", force: :cascade do |t|
43
- t.date "birth_date", null: false
39
+ t.date "birth_date", null: false
44
40
  t.string "first_name", limit: 14, null: false
45
- t.string "last_name", limit: 16, null: false
46
- t.date "hire_date", null: false
41
+ t.string "last_name", limit: 16, null: false
42
+ t.date "hire_date", null: false
47
43
  end
48
44
 
49
45
  create_table "salaries", id: false, force: :cascade do |t|
50
- t.integer "emp_no", null: false
51
- t.integer "salary", null: false
46
+ t.integer "emp_no", null: false
47
+ t.integer "salary", null: false
52
48
  t.date "from_date", null: false
53
- t.date "to_date", null: false
49
+ t.date "to_date", null: false
50
+ t.index ["emp_no"], name: "idx_salaries_emp_no", <%= i cond(5.0, using: :btree) %>
54
51
  end
55
52
 
56
- <%= add_index "salaries", ["emp_no"], name: "idx_salaries_emp_no", using: :btree %>
57
-
58
53
  create_table "titles", id: false, force: :cascade do |t|
59
- t.integer "emp_no", null: false
60
- t.string "title", limit: 50, null: false
61
- t.date "from_date", null: false
54
+ t.integer "emp_no", null: false
55
+ t.string "title", limit: 50, null: false
56
+ t.date "from_date", null: false
62
57
  t.date "to_date"
58
+ t.index ["emp_no"], name: "idx_titles_emp_no", <%= i cond(5.0, using: :btree) %>
63
59
  end
64
-
65
- <%= add_index "titles", ["emp_no"], name: "idx_titles_emp_no", using: :btree %>
66
60
  EOS
67
61
  }
68
62
 
@@ -70,65 +64,59 @@ describe 'Ridgepole::Client#diff -> migrate' do
70
64
  erbh(<<-EOS)
71
65
  create_table "clubs", force: :cascade do |t|
72
66
  t.string "name", limit: 255, default: "", null: false
67
+ t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
73
68
  end
74
69
 
75
- <%= add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree %>
76
-
77
70
  create_table "departments", primary_key: "dept_no", force: :cascade do |t|
78
71
  t.string "dept_name", limit: 40, null: false
79
72
  end
80
73
 
81
74
  create_table "dept_emp", id: false, force: :cascade do |t|
82
- t.integer "emp_no", null: false
83
- t.string "dept_no", limit: 4, null: false
84
- t.date "from_date", null: false
85
- t.date "to_date", null: false
75
+ t.integer "emp_no", null: false
76
+ t.string "dept_no", limit: 4, null: false
77
+ t.date "from_date", null: false
78
+ t.date "to_date", null: false
79
+ t.index ["dept_no"], name: "idx_dept_emp_dept_no", <%= i cond(5.0, using: :btree) %>
80
+ t.index ["emp_no"], name: "idx_dept_emp_emp_no", <%= i cond(5.0, using: :btree) %>
86
81
  end
87
82
 
88
- <%= add_index "dept_emp", ["dept_no"], name: "idx_dept_emp_dept_no", using: :btree %>
89
- <%= add_index "dept_emp", ["emp_no"], name: "idx_dept_emp_emp_no", using: :btree %>
90
-
91
83
  create_table "dept_manager", id: false, force: :cascade do |t|
92
- t.string "dept_no", limit: 4, null: false
93
- t.integer "emp_no", null: false
94
- t.date "from_date", null: false
95
- t.date "to_date", null: false
84
+ t.string "dept_no", limit: 4, null: false
85
+ t.integer "emp_no", null: false
86
+ t.date "from_date", null: false
87
+ t.date "to_date", null: false
88
+ t.index ["dept_no"], name: "idx_dept_manager_dept_no", <%= i cond(5.0, using: :btree) %>
89
+ t.index ["emp_no"], name: "idx_dept_manager_emp_no", <%= i cond(5.0, using: :btree) %>
96
90
  end
97
91
 
98
- <%= add_index "dept_manager", ["dept_no"], name: "idx_dept_manager_dept_no", using: :btree %>
99
- <%= add_index "dept_manager", ["emp_no"], name: "idx_dept_manager_emp_no", using: :btree %>
100
-
101
92
  create_table "employee_clubs", force: :cascade do |t|
102
- t.integer "emp_no", null: false
93
+ t.integer "emp_no", null: false
103
94
  t.integer "club_id"
95
+ t.index ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
104
96
  end
105
97
 
106
- <%= add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id", using: :btree %>
107
-
108
98
  create_table "employees", primary_key: "emp_no", force: :cascade do |t|
109
- t.date "birth_date", null: false
110
- t.string "first_name", limit: 14, null: false
111
- t.string "last_name", limit: 20, default: "XXX", null: false
112
- t.date "hire_date", null: false
99
+ t.date "birth_date", null: false
100
+ t.string "first_name", limit: 14, null: false
101
+ t.string "last_name", limit: 20, default: "XXX", null: false
102
+ t.date "hire_date", null: false
113
103
  end
114
104
 
115
105
  create_table "salaries", id: false, force: :cascade do |t|
116
- t.integer "emp_no", null: false
117
- t.integer "salary", null: false
106
+ t.integer "emp_no", null: false
107
+ t.integer "salary", null: false
118
108
  t.date "from_date", null: false
119
- t.date "to_date", null: false
109
+ t.date "to_date", null: false
110
+ t.index ["emp_no"], name: "idx_salaries_emp_no", <%= i cond(5.0, using: :btree) %>
120
111
  end
121
112
 
122
- <%= add_index "salaries", ["emp_no"], name: "idx_salaries_emp_no", using: :btree %>
123
-
124
113
  create_table "titles", id: false, force: :cascade do |t|
125
- t.integer "emp_no", null: false
126
- t.string "title", limit: 50, null: false
127
- t.date "from_date", null: false
114
+ t.integer "emp_no", null: false
115
+ t.string "title", limit: 50, null: false
116
+ t.date "from_date", null: false
128
117
  t.date "to_date"
118
+ t.index ["emp_no"], name: "idx_titles_emp_no", <%= i cond(5.0, using: :btree) %>
129
119
  end
130
-
131
- <%= add_index "titles", ["emp_no"], name: "idx_titles_emp_no", using: :btree %>
132
120
  EOS
133
121
  }
134
122
 
data/spec/postgresql/migrate/migrate_change_index_spec.rb CHANGED
@@ -4,67 +4,60 @@ describe 'Ridgepole::Client#diff -> migrate' do
4
4
  erbh(<<-EOS)
5
5
  create_table "clubs", force: :cascade do |t|
6
6
  t.string "name", limit: 255, default: "", null: false
7
+ t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
7
8
  end
8
9
 
9
- <%= add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree %>
10
-
11
10
  create_table "departments", primary_key: "dept_no", force: :cascade do |t|
12
11
  t.string "dept_name", limit: 40, null: false
12
+ t.index ["dept_name"], name: "idx_dept_name", unique: true, <%= i cond(5.0, using: :btree) %>
13
13
  end
14
14
 
15
- <%= add_index "departments", ["dept_name"], name: "idx_dept_name", unique: true, using: :btree %>
16
-
17
15
  create_table "dept_emp", id: false, force: :cascade do |t|
18
- t.integer "emp_no", null: false
19
- t.string "dept_no", limit: 4, null: false
20
- t.date "from_date", null: false
21
- t.date "to_date", null: false
16
+ t.integer "emp_no", null: false
17
+ t.string "dept_no", limit: 4, null: false
18
+ t.date "from_date", null: false
19
+ t.date "to_date", null: false
20
+ t.index ["dept_no"], name: "idx_dept_emp_dept_no", <%= i cond(5.0, using: :btree) %>
21
+ t.index ["emp_no"], name: "idx_dept_emp_emp_no", <%= i cond(5.0, using: :btree) %>
22
22
  end
23
23
 
24
- <%= add_index "dept_emp", ["dept_no"], name: "idx_dept_emp_dept_no", using: :btree %>
25
- <%= add_index "dept_emp", ["emp_no"], name: "idx_dept_emp_emp_no", using: :btree %>
26
-
27
24
  create_table "dept_manager", id: false, force: :cascade do |t|
28
- t.string "dept_no", limit: 4, null: false
29
- t.integer "emp_no", null: false
30
- t.date "from_date", null: false
31
- t.date "to_date", null: false
25
+ t.string "dept_no", limit: 4, null: false
26
+ t.integer "emp_no", null: false
27
+ t.date "from_date", null: false
28
+ t.date "to_date", null: false
29
+ t.index ["dept_no"], name: "idx_dept_manager_dept_no", <%= i cond(5.0, using: :btree) %>
30
+ t.index ["emp_no"], name: "idx_dept_manager_emp_no", <%= i cond(5.0, using: :btree) %>
32
31
  end
33
32
 
34
- <%= add_index "dept_manager", ["dept_no"], name: "idx_dept_manager_dept_no", using: :btree %>
35
- <%= add_index "dept_manager", ["emp_no"], name: "idx_dept_manager_emp_no", using: :btree %>
36
-
37
33
  create_table "employee_clubs", force: :cascade do |t|
38
- t.integer "emp_no", null: false
34
+ t.integer "emp_no", null: false
39
35
  t.integer "club_id", null: false
36
+ t.index ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
40
37
  end
41
38
 
42
- <%= add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id", using: :btree %>
43
-
44
39
  create_table "employees", primary_key: "emp_no", force: :cascade do |t|
45
- t.date "birth_date", null: false
40
+ t.date "birth_date", null: false
46
41
  t.string "first_name", limit: 14, null: false
47
- t.string "last_name", limit: 16, null: false
48
- t.date "hire_date", null: false
42
+ t.string "last_name", limit: 16, null: false
43
+ t.date "hire_date", null: false
49
44
  end
50
45
 
51
46
  create_table "salaries", id: false, force: :cascade do |t|
52
- t.integer "emp_no", null: false
53
- t.integer "salary", null: false
47
+ t.integer "emp_no", null: false
48
+ t.integer "salary", null: false
54
49
  t.date "from_date", null: false
55
- t.date "to_date", null: false
50
+ t.date "to_date", null: false
51
+ t.index ["emp_no"], name: "idx_salaries_emp_no", <%= i cond(5.0, using: :btree) %>
56
52
  end
57
53
 
58
- <%= add_index "salaries", ["emp_no"], name: "idx_salaries_emp_no", using: :btree %>
59
-
60
54
  create_table "titles", id: false, force: :cascade do |t|
61
- t.integer "emp_no", null: false
62
- t.string "title", limit: 50, null: false
63
- t.date "from_date", null: false
55
+ t.integer "emp_no", null: false
56
+ t.string "title", limit: 50, null: false
57
+ t.date "from_date", null: false
64
58
  t.date "to_date"
59
+ t.index ["emp_no"], name: "idx_titles_emp_no", <%= i cond(5.0, using: :btree) %>
65
60
  end
66
-
67
- <%= add_index "titles", ["emp_no"], name: "idx_titles_emp_no", using: :btree %>
68
61
  EOS
69
62
  }
70
63
 
@@ -72,67 +65,60 @@ describe 'Ridgepole::Client#diff -> migrate' do
72
65
  erbh(<<-EOS)
73
66
  create_table "clubs", force: :cascade do |t|
74
67
  t.string "name", limit: 255, default: "", null: false
68
+ t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
75
69
  end
76
70
 
77
- <%= add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree %>
78
-
79
71
  create_table "departments", primary_key: "dept_no", force: :cascade do |t|
80
72
  t.string "dept_name", limit: 40, null: false
73
+ t.index ["dept_name"], name: "idx_dept_name", unique: true, <%= i cond(5.0, using: :btree) %>
81
74
  end
82
75
 
83
- <%= add_index "departments", ["dept_name"], name: "idx_dept_name", unique: true, using: :btree %>
84
-
85
76
  create_table "dept_emp", id: false, force: :cascade do |t|
86
- t.integer "emp_no", null: false
87
- t.string "dept_no", limit: 4, null: false
88
- t.date "from_date", null: false
89
- t.date "to_date", null: false
77
+ t.integer "emp_no", null: false
78
+ t.string "dept_no", limit: 4, null: false
79
+ t.date "from_date", null: false
80
+ t.date "to_date", null: false
81
+ t.index ["dept_no"], name: "idx_dept_emp_dept_no", <%= i cond(5.0, using: :btree) %>
82
+ t.index ["from_date"], name: "idx_dept_emp_emp_no", <%= i cond(5.0, using: :btree) %>
90
83
  end
91
84
 
92
- <%= add_index "dept_emp", ["dept_no"], name: "idx_dept_emp_dept_no", using: :btree %>
93
- <%= add_index "dept_emp", ["from_date"], name: "idx_dept_emp_emp_no", using: :btree %>
94
-
95
85
  create_table "dept_manager", id: false, force: :cascade do |t|
96
- t.string "dept_no", limit: 4, null: false
97
- t.integer "emp_no", null: false
98
- t.date "from_date", null: false
99
- t.date "to_date", null: false
86
+ t.string "dept_no", limit: 4, null: false
87
+ t.integer "emp_no", null: false
88
+ t.date "from_date", null: false
89
+ t.date "to_date", null: false
90
+ t.index ["dept_no"], name: "idx_dept_manager_dept_no", <%= i cond(5.0, using: :btree) %>
91
+ t.index ["from_date"], name: "idx_dept_manager_emp_no", <%= i cond(5.0, using: :btree) %>
100
92
  end
101
93
 
102
- <%= add_index "dept_manager", ["dept_no"], name: "idx_dept_manager_dept_no", using: :btree %>
103
- <%= add_index "dept_manager", ["from_date"], name: "idx_dept_manager_emp_no", using: :btree %>
104
-
105
94
  create_table "employee_clubs", force: :cascade do |t|
106
- t.integer "emp_no", null: false
95
+ t.integer "emp_no", null: false
107
96
  t.integer "club_id", null: false
97
+ t.index ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
108
98
  end
109
99
 
110
- <%= add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id", using: :btree %>
111
-
112
100
  create_table "employees", primary_key: "emp_no", force: :cascade do |t|
113
- t.date "birth_date", null: false
101
+ t.date "birth_date", null: false
114
102
  t.string "first_name", limit: 14, null: false
115
- t.string "last_name", limit: 16, null: false
116
- t.date "hire_date", null: false
103
+ t.string "last_name", limit: 16, null: false
104
+ t.date "hire_date", null: false
117
105
  end
118
106
 
119
107
  create_table "salaries", id: false, force: :cascade do |t|
120
- t.integer "emp_no", null: false
121
- t.integer "salary", null: false
108
+ t.integer "emp_no", null: false
109
+ t.integer "salary", null: false
122
110
  t.date "from_date", null: false
123
- t.date "to_date", null: false
111
+ t.date "to_date", null: false
112
+ t.index ["from_date"], name: "idx_salaries_emp_no", <%= i cond(5.0, using: :btree) %>
124
113
  end
125
114
 
126
- <%= add_index "salaries", ["from_date"], name: "idx_salaries_emp_no", using: :btree %>
127
-
128
115
  create_table "titles", id: false, force: :cascade do |t|
129
- t.integer "emp_no", null: false
130
- t.string "title", limit: 50, null: false
131
- t.date "from_date", null: false
116
+ t.integer "emp_no", null: false
117
+ t.string "title", limit: 50, null: false
118
+ t.date "from_date", null: false
132
119
  t.date "to_date"
120
+ t.index ["emp_no"], name: "idx_titles_emp_no", <%= i cond(5.0, using: :btree) %>
133
121
  end
134
-
135
- <%= add_index "titles", ["emp_no"], name: "idx_titles_emp_no", using: :btree %>
136
122
  EOS
137
123
  }
138
124