ridgepole 0.9.4 → 1.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (156) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +1 -1
  3. data/.simplecov +1 -1
  4. data/Appraisals +4 -0
  5. data/CHANGELOG.md +246 -0
  6. data/README.md +20 -151
  7. data/bin/ridgepole +83 -85
  8. data/docker-compose.yml +26 -18
  9. data/gemfiles/activerecord_7.0.gemfile +7 -0
  10. data/lib/ridgepole/delta.rb +1 -1
  11. data/lib/ridgepole/diff.rb +4 -1
  12. data/lib/ridgepole/execute_expander.rb +4 -1
  13. data/lib/ridgepole/ext/abstract_adapter/disable_table_options.rb +1 -0
  14. data/lib/ridgepole/external_sql_executer.rb +11 -13
  15. data/lib/ridgepole/version.rb +1 -1
  16. data/ridgepole.gemspec +11 -7
  17. metadata +16 -289
  18. data/.github/workflows/test.yml +0 -70
  19. data/.gitignore +0 -25
  20. data/spec/cli_helper.rb +0 -65
  21. data/spec/dsl_parser/context_spec.rb +0 -16
  22. data/spec/erb_helper.rb +0 -26
  23. data/spec/fixtures/for_require_relative_spec.rb +0 -3
  24. data/spec/hide_pending_formatter.rb +0 -9
  25. data/spec/mysql/_migrate/migrate_change_table_option_spec.rb +0 -40
  26. data/spec/mysql/bigint_pk/int_pk_spec.rb +0 -47
  27. data/spec/mysql/cli/config_spec.rb +0 -210
  28. data/spec/mysql/cli/ridgepole_spec.rb +0 -447
  29. data/spec/mysql/collation/collation_spec.rb +0 -153
  30. data/spec/mysql/comment/comment_spec.rb +0 -179
  31. data/spec/mysql/default_lambda/default_lambda_spec.rb +0 -164
  32. data/spec/mysql/diff/diff2_spec.rb +0 -189
  33. data/spec/mysql/diff/diff_spec.rb +0 -168
  34. data/spec/mysql/dump/dump_class_method_spec.rb +0 -74
  35. data/spec/mysql/dump/dump_some_tables_spec.rb +0 -70
  36. data/spec/mysql/dump/dump_spec.rb +0 -74
  37. data/spec/mysql/dump/dump_unknown_column_type_spec.rb +0 -28
  38. data/spec/mysql/dump/dump_without_table_options_spec.rb +0 -34
  39. data/spec/mysql/fk/migrate_change_fk2_spec.rb +0 -47
  40. data/spec/mysql/fk/migrate_change_fk_spec.rb +0 -265
  41. data/spec/mysql/fk/migrate_create_fk_spec.rb +0 -349
  42. data/spec/mysql/fk/migrate_drop_fk_spec.rb +0 -331
  43. data/spec/mysql/fk/migrate_fk_with_column_spec.rb +0 -163
  44. data/spec/mysql/fk/migrate_ignore_fk_spec.rb +0 -70
  45. data/spec/mysql/migrate/check_orphan_index_spec.rb +0 -83
  46. data/spec/mysql/migrate/migrate_add_column2_spec.rb +0 -159
  47. data/spec/mysql/migrate/migrate_add_column_order_spec.rb +0 -242
  48. data/spec/mysql/migrate/migrate_add_column_spec.rb +0 -161
  49. data/spec/mysql/migrate/migrate_add_column_with_alter_extra_spec.rb +0 -276
  50. data/spec/mysql/migrate/migrate_add_column_with_script_spec.rb +0 -152
  51. data/spec/mysql/migrate/migrate_change_column2_spec.rb +0 -91
  52. data/spec/mysql/migrate/migrate_change_column3_spec.rb +0 -404
  53. data/spec/mysql/migrate/migrate_change_column4_spec.rb +0 -83
  54. data/spec/mysql/migrate/migrate_change_column5_spec.rb +0 -129
  55. data/spec/mysql/migrate/migrate_change_column6_spec.rb +0 -241
  56. data/spec/mysql/migrate/migrate_change_column7_spec.rb +0 -34
  57. data/spec/mysql/migrate/migrate_change_column8_spec.rb +0 -87
  58. data/spec/mysql/migrate/migrate_change_column_default_spec.rb +0 -199
  59. data/spec/mysql/migrate/migrate_change_column_float_spec.rb +0 -75
  60. data/spec/mysql/migrate/migrate_change_column_spec.rb +0 -158
  61. data/spec/mysql/migrate/migrate_change_index2_spec.rb +0 -86
  62. data/spec/mysql/migrate/migrate_change_index3_spec.rb +0 -179
  63. data/spec/mysql/migrate/migrate_change_index4_spec.rb +0 -112
  64. data/spec/mysql/migrate/migrate_change_index5_spec.rb +0 -74
  65. data/spec/mysql/migrate/migrate_change_index6_spec.rb +0 -202
  66. data/spec/mysql/migrate/migrate_change_index7_spec.rb +0 -85
  67. data/spec/mysql/migrate/migrate_change_index8_spec.rb +0 -85
  68. data/spec/mysql/migrate/migrate_change_index_spec.rb +0 -235
  69. data/spec/mysql/migrate/migrate_change_table_comment_spec.rb +0 -72
  70. data/spec/mysql/migrate/migrate_change_table_option_spec.rb +0 -83
  71. data/spec/mysql/migrate/migrate_check_relation_column_type_spec.rb +0 -225
  72. data/spec/mysql/migrate/migrate_create_index2_spec.rb +0 -203
  73. data/spec/mysql/migrate/migrate_create_index_spec.rb +0 -220
  74. data/spec/mysql/migrate/migrate_create_table_spec.rb +0 -123
  75. data/spec/mysql/migrate/migrate_create_table_with_ignore_spec.rb +0 -45
  76. data/spec/mysql/migrate/migrate_create_table_with_index_spec.rb +0 -43
  77. data/spec/mysql/migrate/migrate_create_table_with_options_spec.rb +0 -59
  78. data/spec/mysql/migrate/migrate_create_table_with_script_spec.rb +0 -132
  79. data/spec/mysql/migrate/migrate_drop_column_and_index2_spec.rb +0 -140
  80. data/spec/mysql/migrate/migrate_drop_column_and_index_spec.rb +0 -167
  81. data/spec/mysql/migrate/migrate_drop_column_and_unique_index_spec.rb +0 -52
  82. data/spec/mysql/migrate/migrate_drop_column_spec.rb +0 -158
  83. data/spec/mysql/migrate/migrate_drop_index_spec.rb +0 -160
  84. data/spec/mysql/migrate/migrate_drop_table_spec.rb +0 -123
  85. data/spec/mysql/migrate/migrate_duplicate_index_spec.rb +0 -27
  86. data/spec/mysql/migrate/migrate_duplicate_table_spec.rb +0 -37
  87. data/spec/mysql/migrate/migrate_empty_spec.rb +0 -78
  88. data/spec/mysql/migrate/migrate_execute_spec.rb +0 -288
  89. data/spec/mysql/migrate/migrate_ignore_column_spec.rb +0 -98
  90. data/spec/mysql/migrate/migrate_ignore_index_spec.rb +0 -92
  91. data/spec/mysql/migrate/migrate_log_file_spec.rb +0 -125
  92. data/spec/mysql/migrate/migrate_merge_mode_spec.rb +0 -145
  93. data/spec/mysql/migrate/migrate_noop_spec.rb +0 -234
  94. data/spec/mysql/migrate/migrate_primary_key_spec.rb +0 -104
  95. data/spec/mysql/migrate/migrate_rename_column_spec.rb +0 -184
  96. data/spec/mysql/migrate/migrate_rename_table_spec.rb +0 -241
  97. data/spec/mysql/migrate/migrate_same_default_null_spec.rb +0 -77
  98. data/spec/mysql/migrate/migrate_same_spec.rb +0 -82
  99. data/spec/mysql/migrate/migrate_script_error_spec.rb +0 -91
  100. data/spec/mysql/migrate/migrate_skip_column_comment_change_spec.rb +0 -39
  101. data/spec/mysql/migrate/migrate_skip_drop_table_spec.rb +0 -145
  102. data/spec/mysql/migrate/migrate_skip_rename_column_spec.rb +0 -140
  103. data/spec/mysql/migrate/migrate_skip_rename_table_spec.rb +0 -141
  104. data/spec/mysql/migrate/migrate_with_ignore_tables_spec.rb +0 -307
  105. data/spec/mysql/migrate/migrate_with_pre_post_query_spec.rb +0 -153
  106. data/spec/mysql/migrate/migrate_with_tables_spec.rb +0 -149
  107. data/spec/mysql/migrate/migrate_with_verbose_log_spec.rb +0 -60
  108. data/spec/mysql/ridgepole_test_database.sql +0 -2
  109. data/spec/mysql/ridgepole_test_tables.sql +0 -79
  110. data/spec/mysql/ridgepole_test_tables_unknown_column_type.sql +0 -17
  111. data/spec/mysql/text_blob_types/text_blob_types_spec.rb +0 -131
  112. data/spec/mysql/~default_name_fk/migrate_change_fk_spec.rb +0 -59
  113. data/spec/mysql/~default_name_fk/migrate_create_fk_spec.rb +0 -133
  114. data/spec/mysql/~default_name_fk/migrate_drop_fk_spec.rb +0 -100
  115. data/spec/mysql/~dump_auto_increment/migrate_create_table_with_index_spec.rb +0 -43
  116. data/spec/mysql57/json/add_json_column_spec.rb +0 -35
  117. data/spec/mysql57/json/change_json_column_spec.rb +0 -102
  118. data/spec/mysql57/json/drop_json_column_spec.rb +0 -35
  119. data/spec/mysql57/virtual/add_virtual_column_spec.rb +0 -37
  120. data/spec/mysql57/virtual/change_virtual_column_spec.rb +0 -40
  121. data/spec/mysql57/virtual/drop_virtual_column_spec.rb +0 -37
  122. data/spec/postgresql/diff/diff_spec.rb +0 -216
  123. data/spec/postgresql/dump/dump_spec.rb +0 -69
  124. data/spec/postgresql/fk/migrate_change_fk_spec.rb +0 -115
  125. data/spec/postgresql/fk/migrate_create_fk_spec.rb +0 -176
  126. data/spec/postgresql/fk/migrate_drop_fk_spec.rb +0 -197
  127. data/spec/postgresql/migrate/migrate_add_column_spec.rb +0 -203
  128. data/spec/postgresql/migrate/migrate_add_expression_index_spec.rb +0 -25
  129. data/spec/postgresql/migrate/migrate_bigint_spec.rb +0 -53
  130. data/spec/postgresql/migrate/migrate_change_column_default_spec.rb +0 -38
  131. data/spec/postgresql/migrate/migrate_change_column_spec.rb +0 -185
  132. data/spec/postgresql/migrate/migrate_change_index_spec.rb +0 -164
  133. data/spec/postgresql/migrate/migrate_check_relation_column_type_spec.rb +0 -114
  134. data/spec/postgresql/migrate/migrate_create_table_spec.rb +0 -120
  135. data/spec/postgresql/migrate/migrate_create_table_with_default_proc_spec.rb +0 -112
  136. data/spec/postgresql/migrate/migrate_drop_column_spec.rb +0 -163
  137. data/spec/postgresql/migrate/migrate_drop_column_with_index_spec.rb +0 -166
  138. data/spec/postgresql/migrate/migrate_drop_expression_index_spec.rb +0 -59
  139. data/spec/postgresql/migrate/migrate_drop_index_spec.rb +0 -158
  140. data/spec/postgresql/migrate/migrate_drop_table_spec.rb +0 -122
  141. data/spec/postgresql/migrate/migrate_ext_cols_spec.rb +0 -64
  142. data/spec/postgresql/migrate/migrate_primary_key2_spec.rb +0 -73
  143. data/spec/postgresql/migrate/migrate_primary_key_spec.rb +0 -99
  144. data/spec/postgresql/migrate/migrate_references_spec.rb +0 -90
  145. data/spec/postgresql/migrate/migrate_rename_column_spec.rb +0 -155
  146. data/spec/postgresql/migrate/migrate_rename_table_spec.rb +0 -175
  147. data/spec/postgresql/migrate/migrate_same_spec.rb +0 -77
  148. data/spec/postgresql/ridgepole_test_database.sql +0 -16
  149. data/spec/postgresql/ridgepole_test_tables.sql +0 -75
  150. data/spec/postgresql/~default_name_fk/migrate_change_fk_spec.rb +0 -59
  151. data/spec/postgresql/~default_name_fk/migrate_create_fk_spec.rb +0 -134
  152. data/spec/postgresql/~default_name_fk/migrate_drop_fk_spec.rb +0 -100
  153. data/spec/processing_for_ci.rb +0 -13
  154. data/spec/spec_condition.rb +0 -58
  155. data/spec/spec_const.rb +0 -20
  156. data/spec/spec_helper.rb +0 -173
