ridgepole 0.7.0.alpha → 0.7.0.alpha2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (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/text_blob_types/text_blob_types_spec.rb CHANGED
@@ -24,16 +24,16 @@ describe 'Ridgepole::Client (with new text/blob types)' do
24
24
 
25
25
  expect(subject.dump).to match_fuzzy erbh(<<-EOS)
26
26
  create_table "foos", force: :cascade do |t|
27
- t.binary "blob", <%= i cond('5.0', limit: 65535) %>
28
- t.blob "tiny_blob", limit: 255
29
- t.binary "medium_blob", limit: 16777215
30
- t.binary "long_blob", limit: 4294967295
31
- t.text "tiny_text", limit: 255
32
- t.text "medium_text", limit: 16777215
33
- t.text "long_text", limit: 4294967295
27
+ t.binary "blob", <%= i cond(5.0, limit: 65535) %>
28
+ t.blob "tiny_blob", limit: 255
29
+ t.binary "medium_blob", limit: 16777215
30
+ t.binary "long_blob", limit: 4294967295
31
+ t.text "tiny_text", limit: 255
32
+ t.text "medium_text", limit: 16777215
33
+ t.text "long_text", limit: 4294967295
34
34
  t.decimal "unsigned_decimal", precision: 10, unsigned: true
35
- t.float "unsigned_float", limit: 24, unsigned: true
36
- t.bigint "unsigned_bigint", unsigned: true
35
+ t.float "unsigned_float", limit: 24, unsigned: true
36
+ t.bigint "unsigned_bigint", unsigned: true
37
37
  t.integer "unsigned_integer", unsigned: true
38
38
  end
39
39
  EOS
data/spec/mysql/~default_name_fk/migrate_change_fk_spec.rb CHANGED
@@ -2,46 +2,43 @@ describe 'Ridgepole::Client#diff -> migrate' do
2
2
  context 'when change fk' do
3
3
  let(:actual_dsl) {
4
4
  erbh(<<-EOS)
5
- create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
6
- end
7
-
8
- create_table "child", force: :cascade do |t|
9
- t.integer "parent_id"
10
- end
5
+ create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
6
+ end
11
7
 
12
- <%= add_index "child", ["parent_id"], {name: "par_id"} + cond('5.0', using: :btree) %>
8
+ create_table "child", force: :cascade do |t|
9
+ t.integer "parent_id"
10
+ t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
11
+ end
13
12
 
14
- add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc", on_delete: :cascade
13
+ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc", on_delete: :cascade
15
14
  EOS
16
15
  }
17
16
 
18
17
  let(:sorted_actual_dsl) {
19
18
  erbh(<<-EOS)
20
- create_table "child", force: :cascade do |t|
21
- t.integer "parent_id", <%= i limit(4) %>
22
- end
19
+ create_table "child", force: :cascade do |t|
20
+ t.integer "parent_id"
21
+ t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
22
+ end
23
23
 
24
- <%= add_index "child", ["parent_id"], {name: "par_id"} + cond('5.0', using: :btree) %>
24
+ create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
25
+ end
25
26
 
26
- create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
27
- end
28
-
29
- add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc", on_delete: :cascade
27
+ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc", on_delete: :cascade
30
28
  EOS
31
29
  }
32
30
 
33
31
  let(:expected_dsl) {
34
32
  erbh(<<-EOS)
35
- create_table "child", force: :cascade do |t|
36
- t.integer "parent_id", <%= i limit(4) %>
37
- end
33
+ create_table "child", force: :cascade do |t|
34
+ t.integer "parent_id"
35
+ t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
36
+ end
38
37
 
39
- <%= add_index "child", ["parent_id"], {name: "par_id"} + cond('5.0', using: :btree) %>
40
-
41
- create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
42
- end
38
+ create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
39
+ end
43
40
 
44
- add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
41
+ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
45
42
  EOS
46
43
  }
47
44
 
data/spec/mysql/~default_name_fk/migrate_create_fk_spec.rb CHANGED
@@ -2,21 +2,19 @@ describe 'Ridgepole::Client#diff -> migrate' do
2
2
  context 'when create fk' do
3
3
  let(:actual_dsl) {
4
4
  erbh(<<-EOS)
5
- create_table "child", <%= i unsigned(true) + {force: :cascade} %> do |t|
6
- t.integer "parent_id", <%= i limit(4) + unsigned(true) %>
7
- end
8
-
9
- <%= add_index "child", ["parent_id"], {name: "par_id"} + cond('5.0', using: :btree) %>
5
+ create_table "child", force: :cascade do |t|
6
+ t.integer "parent_id"
7
+ t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
8
+ end
10
9
 
11
- create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
12
- end
10
+ create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
11
+ end
13
12
  EOS
14
13
  }
15
14
 
16
15
  let(:expected_dsl) {
17
16
  actual_dsl + (<<-EOS)
18
-
19
- add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
17
+ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
20
18
  EOS
21
19
  }
22
20
 
@@ -54,33 +52,30 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
54
52
  context 'when create fk when create table' do
55
53
  let(:dsl) {
56
54
  erbh(<<-EOS)
57
- # Define parent before child
58
- create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
59
- end
55
+ # Define parent before child
56
+ create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
57
+ end
60
58
 
61
- create_table "child", force: :cascade do |t|
62
- t.integer "parent_id"
63
- end
64
-
65
- <%= add_index "child", ["parent_id"], {name: "par_id"} + cond('5.0', using: :btree) %>
59
+ create_table "child", force: :cascade do |t|
60
+ t.integer "parent_id"
61
+ t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
62
+ end
66
63
 
67
- add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
64
+ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
68
65
  EOS
69
66
  }
70
67
 
71
68
  let(:sorted_dsl) {
72
69
  erbh(<<-EOS)
70
+ create_table "child", force: :cascade do |t|
71
+ t.integer "parent_id"
72
+ t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
73
+ end
73
74
 
74
- create_table "child", force: :cascade do |t|
75
- t.integer "parent_id", <%= i limit(4) %>
76
- end
77
-
78
- <%= add_index "child", ["parent_id"], {name: "par_id"} + cond('5.0', using: :btree) %>
75
+ create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
76
+ end
79
77
 
80
- create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
81
- end
82
-
83
- add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
78
+ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
84
79
  EOS
85
80
  }
86
81
 
@@ -98,19 +93,18 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
98
93
  context 'already defined' do
99
94
  let(:dsl) {
100
95
  erbh(<<-EOS)
101
- # Define parent before child
102
- create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
103
- end
104
-
105
- create_table "child", force: :cascade do |t|
106
- t.integer "parent_id", unsigned: true
107
- end
96
+ # Define parent before child
97
+ create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
98
+ end
108
99
 
109
- <%= add_index "child", ["parent_id"], {name: "par_id"} + cond('5.0', using: :btree) %>
100
+ create_table "child", force: :cascade do |t|
101
+ t.integer "parent_id", unsigned: true
102
+ t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
103
+ end
110
104
 
111
- add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
105
+ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
112
106
 
113
- add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
107
+ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
114
108
  EOS
115
109
  }
116
110
 
@@ -123,40 +117,14 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
123
117
  }
