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/comment/comment_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 "employee_clubs", force: :cascade do |t|
6
- t.integer "emp_no", null: false
7
- t.integer "club_id", null: false
8
- t.string "string", null: false
9
- t.text "text", <%= i cond('5.0.', limit: 65535) %>, null: false
6
+ t.integer "emp_no", null: false
7
+ t.integer "club_id", null: false
8
+ t.string "string", null: false
9
+ t.text "text", <%= i cond(5.0, limit: 65535) %>, 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
  erbh(<<-EOS)
16
16
  create_table "employee_clubs", force: :cascade do |t|
17
- t.integer "emp_no", null: false, comment: "any comment"
18
- t.integer "club_id", null: false, comment: "any comment2"
19
- t.string "string", null: false, comment: "any comment3"
20
- t.text "text", <%= i cond('5.0.', limit: 65535) %>, null: false, comment: "any comment4"
17
+ t.integer "emp_no", null: false, comment: "any comment"
18
+ t.integer "club_id", null: false, comment: "any comment2"
19
+ t.string "string", null: false, comment: "any comment3"
20
+ t.text "text", <%= i cond(5.0, limit: 65535) %>, null: false, comment: "any comment4"
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
  erbh(<<-EOS)
40
40
  create_table "employee_clubs", force: :cascade do |t|
41
- t.integer "emp_no", null: false, comment: "any comment"
42
- t.integer "club_id", null: false, comment: "any comment2"
43
- t.string "string", null: false, comment: "any comment3"
44
- t.text "text", <%= i cond('5.0.', limit: 65535) %>, null: false, comment: "any comment4"
41
+ t.integer "emp_no", null: false, comment: "any comment"
42
+ t.integer "club_id", null: false, comment: "any comment2"
43
+ t.string "string", null: false, comment: "any comment3"
44
+ t.text "text", <%= i cond(5.0, limit: 65535) %>, null: false, comment: "any comment4"
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
  erbh(<<-EOS)
51
51
  create_table "employee_clubs", force: :cascade do |t|
52
- t.integer "emp_no", null: false
53
- t.integer "club_id", null: false
54
- t.string "string", null: false
55
- t.text "text", <%= i cond('5.0.', limit: 65535) %>, null: false
52
+ t.integer "emp_no", null: false
53
+ t.integer "club_id", null: false
54
+ t.string "string", null: false
55
+ t.text "text", <%= i cond(5.0, limit: 65535) %>, null: false
56
56
  end
57
57
  EOS
58
58
  }
@@ -73,10 +73,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
73
73
  let(:actual_dsl) {
74
74
  erbh(<<-EOS)
75
75
  create_table "employee_clubs", force: :cascade do |t|
76
- t.integer "emp_no", null: false, comment: "any comment"
77
- t.integer "club_id", null: false, comment: "any comment2"
78
- t.string "string", null: false, comment: "any comment3"
79
- t.text "text", <%= i cond('5.0.', limit: 65535) %>, null: false, comment: "any comment4"
76
+ t.integer "emp_no", null: false, comment: "any comment"
77
+ t.integer "club_id", null: false, comment: "any comment2"
78
+ t.string "string", null: false, comment: "any comment3"
79
+ t.text "text", <%= i cond(5.0, limit: 65535) %>, null: false, comment: "any comment4"
80
80
  end
81
81
  EOS
82
82
  }
@@ -84,10 +84,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
84
84
  let(:expected_dsl) {
85
85
  erbh(<<-EOS)
86
86
  create_table "employee_clubs", force: :cascade do |t|
87
- t.integer "emp_no", null: false, comment: "other comment"
88
- t.integer "club_id", null: false, comment: "other comment2"
89
- t.string "string", null: false, comment: "other comment3"
90
- t.text "text", <%= i cond('5.0.', limit: 65535) %>, null: false, comment: "other comment4"
87
+ t.integer "emp_no", null: false, comment: "other comment"
88
+ t.integer "club_id", null: false, comment: "other comment2"
89
+ t.string "string", null: false, comment: "other comment3"
90
+ t.text "text", <%= i cond(5.0, limit: 65535) %>, null: false, comment: "other comment4"
91
91
  end
92
92
  EOS
93
93
  }
@@ -108,10 +108,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
108
108
  let(:actual_dsl) {
109
109
  erbh(<<-EOS)
110
110
  create_table "employee_clubs", force: :cascade do |t|
111
- t.integer "emp_no", null: false, comment: "any comment"
112
- t.integer "club_id", null: false, comment: "any comment2"
113
- t.string "string", null: false, comment: "any comment3"
114
- t.text "text", <%= i cond('5.0.', limit: 65535) %>, null: false, comment: "any comment4"
111
+ t.integer "emp_no", null: false, comment: "any comment"
112
+ t.integer "club_id", null: false, comment: "any comment2"
113
+ t.string "string", null: false, comment: "any comment3"
114
+ t.text "text", <%= i cond(5.0, limit: 65535) %>, null: false, comment: "any comment4"
115
115
  end
116
116
  EOS
117
117
  }