data/bin/ridgepole CHANGED
@@ -74,106 +74,104 @@ def noop_migrate(delta, options)
74
74
  end
75
75
 
76
76
  ARGV.options do |opt|
77
- begin
78
- opt.on('-c', '--config CONF_OR_FILE') { |v| config = v }
79
- opt.on('-E', '--env ENVIRONMENT') { |v| env = v }
80
- opt.on('-s', '--spec-name SPEC_NAME') { |v| spec_name = v }
81
- opt.on('-a', '--apply') { set_mode[:apply] }
82
- opt.on('-m', '--merge') do
83
- set_mode[:apply]
84
- options[:merge] = true
77
+ opt.on('-c', '--config CONF_OR_FILE') { |v| config = v }
78
+ opt.on('-E', '--env ENVIRONMENT') { |v| env = v }
79
+ opt.on('-s', '--spec-name SPEC_NAME') { |v| spec_name = v }
80
+ opt.on('-a', '--apply') { set_mode[:apply] }
81
+ opt.on('-m', '--merge') do
82
+ set_mode[:apply]
83
+ options[:merge] = true
84
+ end
85
+ opt.on('-f', '--file SCHEMAFILE') { |v| file = v }
86
+ opt.on('', '--dry-run') { options[:dry_run] = true }
87
+ opt.on('', '--table-options OPTIONS') { |v| options[:table_options] = v }
88
+ opt.on('', '--table-hash-options OPTIONS') do |v|
89
+ # NOTE: Ruby2.4 doesn't support `symbolize_names: true`
90
+ hash = YAML.safe_load(v).deep_symbolize_keys
91
+
92
+ case hash[:id]
93
+ when String
94
+ hash[:id] = hash[:id].to_sym
95
+ when Hash
96
+ hash[:id][:type] = hash[:id][:type].to_sym if hash[:id][:type]
85
97
  end