124
118
  end
125
119
 
126
- context 'no name' do
127
- let(:dsl) {
128
- erbh(<<-EOS)
129
- # Define parent before child
130
- create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
131
- end
132
-
133
- create_table "child", force: :cascade do |t|
134
- t.integer "parent_id", unsigned: true
135
- end
136
-
137
- <%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
138
-
139
- add_foreign_key "child", "parent"
140
- EOS
141
- }
142
-
143
- subject { client(dump_with_default_fk_name: true) }
144
-
145
- it {
146
- expect {
147
- subject.diff(dsl)
148
- }.to raise_error('Foreign key name in `child` is undefined')
149
- }
150
- end
151
-
152
120
  context 'orphan fk' do
153
121
  let(:dsl) {
154
122
  erbh(<<-EOS)
155
- # Define parent before child
156
- create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
157
- end
123
+ # Define parent before child
124
+ create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
125
+ end
158
126
 
159
- add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
127
+ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
160
128
  EOS
161
129
  }
162
130
 
data/spec/mysql/~default_name_fk/migrate_drop_fk_spec.rb CHANGED
@@ -2,36 +2,33 @@ describe 'Ridgepole::Client#diff -> migrate' do
2
2
  context 'when drop fk' do
3
3
  let(:actual_dsl) {
4
4
  erbh(<<-EOS)
5
- create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
6
- end
7
-
8
- create_table "child", force: :cascade do |t|
9
- t.integer "parent_id"
10
- end
5
+ create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
6
+ end
11
7
 
12
- <%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
8
+ create_table "child", force: :cascade do |t|
9
+ t.integer "parent_id"
10
+ t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
11
+ end
13
12
 
14
- add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
13
+ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
15
14
  EOS
16
15
  }
