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/mysql/migrate/migrate_change_column6_spec.rb CHANGED
@@ -3,13 +3,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
3
3
  let(:actual_dsl) {
4
4
  erbh(<<-EOS)
5
5
  create_table "employees", force: :cascade do |t|
6
- t.date "birth_date", null: false
7
- t.string "first_name", limit: 14, null: false
8
- t.string "last_name", limit: 16, null: false
9
- t.string "gender", limit: 1, null: false
10
- t.date "hire_date", null: false
11
- t.datetime "created_at", null: false
12
- t.datetime "updated_at", null: false
6
+ t.date "birth_date", null: false
7
+ t.string "first_name", limit: 14, null: false
8
+ t.string "last_name", limit: 16, null: false
9
+ t.string "gender", limit: 1, null: false
10
+ t.date "hire_date", null: false
11
+ t.datetime "created_at", null: false
12
+ t.datetime "updated_at", null: false
13
13
  t.binary "registered_name", <%= i cond(5.0, limit: 65535) %>
14
14
  end
15
15
  EOS
@@ -18,14 +18,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
18
18
  let(:expected_dsl) {
19
19
  erbh(<<-EOS)
20
20
  create_table "employees", force: :cascade do |t|
21
- t.string "ext_column", null: false
22
- t.date "birth_date", null: false
23
- t.string "first_name", limit: 14, null: false
24
- t.string "last_name", limit: 16, null: false
25
- t.string "gender", limit: 1, null: false
26
- t.date "hire_date", null: false
27
- t.datetime "created_at", null: false
28
- t.datetime "updated_at", null: false
21
+ t.string "ext_column", null: false
22
+ t.date "birth_date", null: false
23
+ t.string "first_name", limit: 14, null: false
24
+ t.string "last_name", limit: 16, null: false
25
+ t.string "gender", limit: 1, null: false
26
+ t.date "hire_date", null: false
27
+ t.datetime "created_at", null: false
28
+ t.datetime "updated_at", null: false
29
29
  t.binary "registered_name", limit: 255
30
30
  end
31
31
  EOS
@@ -63,13 +63,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
63
63
  let(:actual_dsl) {
64
64
  erbh(<<-EOS)
65
65
  create_table "employees", primary_key: "emp_id", force: :cascade do |t|
66
- t.date "birth_date", null: false
67
- t.string "first_name", limit: 14, null: false
68
- t.string "last_name", limit: 16, null: false
69
- t.string "gender", limit: 1, null: false
70
- t.date "hire_date", null: false
71
- t.datetime "created_at", null: false
72
- t.datetime "updated_at", null: false
66
+ t.date "birth_date", null: false
67
+ t.string "first_name", limit: 14, null: false
68
+ t.string "last_name", limit: 16, null: false
69
+ t.string "gender", limit: 1, null: false
70
+ t.date "hire_date", null: false
71
+ t.datetime "created_at", null: false
72
+ t.datetime "updated_at", null: false
73
73
  t.binary "registered_name", <%= i cond(5.0, limit: 65535) %>
74
74
  end
75
75
  EOS
@@ -78,14 +78,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
78
78
  let(:expected_dsl) {
79
79
  erbh(<<-EOS)
80
80
  create_table "employees", primary_key: "emp_id", force: :cascade do |t|
81
- t.string "ext_column", null: false
82
- t.date "birth_date", null: false
83
- t.string "first_name", limit: 14, null: false
84
- t.string "last_name", limit: 16, null: false
85
- t.string "gender", limit: 1, null: false
86
- t.date "hire_date", null: false
87
- t.datetime "created_at", null: false
88
- t.datetime "updated_at", null: false
81
+ t.string "ext_column", null: false
82
+ t.date "birth_date", null: false
83
+ t.string "first_name", limit: 14, null: false
84
+ t.string "last_name", limit: 16, null: false
85
+ t.string "gender", limit: 1, null: false
86
+ t.date "hire_date", null: false
87
+ t.datetime "created_at", null: false
88
+ t.datetime "updated_at", null: false
89
89
  t.binary "registered_name", limit: 255
90
90
  end
91
91
  EOS
@@ -123,13 +123,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
123
123
  let(:actual_dsl) {
124
124
  erbh(<<-EOS)
125
125
  create_table "employees", id: false, force: :cascade do |t|
126
- t.date "birth_date", null: false
127
- t.string "first_name", limit: 14, null: false
128
- t.string "last_name", limit: 16, null: false
129
- t.string "gender", limit: 1, null: false
130
- t.date "hire_date", null: false
131
- t.datetime "created_at", null: false
132
- t.datetime "updated_at", null: false
126
+ t.date "birth_date", null: false
127
+ t.string "first_name", limit: 14, null: false
128
+ t.string "last_name", limit: 16, null: false
129
+ t.string "gender", limit: 1, null: false
130
+ t.date "hire_date", null: false
131
+ t.datetime "created_at", null: false
132
+ t.datetime "updated_at", null: false
133
133
  t.binary "registered_name", <%= i cond(5.0, limit: 65535) %>
134
134
  end
135
135
  EOS
@@ -138,14 +138,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
138
138
  let(:expected_dsl) {
139
139
  erbh(<<-EOS)
140
140
  create_table "employees", id: false, force: :cascade do |t|
141
- t.string "ext_column", null: false
142
- t.date "birth_date", null: false
143
- t.string "first_name", limit: 14, null: false
144
- t.string "last_name", limit: 16, null: false
145
- t.string "gender", limit: 1, null: false
146
- t.date "hire_date", null: false
147
- t.datetime "created_at", null: false
148
- t.datetime "updated_at", null: false
141
+ t.string "ext_column", null: false
142
+ t.date "birth_date", null: false
143
+ t.string "first_name", limit: 14, null: false
144
+ t.string "last_name", limit: 16, null: false
145
+ t.string "gender", limit: 1, null: false
146
+ t.date "hire_date", null: false
147
+ t.datetime "created_at", null: false
148
+ t.datetime "updated_at", null: false
149
149
  t.binary "registered_name", limit: 255
150
150
  end
151
151
  EOS
@@ -181,13 +181,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
181
181
  let(:actual_dsl) {
182
182
  erbh(<<-EOS)
183
183
  create_table "employees", force: :cascade do |t|
184
- t.date "birth_date", null: false
185
- t.string "first_name", limit: 14, null: false
186
- t.string "last_name", limit: 16, null: false
187
- t.string "gender", limit: 1, null: false
188
- t.date "hire_date", null: false
189
- t.datetime "created_at", null: false
190
- t.datetime "updated_at", null: false
184
+ t.date "birth_date", null: false
185
+ t.string "first_name", limit: 14, null: false
186
+ t.string "last_name", limit: 16, null: false
187
+ t.string "gender", limit: 1, null: false
188
+ t.date "hire_date", null: false
189
+ t.datetime "created_at", null: false
190
+ t.datetime "updated_at", null: false
191
191
  t.binary "registered_name", <%= i cond(5.0, limit: 65535) %>
192
192
  end
193
193
  EOS
@@ -196,14 +196,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
196
196
  let(:expected_dsl) {
197
197
  erbh(<<-EOS)
198
198
  create_table "employees", primary_key: "emp_id", force: :cascade do |t|
199
- t.string "ext_column", null: false
200
- t.date "birth_date", null: false
201
- t.string "first_name", limit: 14, null: false
202
- t.string "last_name", limit: 16, null: false
203
- t.string "gender", limit: 1, null: false
204
- t.date "hire_date", null: false
205
- t.datetime "created_at", null: false
206
- t.datetime "updated_at", null: false
199
+ t.string "ext_column", null: false
200
+ t.date "birth_date", null: false
201
+ t.string "first_name", limit: 14, null: false
202
+ t.string "last_name", limit: 16, null: false
203
+ t.string "gender", limit: 1, null: false
204
+ t.date "hire_date", null: false
205
+ t.datetime "created_at", null: false
206
+ t.datetime "updated_at", null: false
207
207
  t.binary "registered_name", limit: 255
208
208
  end
209
209
  EOS
data/spec/mysql/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
  erbh(<<-EOS)
5
5
  create_table "salaries", id: false, force: :cascade do |t|
6
- t.integer "emp_no", default: 0, null: false
7
- t.float "salary", limit: 24, 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.float "salary", limit: 24, 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", limit: 4, null: true
18
- t.float "salary", limit: 24, null: false
19
- t.date "from_date", null: false
20
- t.date "to_date", null: false
17
+ t.integer "emp_no", limit: 4, null: true
18
+ t.float "salary", limit: 24, null: false
19
+ t.date "from_date", null: false
20
+ t.date "to_date", null: false
21
21
  end
22
22
  EOS
23
23
  }
@@ -26,9 +26,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
26
26
  erbh(<<-EOS)
27
27
  create_table "salaries", id: false, force: :cascade do |t|
28
28
  t.integer "emp_no"
29
- t.float "salary", limit: 24, null: false
30
- t.date "from_date", null: false
31
- t.date "to_date", null: false
29
+ t.float "salary", limit: 24, null: false
30
+ t.date "from_date", null: false
31
+ t.date "to_date", null: false
32
32
  end
33
33
  EOS
34
34
  }
@@ -49,10 +49,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
49
49
  let(:actual_dsl) {
50
50
  erbh(<<-EOS)
51
51
  create_table "salaries", id: false, force: :cascade do |t|
52
- t.integer "emp_no", default: 0, null: false
53
- t.float "salary", limit: 24, null: false
54
- t.date "from_date", null: false
55
- t.date "to_date", null: false
52
+ t.integer "emp_no", default: 0, null: false
53
+ t.float "salary", limit: 24, null: false
54
+ t.date "from_date", null: false
55
+ t.date "to_date", null: false
56
56
  end
57
57
  EOS
58
58
  }
@@ -60,10 +60,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
60
60
  let(:expected_dsl) {
61
61
  erbh(<<-EOS)
62
62
  create_table "salaries", id: false, force: :cascade do |t|
63
- t.integer "emp_no", null: false
64
- t.float "salary", limit: 24, null: false
65
- t.date "from_date", null: false
66
- t.date "to_date", null: false
63
+ t.integer "emp_no", null: false
64
+ t.float "salary", limit: 24, null: false
65
+ t.date "from_date", null: false
66
+ t.date "to_date", null: false
67
67
  end
68
68
  EOS
69
69
  }
@@ -84,10 +84,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
84
84
  let(:actual_dsl) {
85
85
  erbh(<<-EOS)
86
86
  create_table "salaries", id: false, force: :cascade do |t|
87
- t.integer "emp_no", default: 0, null: false
88
- t.float "salary", limit: 24, null: false
89
- t.date "from_date", null: false
90
- t.date "to_date", null: false
87
+ t.integer "emp_no", default: 0, null: false
88
+ t.float "salary", limit: 24, null: false
89
+ t.date "from_date", null: false
90
+ t.date "to_date", null: false
91
91
  end
92
92
  EOS
93
93
  }
@@ -105,10 +105,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
105
105
  let(:actual_dsl) {
106
106
  erbh(<<-EOS)
107
107
  create_table "salaries", id: false, force: :cascade do |t|
108
- t.integer "emp_no", default: 0, null: false
109
- t.float "salary", limit: 24, null: false
110
- t.date "from_date", null: false
111
- t.date "to_date", null: false
108
+ t.integer "emp_no", default: 0, null: false
109
+ t.float "salary", limit: 24, null: false
110
+ t.date "from_date", null: false
111
+ t.date "to_date", null: false
112
112
  end
113
113
  EOS
114
114
  }
@@ -116,10 +116,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
116
116
  let(:expected_dsl) {
117
117
  <<-EOS
118
118
  create_table "salaries", id: false, force: :cascade do |t|
119
- t.integer "emp_no", limit: 4, default: 0, null: true
120
- t.float "salary", limit: 24, null: false
121
- t.date "from_date", null: false
122
- t.date "to_date", null: false
119
+ t.integer "emp_no", limit: 4, default: 0, null: true
120
+ t.float "salary", limit: 24, null: false
121
+ t.date "from_date", null: false
122
+ t.date "to_date", null: false
123
123
  end
124
124
  EOS
125
125
  }
@@ -127,10 +127,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
127
127
  let(:result_dsl) {
128
128
  erbh(<<-EOS)
129
129
  create_table "salaries", id: false, force: :cascade do |t|
130
- t.integer "emp_no", default: 0
131
- t.float "salary", limit: 24, null: false
132
- t.date "from_date", null: false
133
- t.date "to_date", null: false
130
+ t.integer "emp_no", default: 0
131
+ t.float "salary", limit: 24, null: false
132
+ t.date "from_date", null: false
133
+ t.date "to_date", null: false
134
134
  end
135
135
  EOS
136
136
  }
@@ -151,10 +151,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
151
151
  let(:actual_dsl) {
152
152
  erbh(<<-EOS)
153
153
  create_table "salaries", id: false, force: :cascade do |t|
154
- t.integer "emp_no", default: 0
155
- t.float "salary", limit: 24, null: false
156
- t.date "from_date", null: false
157
- t.date "to_date", null: false
154
+ t.integer "emp_no", default: 0
155
+ t.float "salary", limit: 24, null: false
156
+ t.date "from_date", null: false
157
+ t.date "to_date", null: false
158
158
  end
159
159
  EOS
160
160
  }
@@ -162,10 +162,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
162
162
  let(:expected_dsl) {
163
163
  erbh(<<-EOS)
164
164
  create_table "salaries", id: false, force: :cascade do |t|
165
- t.integer "emp_no", null: false
166
- t.float "salary", limit: 24, null: false
167
- t.date "from_date", null: false
168
- t.date "to_date", null: false
165
+ t.integer "emp_no", null: false
166
+ t.float "salary", limit: 24, null: false
167
+ t.date "from_date", null: false
168
+ t.date "to_date", null: false
169
169
  end
170
170
  EOS
171
171
  }
@@ -173,10 +173,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
173
173
  let(:result_dsl) {
174
174
  erbh(<<-EOS)
175
175
  create_table "salaries", id: false, force: :cascade do |t|
176
- t.integer "emp_no", <%= i cond(5.0, default: 0) + {null: false} %>
177
- t.float "salary", limit: 24, null: false
178
- t.date "from_date", null: false
179
- t.date "to_date", null: false
176
+ t.integer "emp_no", <%= i cond(5.0, default: 0) + {null: false} %>
177
+ t.float "salary", limit: 24, null: false
178
+ t.date "from_date", null: false
179
+ t.date "to_date", null: false
180
180
  end
181
181
  EOS
182
182
  }
data/spec/mysql/migrate/migrate_change_column_float_spec.rb CHANGED
@@ -3,10 +3,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
3
3
  let(:actual_dsl) {
4
4
  erbh(<<-EOS)
5
5
  create_table "salaries", id: false, force: :cascade do |t|
6
- t.integer "emp_no", <%= i limit(4) + {null: false} %>
7
- t.float "salary", limit: 24, null: false
8
- t.date "from_date", null: false
9
- t.date "to_date", null: false
6
+ t.integer "emp_no", null: false
7
+ t.float "salary", limit: 24, 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.float "salary", null: false
19
- t.date "from_date", null: false
20
- t.date "to_date", null: false
17
+ t.integer "emp_no", null: false
18
+ t.float "salary", null: false
19
+ t.date "from_date", null: false
20
+ t.date "to_date", null: false
21
21
  end
22
22
  EOS
23
23
  }
@@ -38,10 +38,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
38
38
  let(:actual_dsl) {
39
39
  <<-EOS
40
40
  create_table "salaries", id: false, force: :cascade do |t|
41
- t.integer "emp_no", null: false
42
- t.float "salary", limit: 24, null: false
43
- t.date "from_date", null: false
44
- t.date "to_date", null: false
41
+ t.integer "emp_no", null: false
42
+ t.float "salary", limit: 24, null: false
43
+ t.date "from_date", null: false
44
+ t.date "to_date", null: false
45
45
  end
46
46
  EOS
47
47
  }
@@ -49,10 +49,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
49
49
  let(:expected_dsl) {
50
50
  <<-EOS
51
51
  create_table "salaries", id: false, force: :cascade do |t|
52
- t.integer "emp_no", null: false
53
- t.float "salary", null: false
54
- t.date "from_date", null: false
55
- t.date "to_date", null: false
52
+ t.integer "emp_no", null: false
53
+ t.float "salary", null: false
54
+ t.date "from_date", null: false
55
+ t.date "to_date", null: false
56
56
  end
57
57
  EOS
58
58
  }
data/spec/mysql/migrate/migrate_change_column_spec.rb CHANGED
@@ -4,68 +4,61 @@ describe 'Ridgepole::Client#diff -> migrate' do
4
4
  erbh(<<-EOS)
5
5
  create_table "clubs", force: :cascade do |t|
6
6
  t.string "name", 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: "dept_name", unique: true, <%= i cond(5.0, using: :btree) %>
13
13
  end
14
14
 
15
- <%= add_index "departments", ["dept_name"], name: "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", 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", null: false
18
+ t.date "from_date", null: false
19
+ t.date "to_date", null: false
20
+ t.index ["dept_no"], name: "dept_no", <%= i cond(5.0, using: :btree) %>
21
+ t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
22
22
  end
23
23
 
24
- <%= add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree %>
25
- <%= add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree %>
26
-
27
24
  create_table "dept_manager", id: false, force: :cascade do |t|
28
- t.string "dept_no", 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", 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: "dept_no", <%= i cond(5.0, using: :btree) %>
30
+ t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
32
31
  end
33
32
 
34
- <%= add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree %>
35
- <%= add_index "dept_manager", ["emp_no"], name: "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_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_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.string "gender", limit: 1, null: false
49
- t.date "hire_date", null: false
42
+ t.string "last_name", limit: 16, null: false
43
+ t.string "gender", limit: 1, null: false
44
+ t.date "hire_date", null: false
50
45
  end
51
46
 
52
47
  create_table "salaries", id: false, force: :cascade do |t|
53
- t.integer "emp_no", null: false
54
- t.integer "salary", null: false
55
- t.date "from_date", null: false
56
- t.date "to_date", null: false
48
+ t.integer "emp_no", null: false
49
+ t.integer "salary", null: false
50
+ t.date "from_date", null: false
51
+ t.date "to_date", null: false
52
+ t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
57
53
  end
58
54
 
59
- <%= add_index "salaries", ["emp_no"], name: "emp_no", using: :btree %>
60
-
61
55
  create_table "titles", id: false, force: :cascade do |t|
62
- t.integer "emp_no", null: false
63
- t.string "title", limit: 50, null: false
64
- t.date "from_date", null: false
56
+ t.integer "emp_no", null: false
57
+ t.string "title", limit: 50, null: false
58
+ t.date "from_date", null: false
65
59
  t.date "to_date"
60
+ t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
66
61
  end
67
-
68
- <%= add_index "titles", ["emp_no"], name: "emp_no", using: :btree %>
69
62
  EOS
70
63
  }
71
64
 
@@ -73,68 +66,61 @@ describe 'Ridgepole::Client#diff -> migrate' do
73
66
  erbh(<<-EOS)
74
67
  create_table "clubs", force: :cascade do |t|
75
68
  t.string "name", default: "", null: false
69
+ t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
76
70
  end
77
71
 
78
- <%= add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree %>
79
-
80
72
  create_table "departments", primary_key: "dept_no", force: :cascade do |t|
81
73
  t.string "dept_name", limit: 40, null: false
74
+ t.index ["dept_name"], name: "dept_name", unique: true, <%= i cond(5.0, using: :btree) %>
82
75
  end
83
76
 
84
- <%= add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree %>
85
-
86
77
  create_table "dept_emp", id: false, force: :cascade do |t|
87
- t.integer "emp_no", null: false
88
- t.string "dept_no", null: false
89
- t.date "from_date", null: false
90
- t.date "to_date", null: false
78
+ t.integer "emp_no", null: false
79
+ t.string "dept_no", null: false
80
+ t.date "from_date", null: false
81
+ t.date "to_date", null: false
82
+ t.index ["dept_no"], name: "dept_no", <%= i cond(5.0, using: :btree) %>
83
+ t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
91
84
  end
92
85
 
93
- <%= add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree %>
94
- <%= add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree %>
95
-
96
86
  create_table "dept_manager", id: false, force: :cascade do |t|
97
- t.string "dept_no", null: false
98
- t.integer "emp_no", null: false
99
- t.date "from_date", null: false
100
- t.date "to_date", null: false
87
+ t.string "dept_no", null: false
88
+ t.integer "emp_no", null: false
89
+ t.date "from_date", null: false
90
+ t.date "to_date", null: false
91
+ t.index ["dept_no"], name: "dept_no", <%= i cond(5.0, using: :btree) %>
92
+ t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
101
93
  end
102
94
 
103
- <%= add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree %>
104
- <%= add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree %>
105
-
106
95
  create_table "employee_clubs", force: :cascade do |t|
107
- t.integer "emp_no", null: false
96
+ t.integer "emp_no", null: false
108
97
  t.integer "club_id"
98
+ t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
109
99
  end
110
100
 
111
- <%= add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree %>
112
-
113
101
  create_table "employees", primary_key: "emp_no", force: :cascade do |t|
114
- t.date "birth_date", null: false
115
- t.string "first_name", limit: 14, null: false
116
- t.string "last_name", limit: 20, default: "XXX", null: false
117
- t.string "gender", limit: 2, null: false
118
- t.date "hire_date", null: false
102
+ t.date "birth_date", null: false
103
+ t.string "first_name", limit: 14, null: false
104
+ t.string "last_name", limit: 20, default: "XXX", null: false
105
+ t.string "gender", limit: 2, null: false
106
+ t.date "hire_date", null: false
119
107
  end
120
108
 
121
109
  create_table "salaries", id: false, force: :cascade do |t|
122
- t.integer "emp_no", null: false
123
- t.integer "salary", null: false
124
- t.date "from_date", null: false
125
- t.date "to_date", null: false
110
+ t.integer "emp_no", null: false
111
+ t.integer "salary", null: false
112
+ t.date "from_date", null: false
113
+ t.date "to_date", null: false
114
+ t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
126
115
  end
127
116
 
128
- <%= add_index "salaries", ["emp_no"], name: "emp_no", using: :btree %>
129
-
130
117
  create_table "titles", id: false, force: :cascade do |t|
131
- t.integer "emp_no", null: false
132
- t.string "title", limit: 50, null: false
133
- t.date "from_date", null: false
118
+ t.integer "emp_no", null: false
119
+ t.string "title", limit: 50, null: false
120
+ t.date "from_date", null: false
134
121
  t.date "to_date"
122
+ t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
135
123
  end
136
-
137
- <%= add_index "titles", ["emp_no"], name: "emp_no", using: :btree %>
138
124
  EOS
139
125
  }
140
126
 
@@ -153,10 +139,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
153
139
  delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, enable_mysql_unsigned: true)
154
140
  expect(delta.differ?).to be_truthy
155
141
  expect(delta.script).to match_fuzzy erbh(<<-EOS)
156
- change_column("employee_clubs", "club_id", :integer, <%= {:null=>false, :default=>nil} + cond(5.1, comment: nil) %>)
142
+ change_column("employee_clubs", "club_id", :integer, <%= {:null=>false, :default=>nil, :unsigned=>false} + cond(5.1, comment: nil) %>)
157
143
 
158
- change_column("employees", "last_name", :string,<%= {:limit=>16, :default=>nil} + cond(5.1, comment: nil) %>)
159
- change_column("employees", "gender", :string,<%= {:limit=>1, :null=>false, :default=>nil} + cond(5.1, comment: nil) %>)
144
+ change_column("employees", "last_name", :string,<%= {:limit=>16, :default=>nil, :unsigned=>false} + cond(5.1, comment: nil) %>)
145
+ change_column("employees", "gender", :string,<%= {:limit=>1, :null=>false, :default=>nil, :unsigned=>false} + cond(5.1, comment: nil) %>)
160
146
  EOS
161
147
  }
162
148
 
@@ -166,12 +152,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
166
152
  expect(subject.dump).to match_fuzzy actual_dsl
167
153
  expect(delta.script).to match_fuzzy erbh(<<-EOS)
168
154
  change_table("employee_clubs", {:bulk => true}) do |t|
169
- t.change("club_id", :integer, <%= {:null=>true, :default=>nil} + cond(5.1, comment: nil) %>)
155
+ t.change("club_id", :integer, <%= {:null=>true, :default=>nil, :unsigned=>false} + cond(5.1, comment: nil) %>)
170
156
  end
171
157
 
172
158
  change_table("employees", {:bulk => true}) do |t|
173
- t.change("last_name", :string, <%= {:limit=>20, :default=>"XXX"} + cond(5.1, comment: nil) %>)
174
- t.change("gender", :string, <%= {:limit=>2, :null=>false, :default=>nil} + cond(5.1, comment: nil) %>)
159
+ t.change("last_name", :string, <%= {:limit=>20, :default=>"XXX", :unsigned=>false} + cond(5.1, comment: nil) %>)
160
+ t.change("gender", :string, <%= {:limit=>2, :null=>false, :default=>nil, :unsigned=>false} + cond(5.1, comment: nil) %>)
175
161
  end
176
162
  EOS
177
163
  delta.migrate