86
- opt.on('-f', '--file SCHEMAFILE') { |v| file = v }
87
- opt.on('', '--dry-run') { options[:dry_run] = true }
88
- opt.on('', '--table-options OPTIONS') { |v| options[:table_options] = v }
89
- opt.on('', '--table-hash-options OPTIONS') do |v|
90
- # NOTE: Ruby2.4 doesn't support `symbolize_names: true`
91
- hash = YAML.safe_load(v).deep_symbolize_keys
92
-
93
- case hash[:id]
94
- when String
95
- hash[:id] = hash[:id].to_sym
96
- when Hash
97
- hash[:id][:type] = hash[:id][:type].to_sym if hash[:id][:type]
98
- end
99
98
 
100
- options[:table_hash_options] = hash
101
- end
102
- opt.on('', '--alter-extra ALTER_SPEC') { |v| options[:alter_extra] = v }
103
- opt.on('', '--external-script SCRIPT') { |v| options[:external_script] = v }
104
- opt.on('', '--bulk-change') do
105
- raise OptionParser::InvalidOption, 'Cannot use `bulk-change` in `merge`' if options[:merge]
99
+ options[:table_hash_options] = hash
100
+ end
101
+ opt.on('', '--alter-extra ALTER_SPEC') { |v| options[:alter_extra] = v }
102
+ opt.on('', '--external-script SCRIPT') { |v| options[:external_script] = v }
103
+ opt.on('', '--bulk-change') do
104
+ raise OptionParser::InvalidOption, 'Cannot use `bulk-change` in `merge`' if options[:merge]
106
105
 