@@ -132,10 +132,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
132
132
  let(:expected_dsl) {
133
133
  erbh(<<-EOS)
134
134
  create_table "employee_clubs", force: :cascade, comment: "table comment" do |t|
135
- t.integer "emp_no", null: false, comment: "other comment"
136
- t.integer "club_id", null: false, comment: "other comment2"
137
- t.string "string", null: false, comment: "other comment3"
138
- t.text "text", <%= i cond('5.0.', limit: 65535) %>, null: false, comment: "other comment4"
135
+ t.integer "emp_no", null: false, comment: "other comment"
136
+ t.integer "club_id", null: false, comment: "other comment2"
137
+ t.string "string", null: false, comment: "other comment3"
138
+ t.text "text", <%= i cond(5.0, limit: 65535) %>, null: false, comment: "other comment4"
139
139
  end
140
140
  EOS
141
141
  }
@@ -155,10 +155,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
155
155
  let(:actual_dsl) {
156
156
  erbh(<<-EOS)
157
157
  create_table "employee_clubs", force: :cascade, comment: "table comment" do |t|
158
- t.integer "emp_no", null: false, comment: "other comment"
159
- t.integer "club_id", null: false, comment: "other comment2"
160
- t.string "string", null: false, comment: "other comment3"
161
- t.text "text", <%= i cond('5.0.', limit: 65535) %>, null: false, comment: "other comment4"
158
+ t.integer "emp_no", null: false, comment: "other comment"
159
+ t.integer "club_id", null: false, comment: "other comment2"
160
+ t.string "string", null: false, comment: "other comment3"
161
+ t.text "text", <%= i cond(5.0, limit: 65535) %>, null: false, comment: "other comment4"
162
162
  end
163
163
  EOS
164
164
  }
data/spec/mysql/default_lambda/default_lambda_spec.rb CHANGED
@@ -64,7 +64,7 @@ describe 'Ridgepole::Client (use default:lambda)' do
64
64
 
65
65
  expect(subject.dump).to match_fuzzy erbh(<<-EOS)
66
66
  create_table "foos", force: :cascade do |t|
67
- t.datetime "bar", default: <%= cond('5.1', '"1970-01-01 00:00:00"', "'1970-01-01 00:00:00'") %>, null: false
67
+ t.datetime "bar", default: <%= cond(5.1, '"1970-01-01 00:00:00"', "'1970-01-01 00:00:00'") %>, null: false
68
68
  end
69
69
  EOS
70
70
  end
data/spec/mysql/diff/diff2_spec.rb CHANGED
@@ -18,20 +18,20 @@ describe 'Ridgepole::Client.diff' do
18
18
  add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree
19
19
 
20
20
  create_table "dept_emp", id: false, force: :cascade do |t|
21
- t.integer "emp_no", null: false
22
- t.string "dept_no", limit: 4, null: false
23
- t.date "from_date", null: false
24
- t.date "to_date", null: false
21
+ t.integer "emp_no", null: false
22
+ t.string "dept_no", limit: 4, null: false
23
+ t.date "from_date", null: false
24
+ t.date "to_date", null: false
25
25
  end
26
26
 
27
27
  add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree
28
28
  add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree
29
29
 
30
30
  create_table "dept_manager", id: false, force: :cascade do |t|
31
- t.string "dept_no", limit: 4, null: false
32
- t.integer "emp_no", null: false
33
- t.date "from_date", null: false
34
- t.date "to_date", null: false
31
+ t.string "dept_no", limit: 4, null: false
32
+ t.integer "emp_no", null: false
33
+ t.date "from_date", null: false
34
+ t.date "to_date", null: false
35
35
  end
36
36
 
37
37
  add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
@@ -45,33 +45,33 @@ describe 'Ridgepole::Client.diff' do
45
45
  require "file1.required"
46
46
 
47
47
  create_table "employee_clubs", force: :cascade do |t|
48
- t.integer "emp_no", null: false, unsigned: true
48
+ t.integer "emp_no", null: false, unsigned: true
49
49
  t.integer "club_id", null: false, unsigned: true
50
50
  end
51
51
 
52
52
  add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
53
53
 
54
54
  create_table "employees", primary_key: "emp_no", force: :cascade do |t|
55
- t.date "birth_date", null: false
55
+ t.date "birth_date", null: false
56
56
  t.string "first_name", limit: 14, null: false
57
- t.string "last_name", limit: 16, null: false
58
- t.string "gender", limit: 1, null: false
59
- t.date "hire_date", null: false
57
+ t.string "last_name", limit: 16, null: false
58
+ t.string "gender", limit: 1, null: false
59
+ t.date "hire_date", null: false
60
60
  end