17
16
 
18
17
  let(:sorted_actual_dsl) {
19
18
  expected_dsl + (<<-EOS)
20
-
21
- add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
19
+ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
22
20
  EOS
23
21
  }
24
22
 
25
23
  let(:expected_dsl) {
26
24
  erbh(<<-EOS)
27
- create_table "child", force: :cascade do |t|
28
- t.integer "parent_id", <%= i limit(4) %>
29
- end
30
-
31
- <%= add_index "child", ["parent_id"], {name: "par_id"} + cond('5.0', using: :btree) %>
25
+ create_table "child", force: :cascade do |t|
26
+ t.integer "parent_id"
27
+ t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
28
+ end
32
29
 
33
- create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
34
- end
30
+ create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
31
+ end
35
32
  EOS
36
33
  }
37
34
 
@@ -69,32 +66,29 @@ end
69
66
  context 'when drop fk when drop table' do
70
67
  let(:dsl) {
71
68
  erbh(<<-EOS)
72
- create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
73
- end
74
-
75
-
76
- create_table "child", force: :cascade do |t|
77
- t.integer "parent_id"
78
- end
69
+ create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
70
+ end
79
71
 
80
- <%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
72
+ create_table "child", force: :cascade do |t|
73
+ t.integer "parent_id"
74
+ t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
75
+ end
81
76
 
82
- add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
77
+ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
83
78
  EOS
84
79
  }
85
80
 
86
81
  let(:sorted_dsl) {
87
82
  erbh(<<-EOS)
88
- create_table "child", force: :cascade do |t|
89
- t.integer "parent_id", <%= i limit(4) %>
90
- end
91
-
92
- <%= add_index "child", ["parent_id"], {name: "par_id"} + cond('5.0', using: :btree) %>
83
+ create_table "child", force: :cascade do |t|
84
+ t.integer "parent_id"
85
+ t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
86
+ end
93
87
 
94
- create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
95
- end
88
+ create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
89
+ end
96
90
 
97
- add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
91
+ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
98
92
  EOS
99
93
  }
100
94
 
data/spec/postgresql/diff/diff_spec.rb CHANGED
@@ -19,52 +19,52 @@ describe 'Ridgepole::Client.diff' do
19
19
  add_index "departments", ["dept_name"], name: "idx_dept_name", unique: true, using: :btree
20
20
 
21
21
  create_table "dept_emp", id: false, force: :cascade do |t|
22
- t.integer "emp_no", null: false
23
- t.string "dept_no", limit: 4, null: false
24
- t.date "from_date", null: false
25
- t.date "to_date", null: false
22
+ t.integer "emp_no", null: false
23
+ t.string "dept_no", limit: 4, null: false
24
+ t.date "from_date", null: false
25
+ t.date "to_date", null: false
26
26
  end
27
27
 
28
28
  add_index "dept_emp", ["dept_no"], name: "idx_dept_emp_dept_no", using: :btree
29
29
  add_index "dept_emp", ["emp_no"], name: "idx_dept_emp_emp_no", using: :btree
30
30
 
31
31
  create_table "dept_manager", id: false, force: :cascade do |t|
32
- t.string "dept_no", limit: 4, null: false
33
- t.integer "emp_no", null: false
34
- t.date "from_date", null: false
35
- t.date "to_date", null: false
32
+ t.string "dept_no", limit: 4, null: false
33
+ t.integer "emp_no", null: false
34
+ t.date "from_date", null: false
35
+ t.date "to_date", null: false
36
36
  end
37
37
 
38
38
  add_index "dept_manager", ["dept_no"], name: "idx_dept_manager_dept_no", using: :btree
39
39
  add_index "dept_manager", ["emp_no"], name: "idx_dept_manager_emp_no", using: :btree
40
40
 
41
41
  create_table "employee_clubs", force: :cascade do |t|
42
- t.integer "emp_no", null: false
42
+ t.integer "emp_no", null: false
43
43
  t.integer "club_id", null: false
44
44
  end
45
45
 
46
46
  add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id", using: :btree
47
47
 
48
48
  create_table "employees", primary_key: "emp_no", force: :cascade do |t|
49
- t.date "birth_date", null: false
49
+ t.date "birth_date", null: false
50
50
  t.string "first_name", limit: 14, null: false