107
- options[:bulk_change] = true
108
- end
106
+ options[:bulk_change] = true
107
+ end
109
108
 
110
- COLUMN_TYPES.each do |column_type, column_type_alias|
111
- opt.on('', "--default-#{column_type_alias}-limit LIMIT", Integer) do |v|
112
- options[:"default_#{column_type}_limit"] = v
113
- end
109
+ COLUMN_TYPES.each do |column_type, column_type_alias|
110
+ opt.on('', "--default-#{column_type_alias}-limit LIMIT", Integer) do |v|
111
+ options[:"default_#{column_type}_limit"] = v
114
112
  end
113
+ end
115
114
 
116
- opt.on('', '--pre-query QUERY') { |v| options[:pre_query] = v }
117
- opt.on('', '--post-query QUERY') { |v| options[:post_query] = v }
118
- opt.on('-e', '--export') { set_mode[:export] }
119
- opt.on('', '--split') { split = true }
120
- opt.on('', '--split-with-dir') { split = :with_dir }
121
- opt.on('-d', '--diff DSL1 DSL2') do |diff_arg1|
122
- set_mode[:diff]
123
- diff_arg2 = ARGV.first
124
-
125
- if [diff_arg1, diff_arg2].any? { |i| i.nil? || i.start_with?('-') }
126
- puts opt.help
127
- exit 1
128
- end
115
+ opt.on('', '--pre-query QUERY') { |v| options[:pre_query] = v }
116
+ opt.on('', '--post-query QUERY') { |v| options[:post_query] = v }
117
+ opt.on('-e', '--export') { set_mode[:export] }
118
+ opt.on('', '--split') { split = true }
119
+ opt.on('', '--split-with-dir') { split = :with_dir }
120
+ opt.on('-d', '--diff DSL1 DSL2') do |diff_arg1|
121
+ set_mode[:diff]
122
+ diff_arg2 = ARGV.first
129
123
 