61
61
 
62
62
  create_table "salaries", id: false, force: :cascade do |t|
63
- t.integer "emp_no", null: false
64
- t.integer "salary", null: false
63
+ t.integer "emp_no", null: false
64
+ t.integer "salary", null: false
65
65
  t.date "from_date", null: false
66
- t.date "to_date", null: false
66
+ t.date "to_date", null: false
67
67
  end
68
68
 
69
69
  add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
70
70
 
71
71
  create_table "titles", id: false, force: :cascade do |t|
72
- t.integer "emp_no", null: false
73
- t.string "title", limit: 50, null: false
74
- t.date "from_date", null: false
72
+ t.integer "emp_no", null: false
73
+ t.string "title", limit: 50, null: false
74
+ t.date "from_date", null: false
75
75
  t.date "to_date"
76
76
  end
77
77
 
@@ -99,20 +99,20 @@ describe 'Ridgepole::Client.diff' do
99
99
  add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree
100
100
 
101
101
  create_table "dept_emp", id: false, force: :cascade do |t|
102
- t.integer "emp_no", null: false
103
- t.string "dept_no", limit: 4, null: false
104
- t.date "from_date", null: false
105
- t.date "to_date", null: false
102
+ t.integer "emp_no", null: false
103
+ t.string "dept_no", limit: 4, null: false
104
+ t.date "from_date", null: false
105
+ t.date "to_date", null: false
106
106
  end
107
107
 
108
108
  add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree
109
109
  add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree
110
110
 
111
111
  create_table "dept_manager", id: false, force: :cascade do |t|
112
- t.string "dept_no", limit: 4, null: false
113
- t.integer "emp_no", null: false
114
- t.date "from_date", null: false
115
- t.date "to_date", null: false
112
+ t.string "dept_no", limit: 4, null: false
113
+ t.integer "emp_no", null: false
114
+ t.date "from_date", null: false
115
+ t.date "to_date", null: false
116
116
  end
117
117
 
118
118
  add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
@@ -126,33 +126,33 @@ describe 'Ridgepole::Client.diff' do
126
126
  require "file2.required"
127
127
 
128
128
  create_table "employee_clubs", force: :cascade do |t|
129
- t.integer "emp_no", unsigned: true, null: false
129
+ t.integer "emp_no", unsigned: true, null: false
130
130
  t.integer "club_id", unsigned: false, null: true
131
131
  end
132
132
 
133
133
  add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
134
134
 
135
135
  create_table "employees", primary_key: "emp_no", force: :cascade do |t|
136
- t.date "birth_date", null: false
137
- t.string "first_name", limit: 14, null: false
138
- t.string "last_name", limit: 20, default: "XXX", null: false
139
- t.string "gender", limit: 2, null: false
140
- t.date "hire_date", null: false
136
+ t.date "birth_date", null: false
137
+ t.string "first_name", limit: 14, null: false
138
+ t.string "last_name", limit: 20, default: "XXX", null: false
139
+ t.string "gender", limit: 2, null: false
140
+ t.date "hire_date", null: false
141
141
  end
142
142
 
143
143
  create_table "salaries", id: false, force: :cascade do |t|
144
- t.integer "emp_no", null: false
145
- t.integer "salary", null: false
144
+ t.integer "emp_no", null: false
145
+ t.integer "salary", null: false
146
146
  t.date "from_date", null: false
147
- t.date "to_date", null: false
147
+ t.date "to_date", null: false
148
148
  end
149
149
 
150
150
  add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
151
151
 
152
152
  create_table "titles", id: false, force: :cascade do |t|
153
- t.integer "emp_no", null: false
154
- t.string "title", limit: 50, null: false
155
- t.date "from_date", null: false
153
+ t.integer "emp_no", null: false
154
+ t.string "title", limit: 50, null: false
155
+ t.date "from_date", null: false
156
156
  t.date "to_date"
157
157
  end
158
158
 
@@ -175,8 +175,8 @@ describe 'Ridgepole::Client.diff' do
175
175
  expect(delta.script).to match_fuzzy erbh(<<-EOS)
176
176
  change_column("employee_clubs", "club_id", :integer, <%= {:unsigned=>false, :null=>true, :default=>nil} + cond(5.1, comment: nil) %>)
177
177
 
178
- change_column("employees", "last_name", :string, <%= {:limit=>20, :default=>"XXX"} + cond(5.1, comment: nil) %>)
179
- change_column("employees", "gender", :string, <%= {:limit=>2, :null=>false, :default=>nil} + cond(5.1, comment: nil) %>)
178
+ change_column("employees", "last_name", :string, <%= {:limit=>20, :default=>"XXX", :unsigned=>false} + cond(5.1, comment: nil) %>)
179
+ change_column("employees", "gender", :string, <%= {:limit=>2, :null=>false, :default=>nil, :unsigned=>false} + cond(5.1, comment: nil) %>)
180
180
  EOS