51
- t.string "last_name", limit: 16, null: false
52
- t.date "hire_date", null: false
51
+ t.string "last_name", limit: 16, null: false
52
+ t.date "hire_date", null: false
53
53
  end
54
54
 
55
55
  create_table "salaries", id: false, force: :cascade do |t|
56
- t.integer "emp_no", null: false
57
- t.integer "salary", null: false
56
+ t.integer "emp_no", null: false
57
+ t.integer "salary", null: false
58
58
  t.date "from_date", null: false
59
- t.date "to_date", null: false
59
+ t.date "to_date", null: false
60
60
  end
61
61
 
62
62
  add_index "salaries", ["emp_no"], name: "idx_salaries_emp_no", using: :btree
63
63
 
64
64
  create_table "titles", id: false, force: :cascade do |t|
65
- t.integer "emp_no", null: false
66
- t.string "title", limit: 50, null: false
67
- t.date "from_date", null: false
65
+ t.integer "emp_no", null: false
66
+ t.string "title", limit: 50, null: false
67
+ t.date "from_date", null: false
68
68
  t.date "to_date"
69
69
  end
70
70
 
@@ -87,52 +87,52 @@ describe 'Ridgepole::Client.diff' do
87
87
  add_index "departments", ["dept_name"], name: "idx_dept_name", unique: true, using: :btree
88
88
 
89
89
  create_table "dept_emp", id: false, force: :cascade do |t|
90
- t.integer "emp_no", null: false
91
- t.string "dept_no", limit: 4, null: false
92
- t.date "from_date", null: false
93
- t.date "to_date", null: false
90
+ t.integer "emp_no", null: false
91
+ t.string "dept_no", limit: 4, null: false
92
+ t.date "from_date", null: false
93
+ t.date "to_date", null: false
94
94
  end
95
95
 
96
96
  add_index "dept_emp", ["dept_no"], name: "idx_dept_emp_dept_no", using: :btree
97
97
  add_index "dept_emp", ["emp_no"], name: "idx_dept_emp_emp_no", using: :btree
98
98
 
99
99
  create_table "dept_manager", id: false, force: :cascade do |t|
100
- t.string "dept_no", limit: 4, null: false
101
- t.integer "emp_no", null: false
102
- t.date "from_date", null: false
103
- t.date "to_date", null: false
100
+ t.string "dept_no", limit: 4, null: false
101
+ t.integer "emp_no", null: false
102
+ t.date "from_date", null: false
103
+ t.date "to_date", null: false
104
104
  end
105
105
 
106
106
  add_index "dept_manager", ["dept_no"], name: "idx_dept_manager_dept_no", using: :btree
107
107
  add_index "dept_manager", ["emp_no"], name: "idx_dept_manager_emp_no", using: :btree
108
108
 
109
109
  create_table "employee_clubs", force: :cascade do |t|
110
- t.integer "emp_no", null: false
110
+ t.integer "emp_no", null: false
111
111
  t.integer "club_id", null: true
112
112
  end
113
113
 
114
114
  add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id", using: :btree
115
115
 
116
116
  create_table "employees", primary_key: "emp_no", force: :cascade do |t|
117
- t.date "birth_date", null: false
118
- t.string "first_name", limit: 14, null: false
119
- t.string "last_name", limit: 20, default: "XXX", null: false
120
- t.date "hire_date", null: false
117
+ t.date "birth_date", null: false
118
+ t.string "first_name", limit: 14, null: false
119
+ t.string "last_name", limit: 20, default: "XXX", null: false
120
+ t.date "hire_date", null: false
121
121
  end
122
122
 
123
123
  create_table "salaries", id: false, force: :cascade do |t|
124
- t.integer "emp_no", null: false
125
- t.integer "salary", null: false
124
+ t.integer "emp_no", null: false
125
+ t.integer "salary", null: false
126
126
  t.date "from_date", null: false
127
- t.date "to_date", null: false
127
+ t.date "to_date", null: false
128
128
  end
129
129
 
130
130
  add_index "salaries", ["emp_no"], name: "idx_salaries_emp_no", using: :btree
131
131
 
132
132
  create_table "titles", id: false, force: :cascade do |t|
133
- t.integer "emp_no", null: false
134
- t.string "title", limit: 50, null: false
135
- t.date "from_date", null: false
133
+ t.integer "emp_no", null: false
134
+ t.string "title", limit: 50, null: false
135
+ t.date "from_date", null: false
136
136
  t.date "to_date"
137
137
  end
138
138