130
- ARGV.shift
131
- diff_files = [diff_arg1, diff_arg2]
132
- end
133
- opt.on('', '--with-apply') { diff_with_apply = true }
134
- opt.on('-o', '--output SCHEMAFILE') { |v| output_file = v }
135
- opt.on('-t', '--tables TABLES', Array) { |v| options[:tables] = v }
136
- opt.on('', '--ignore-tables REGEX_LIST', Array) { |v| options[:ignore_tables] = v.map { |i| Regexp.new(i) } }
137
- opt.on('', '--dump-without-table-options') { options[:dump_without_table_options] = true }
138
- opt.on('', '--dump-with-default-fk-name') { options[:dump_with_default_fk_name] = true }
139
- opt.on('', '--index-removed-drop-column') { options[:index_removed_drop_column] = true }
140
- opt.on('', '--skip-drop-table') { options[:skip_drop_table] = true }
141
- opt.on('', '--mysql-change-table-options') { options[:mysql_change_table_options] = true }
142
- opt.on('', '--mysql-change-table-comment') { options[:mysql_change_table_comment] = true }
143
- opt.on('', '--check-relation-type DEF_PK') { |v| options[:check_relation_type] = v }
144
- opt.on('', '--ignore-table-comment') { options[:ignore_table_comment] = true }
145
- opt.on('', '--skip-column-comment-change') { options[:skip_column_comment_change] = true }
146
- opt.on('', '--allow-pk-change') { options[:allow_pk_change] = true }
147
- opt.on('', '--create-table-with-index') { options[:create_table_with_index] = true }
148
-
149
- opt.on('', '--mysql-dump-auto-increment') do
150
- options[:mysql_dump_auto_increment] = true
124
+ if [diff_arg1, diff_arg2].any? { |i| i.nil? || i.start_with?('-') }
125
+ puts opt.help
126
+ exit 1
151
127
  end