181
181
  }
182
182
 
data/spec/mysql/diff/diff_spec.rb CHANGED
@@ -15,53 +15,53 @@ describe 'Ridgepole::Client.diff' do
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", 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
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
22
22
  end
23
23
 
24
24
  add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree
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", 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
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
32
32
  end
33
33
 
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
37
  create_table "employee_clubs", force: :cascade do |t|
38
- t.integer "emp_no", null: false, unsigned: true
38
+ t.integer "emp_no", null: false, unsigned: true
39
39
  t.integer "club_id", null: false, unsigned: true
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
44
  create_table "employees", primary_key: "emp_no", force: :cascade do |t|
45
- t.date "birth_date", null: false
45
+ t.date "birth_date", null: false
46
46
  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
47
+ t.string "last_name", limit: 16, null: false
48
+ t.string "gender", limit: 1, null: false
49
+ t.date "hire_date", null: false
50
50
  end
51
51
 
52
52
  create_table "salaries", id: false, force: :cascade do |t|
53
- t.integer "emp_no", null: false
54
- t.integer "salary", null: false
53
+ t.integer "emp_no", null: false
54
+ t.integer "salary", null: false
55
55
  t.date "from_date", null: false
56
- t.date "to_date", null: false
56
+ t.date "to_date", null: false
57
57
  end
58
58
 
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", null: false
63
- t.string "title", limit: 50, null: false
64
- t.date "from_date", null: false
62
+ t.integer "emp_no", null: false
63
+ t.string "title", limit: 50, null: false
64
+ t.date "from_date", null: false
65
65
  t.date "to_date"
66
66
  end
67
67
 
@@ -84,53 +84,53 @@ describe 'Ridgepole::Client.diff' do
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", null: false
88
- t.string "dept_no", limit: 4, null: false
89
- t.date "from_date", null: false
90
- t.date "to_date", null: false
87
+ t.integer "emp_no", null: false
88
+ t.string "dept_no", limit: 4, null: false
89
+ t.date "from_date", null: false
90
+ t.date "to_date", null: false
91
91
  end
92
92
 
93
93
  add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree
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", limit: 4, null: false
98
- t.integer "emp_no", null: false
99
- t.date "from_date", null: false
100
- t.date "to_date", null: false
97
+ t.string "dept_no", limit: 4, null: false
98
+ t.integer "emp_no", null: false
99
+ t.date "from_date", null: false
100
+ t.date "to_date", null: false
101
101
  end
102
102
 
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
106
  create_table "employee_clubs", force: :cascade do |t|
107
- t.integer "emp_no", unsigned: true, null: false
107
+ t.integer "emp_no", unsigned: true, null: false
108
108
  t.integer "club_id", unsigned: false, null: true
109
109
  end
110
110
 
111
111
  add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
112
112
 
113
113
  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
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
119
119
  end
120
120
 
121
121
  create_table "salaries", id: false, force: :cascade do |t|
122
- t.integer "emp_no", null: false
123
- t.integer "salary", null: false
122
+ t.integer "emp_no", null: false
123
+ t.integer "salary", null: false
124
124
  t.date "from_date", null: false
125
- t.date "to_date", null: false
125
+ t.date "to_date", null: false
126
126
  end
127
127
 
128
128
  add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
129
129
 
130
130
  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
131
+ t.integer "emp_no", null: false
132
+ t.string "title", limit: 50, null: false
133
+ t.date "from_date", null: false
134
134
  t.date "to_date"
135
135
  end
136
136
 
@@ -149,8 +149,8 @@ describe 'Ridgepole::Client.diff' do
149
149
  expect(delta.script).to match_fuzzy erbh(<<-EOS)
150
150
  change_column("employee_clubs", "club_id", :integer, <%= {:unsigned=>false, :null=>true, :default=>nil} + cond(5.1, comment: nil) %>)
151
151
 
152
- change_column("employees", "last_name", :string, <%= {:limit=>20, :default=>"XXX"} + cond(5.1, comment: nil) %>)
153
- change_column("employees", "gender", :string, <%= {:limit=>2, :null=>false, :default=>nil} + cond(5.1, comment: nil) %>)
152
+ change_column("employees", "last_name", :string, <%= {:limit=>20, :default=>"XXX", :unsigned=>false} + cond(5.1, comment: nil) %>)
153
+ change_column("employees", "gender", :string, <%= {:limit=>2, :null=>false, :default=>nil, :unsigned=>false} + cond(5.1, comment: nil) %>)
154
154
  EOS
155
155
  }
156
156
  end