152
128
 
153
- opt.on('-r', '--require LIBS', Array) { |v| v.each { |i| require i } }
154
- opt.on('', '--log-file LOG_FILE') { |v| options[:log_file] = v }
155
- opt.on('', '--verbose') { Ridgepole::Logger.verbose = true }
156
- opt.on('', '--debug') { options[:debug] = true }
157
- opt.on('', '--[no-]color') { |v| options[:color] = v }
158
-
159
- opt.on('-v', '--version') do
160
- puts opt.ver
161
- exit
162
- end
129
+ ARGV.shift
130
+ diff_files = [diff_arg1, diff_arg2]
131
+ end
132
+ opt.on('', '--with-apply') { diff_with_apply = true }
133
+ opt.on('-o', '--output SCHEMAFILE') { |v| output_file = v }
134
+ opt.on('-t', '--tables TABLES', Array) { |v| options[:tables] = v }
135
+ opt.on('', '--ignore-tables REGEX_LIST', Array) { |v| options[:ignore_tables] = v.map { |i| Regexp.new(i) } }
136
+ opt.on('', '--dump-without-table-options') { options[:dump_without_table_options] = true }
137
+ opt.on('', '--dump-with-default-fk-name') { options[:dump_with_default_fk_name] = true }
138
+ opt.on('', '--index-removed-drop-column') { options[:index_removed_drop_column] = true }
139
+ opt.on('', '--drop-table') { options[:force_drop_table] = true }
140
+ opt.on('', '--mysql-change-table-options') { options[:mysql_change_table_options] = true }
141
+ opt.on('', '--mysql-change-table-comment') { options[:mysql_change_table_comment] = true }
142
+ opt.on('', '--check-relation-type DEF_PK') { |v| options[:check_relation_type] = v }
143
+ opt.on('', '--ignore-table-comment') { options[:ignore_table_comment] = true }
144
+ opt.on('', '--skip-column-comment-change') { options[:skip_column_comment_change] = true }
145
+ opt.on('', '--allow-pk-change') { options[:allow_pk_change] = true }
146
+ opt.on('', '--create-table-with-index') { options[:create_table_with_index] = true }
147
+
148
+ opt.on('', '--mysql-dump-auto-increment') do
149
+ options[:mysql_dump_auto_increment] = true
150
+ end
163
151
 
164
- opt.parse!
152
+ opt.on('-r', '--require LIBS', Array) { |v| v.each { |i| require i } }
153
+ opt.on('', '--log-file LOG_FILE') { |v| options[:log_file] = v }
154
+ opt.on('', '--verbose') { Ridgepole::Logger.verbose = true }
155
+ opt.on('', '--debug') { options[:debug] = true }
156
+ opt.on('', '--[no-]color') { |v| options[:color] = v }
165
157
 
166
- if !mode || (%i[apply export].include?(mode) && !config) || (options[:with_apply] && !config)
167
- puts opt.help
168
- exit 1
169
- end
170
- rescue StandardError => e
171
- warn("[ERROR] #{e.message}")
158
+ opt.on('-v', '--version') do
159
+ puts opt.ver
160
+ exit
161
+ end
172
162
 
173
- puts "\t" + e.backtrace.join("\n\t") unless e.is_a?(OptionParser::ParseError)
163
+ opt.parse!
174
164
 
165
+ if !mode || (%i[apply export].include?(mode) && !config) || (options[:with_apply] && !config)
166
+ puts opt.help
175
167
  exit 1
176
168
  end
169
+ rescue StandardError => e
170
+ warn("[ERROR] #{e.message}")
171
+
172
+ puts "\t" + e.backtrace.join("\n\t") unless e.is_a?(OptionParser::ParseError)
173
+
174
+ exit 1
177
175
  end
178
176
 
179
177
  begin
data/docker-compose.yml CHANGED
@@ -1,18 +1,26 @@
1
- mysql:
2
- image: "mysql:5.6.38"
3
- ports:
4
- - "13316:3306"
5
- environment:
6
- MYSQL_ROOT_PASSWORD: password
7
- mysql57:
8
- image: "mysql:5.7.20"
9
- ports:
10
- - "13317:3306"
11
- environment:
12
- MYSQL_ROOT_PASSWORD: password
13
- postgres:
14
- image: "postgres:9.5"
15
- ports:
16
- - "15442:5432"
17
- environment:
18
- POSTGRES_PASSWORD: password
1
+ version: "3.8"
2
+ services:
3
+ mysql:
4
+ image: "mysql:5.6"
5
+ ports:
6
+ - "13316:3306"
7
+ environment:
8
+ MYSQL_ROOT_PASSWORD: password
9
+ mysql57:
10
+ image: "mysql:5.7"
11
+ ports:
12
+ - "13317:3306"
13
+ environment:
14
+ MYSQL_ROOT_PASSWORD: password
15
+ mysql80:
16
+ image: "mysql:8.0"
17
+ ports:
18
+ - "13318:3306"
19
+ environment:
20
+ MYSQL_ROOT_PASSWORD: password
21
+ postgres:
22
+ image: "postgres:14"
23
+ ports:
24
+ - "15442:5432"
25
+ environment:
26
+ POSTGRES_PASSWORD: password
@@ -0,0 +1,7 @@
1
+ # This file was generated by Appraisal
2
+
3
+ source "https://rubygems.org"
4
+
5
+ gem "activerecord", "~> 7.0.0"
6
+
7
+ gemspec path: "../"
@@ -191,7 +191,7 @@ module Ridgepole
191
191
  errmsg = lines.with_index.map do |l, i|
192
192
  line_num = i + 1
193
193
  prefix = line_num == err_num ? '* ' : ' '
194
- format("#{prefix}%<line_num>#{digit_number}d: #{l}", line_num: line_num)
194
+ format("#{prefix}%<line_num>#{digit_number}d: %<line>s", line_num: line_num, line: l)
195
195
  end
196
196
 
197
197
  if err_num > 0
@@ -41,7 +41,7 @@ module Ridgepole
41
41
 
42
42
  scan_relation_info(relation_info)
43
43
 
44
- unless @options[:merge] || @options[:skip_drop_table]
44
+ if !@options[:merge] && @options[:force_drop_table]
45
45
  from.each do |table_name, from_attrs|
46
46
  next unless target?(table_name)
47
47
 
@@ -419,6 +419,9 @@ module Ridgepole
419
419
  opts[:limit] = 4_294_967_295
420
420
  end
421
421
  end
422
+
423
+ # Workaround for Active Record 7.0
424
+ opts.delete(:precision) if attrs[:type] == :datetime && opts[:precision].nil?
422
425
  end
423
426
  end
424
427
 
@@ -13,7 +13,10 @@ module Ridgepole
13
13
  end
14
14
 
15
15
  module ConnectionAdapterExt
16
- def execute(sql, name = nil)
16
+ def execute(*args)
17
+ sql = args.fetch(0)
18
+ name = args[1]
19
+
17
20
  if Ridgepole::ExecuteExpander.noop
18
21
  if (callback = Ridgepole::ExecuteExpander.callback)
19
22
  sql = append_alter_extra(sql)
@@ -36,6 +36,7 @@ module ActiveRecord
36
36
  class AbstractAdapter
37
37
  def self.inherited(subclass)
38
38
  subclass.prepend Ridgepole::Ext::AbstractAdapter::DisableTableOptions
39
+ super
39
40
  end
40
41
  end
41
42
  end
@@ -25,20 +25,18 @@ module Ridgepole
25
25
  readable = ready[0]
26
26
 
27
27
  readable.each do |f|
28
- begin
29
- data = f.read_nonblock(1024)
30
- next if data.nil?
31
-
32
- data.chomp!
33
-
34
- if f == stderr
35
- @logger.warn("[WARNING] #{script_basename}: #{data}")
36
- else
37
- @logger.info("#{script_basename}: #{data}")
38
- end
39
- rescue EOFError
40
- files.delete f
28
+ data = f.read_nonblock(1024)
29
+ next if data.nil?
30
+
31
+ data.chomp!
32
+
33
+ if f == stderr
34
+ @logger.warn("[WARNING] #{script_basename}: #{data}")
35
+ else
36
+ @logger.info("#{script_basename}: #{data}")
41
37
  end
38
+ rescue EOFError
39
+ files.delete f
42
40
  end
43
41
  end
44
42
  rescue EOFError
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Ridgepole
4
- VERSION = '0.9.4'
4
+ VERSION = '1.0.1'
5
5
  end
data/ridgepole.gemspec CHANGED
@@ -8,25 +8,28 @@ Gem::Specification.new do |spec|
8
8
  spec.name = 'ridgepole'
9
9
  spec.version = Ridgepole::VERSION
10
10
  spec.authors = ['Genki Sugawara']
11
- spec.email = ['sugawara@cookpad.com']
11
+ spec.email = ['sugawara@winebarrel.jp']
12
12
  spec.summary = 'Ridgepole is a tool to manage DB schema.'
13
13
  spec.description = 'Ridgepole is a tool to manage DB schema. It defines DB schema using Rails DSL, and updates DB schema according to DSL.'
14
- spec.homepage = 'https://github.com/winebarrel/ridgepole'
14
+ spec.homepage = 'https://github.com/ridgepole/ridgepole'
15
15
  spec.license = 'MIT'
16
16
 
17
- spec.files = `git ls-files -z`.split("\x0")
17
+ spec.files = Dir.chdir(File.expand_path(__dir__)) do
18
+ `git ls-files -z`.split("\x0").reject do |f|
19
+ f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
20
+ end
21
+ end
18
22
  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
19
- spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
20
23
  spec.require_paths = ['lib']
21
24
 
22
25
  spec.required_ruby_version = Gem::Requirement.new('>= 2.2.7') # rubocop:disable Gemspec/RequiredRubyVersion
23
26
 
24
- spec.add_dependency 'activerecord', '>= 5.1', '< 6.2'
27
+ spec.add_dependency 'activerecord', '>= 5.1', '< 7.1'
25
28
  spec.add_dependency 'diffy'
26
29
 
27
30
  spec.add_development_dependency 'appraisal', '>= 2.2.0'
28
31
  spec.add_development_dependency 'bundler'
29
- spec.add_development_dependency 'erbh', '>= 0.1.2'
32
+ spec.add_development_dependency 'erbh', '>= 0.2.1'
30
33
  spec.add_development_dependency 'hash_modern_inspect', '>= 0.1.1'
31
34
  spec.add_development_dependency 'hash_order_helper', '>= 0.1.6'
32
35
  spec.add_development_dependency 'mysql2'
@@ -35,9 +38,10 @@ Gem::Specification.new do |spec|
35
38
  spec.add_development_dependency 'rspec', '>= 3.0.0'
36
39
  spec.add_development_dependency 'rspec-match_fuzzy', '>= 0.1.3'
37
40
  spec.add_development_dependency 'rspec-match_ruby', '>= 0.1.3'
38
- spec.add_development_dependency 'rubocop', '1.9.1'
41
+ spec.add_development_dependency 'rubocop', '1.24.1'
39
42
  spec.add_development_dependency 'rubocop-rake', '>= 0.5.1'
40
43
  spec.add_development_dependency 'rubocop-rspec', '>= 2.1.0'
41
44
  spec.add_development_dependency 'simplecov'
42
45
  spec.add_development_dependency 'simplecov-lcov'
46
+ spec.metadata['rubygems_mfa_required'] = 'true'
43
47
  end