ridgepole 0.9.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3453e48af2d76cbb35301fcc70d7177f0016c47f4279593b6adbf269190d0b01
-  data.tar.gz: e4e61ed5bbbfae92a0660244a4e021fc387d945ccd5e85971d20c1ff184dc79f
+  metadata.gz: dd3d82e112d8ef525a7a909538e864b1dc6b4d1b6eaabad978e2ec552962fd63
+  data.tar.gz: 76dcd540c7ae97d1c226077f2b09979fa16e9937ec8a8d8d9f81b001bcdb2ee2
 SHA512:
-  metadata.gz: aa213105207d7a0a73adae7254885966fb06b0e0cc22cec7e2e44f7bd2082f7a6b10b2e7d8b5c5822c57b333447cd8ebb591db691b95a541f1493adcf3d46153
-  data.tar.gz: 3e1a1c8bbcde1f7d313df1a151d5ca3096e1bba911a099cc4e8969b877941dd85061d2c3d18c17afff976c5119d3cc00f9c9966f9037af5365d8d5b0c87243c0
+  metadata.gz: f641654487c60639c6de8633cba4ee8d3dc55a52b200ee43857f670a818c6699ba4271de56616152b8d378aac2c0e1eee118c17aa362c2e5e451542e5be540c3
+  data.tar.gz: b502738eb29e65a73e03dc0d64cec03cb250227c319888d65c7869bb123166fbd6354a9accfb25072484ed50e4bbbccd98e674b89dad51618341284bc8c1aeed

data/Appraisals

@@ -16,3 +16,7 @@ end
 appraise 'activerecord-6.1' do
   gem 'activerecord', '~> 6.1.0'
 end
+
+appraise 'activerecord-7.0' do
+  gem 'activerecord', '~> 7.0.0'
+end

data/CHANGELOG.md

@@ -0,0 +1,238 @@
+# Changelog
+
+## 1.0 (2021/12/19)
+
+* Support Rails 7.0
+* `--skip-drop-table` by default ([pull#363](https://github.com/winebarrel/ridgepole/pull/363))
+
+## 0.9
+
+### 0.9.6
+
+* Fix malformed error ([pull#362](https://github.com/winebarrel/ridgepole/pull/362))
+
+### 0.9.5
+
+* Call `super` in `disable_table_options.rb` ([pull#357](https://github.com/winebarrel/ridgepole/pull/357))
+
+### 0.9.4
+
+* Fix `--alter-extra` option for unique index ([pull#356](https://github.com/winebarrel/ridgepole/pull/356))
+
+### 0.9.3
+
+* Fix `limit` option for `t.integer` ([pull#354](https://github.com/winebarrel/ridgepole/pull/354))
+
+### 0.9.2
+
+* Support `t.column index option` ([pull#353](https://github.com/winebarrel/ridgepole/pull/353))
+
+### 0.9.1
+
+* Support `t.foreign_key` ([pull#348](https://github.com/winebarrel/ridgepole/pull/348))
+
+### 0.9.0
+
+* Remove `--mysql-use-alter` option ([pull#330](https://github.com/winebarrel/ridgepole/pull/330))
+* Add `--table-hash-options` option ([pull#331](https://github.com/winebarrel/ridgepole/pull/331))
+* Support Rails 6.1 ([pull#323](https://github.com/winebarrel/ridgepole/pull/323))
+* Disable Rails 5.0 support ([pull#335](https://github.com/winebarrel/ridgepole/pull/335))
+* Fix PK AUTO_INCREMENT change bug ([pull#334](https://github.com/winebarrel/ridgepole/pull/334))
+
+## 0.8
+
+### 0.8.13
+
+* Support `serial` and `bigserial` column types  ([pull#321](https://github.com/winebarrel/ridgepole/pull/321))
+
+### 0.8.12
+
+* Pluralize column specified by `references` ([pull#317](https://github.com/winebarrel/ridgepole/pull/317))
+
+### 0.8.11
+
+* Fix FK index check support multiple PK ([pull#315](https://github.com/winebarrel/ridgepole/pull/315))
+* Support t.reference() foreign_key option ([pull#316](https://github.com/winebarrel/ridgepole/pull/316))
+
+### 0.8.10
+
+* Raise an error if an InnoDB column has a foreign key but no index ([pull#310](https://github.com/winebarrel/ridgepole/pull/310))
+
+### 0.8.9
+
+* Fix unexpected differences on text types and blob types on Rails 6 ([pull#306](https://github.com/winebarrel/ridgepole/pull/306))
+* Fix unexpected warning when a foreign key is added on the primary key ([pull#307](https://github.com/winebarrel/ridgepole/pull/307))
+
+### 0.8.8
+
+* Fix keyword arguments warnings in Ruby 2.7 ([pull#303](https://github.com/winebarrel/ridgepole/pull/303))
+
+### 0.8.7
+
+* Support `require_relative` ([pull#298](https://github.com/winebarrel/ridgepole/pull/298))
+
+### 0.8.6
+
+* Support multiple databases feature ([pull#297](https://github.com/winebarrel/ridgepole/pull/297))
+
+### 0.8.5
+
+* Improve warning message on table options ([pull#291](https://github.com/winebarrel/ridgepole/pull/291))
+
+### 0.8.4
+
+* Display a warning if an InnoDB table doesn't have any indexes on a column where it has a foreign key ([pull#290](https://github.com/winebarrel/ridgepole/pull/290))
+
+### 0.8.3
+
+* Fix "topological sort failed" error ([pull#287](https://github.com/winebarrel/ridgepole/pull/287))
+
+### 0.8.2
+
+* Support `postgres://` schema ([pull#285](https://github.com/winebarrel/ridgepole/pull/285))
+
+### 0.8.1
+
+* Drop tables in an order considering foreign key constraints ([pull#284](https://github.com/winebarrel/ridgepole/pull/284))
+
+### 0.8.0
+
+* Support Rails 6.0
+
+## 0.7
+
+### 0.7.8
+
+* Fix for `add_foreign_key(..., column: ,,,)` ([pull#278](https://github.com/winebarrel/ridgepole/pull/278))
+
+### 0.7.7
+
+* Support URI query string ([pull#273](https://github.com/winebarrel/ridgepole/pull/273))
+
+### 0.7.6
+
+* Fix database url check ([pull#266](https://github.com/winebarrel/ridgepole/pull/266))
+* Add ignore option ([pull#267](https://github.com/winebarrel/ridgepole/pull/267))
+
+### 0.7.5
+
+* Fix polymorphic options ([pull#263](https://github.com/winebarrel/ridgepole/pull/263))
+* Fix `--mysql-use-alter` option ([pull#246](https://github.com/winebarrel/ridgepole/pull/264))
+* Fix Database URI parsing ([pull#265](https://github.com/winebarrel/ridgepole/pull/265))
+
+### 0.7.4
+
+* Fix `add_foreign_key` options ([issue#250](https://github.com/winebarrel/ridgepole/issues/250))
+
+### 0.7.3
+
+* Add `--mysql-change-table-comment option` ([pull#166](https://github.com/winebarrel/ridgepole/pull/166))
+* Refactoring with RuboCop
+* Support primary key adding/dropping ([issue#246](https://github.com/winebarrel/ridgepole/issues/246))
+
+### 0.7.2
+
+* Support Rails 5.2
+
+### 0.7.1
+
+* Remove `--reverse` option
+* Add `--allow-pk-change` option
+* Add `--create-table-with-index` option
+* Add `--mysql-dump-auto-increment` option (`rails >= 5.1`)
+
+### 0.7.0
+
+* Remove Rails 4.x support
+* Add Rails 5.1 support
+* Remove `--enable-mysql-awesome` option
+* Add `--skip-drop-table` option
+* Support foreign key without name
+* Support MySQL JSON Type and Generated Columns
+* Add `--mysql-change-table-options` option
+* Pass config from env
+* Fix change fk order
+* Add `--check-relation-type` option
+* Add `--skip-column-comment-change` option
+* Add `--default-bigint-limit` option
+* Add `--ignore-table-comment` option
+
+## 0.6
+
+### 0.6.6
+
+* Use `t.column` for migration ([pull#114](https://github.com/winebarrel/ridgepole/pull/114))
+* Support DATABASE_URL format ([pull#118](https://github.com/winebarrel/ridgepole/pull/118))
+* Add Ruby2.4 CI ([pull#119](https://github.com/winebarrel/ridgepole/pull/119))
+
+### 0.6.5
+
+* Fix rails version `'>= 4.2', '< 6'`
+* Support new types ([pull#84](https://github.com/winebarrel/ridgepole/pull/84))
+* Support `default: -> { ... }` ([pull#85](https://github.com/winebarrel/ridgepole/pull/85))
+* Support DDL Comment (Rails5 only)
+* Output schema diff when pass `--verbose`
+* Support composite primary key (Rails5 only / [pull#97](https://github.com/winebarrel/ridgepole/pull/97))
+
+### 0.6.4
+
+* Execute sql using external script ([pull#56](https://github.com/winebarrel/ridgepole/pull/56))
+* Add `--mysql-use-alter` option
+* Add `--alter-extra` option
+* Add `--dump-with-default-fk-name` option
+* Support `t.index` ([pull#64](https://github.com/winebarrel/ridgepole/pull/64))
+* Remove migration_comments
+* Fix foreign key apply order
+
+### 0.6.3
+
+* Fix `default` option ([pull#48](https://github.com/winebarrel/ridgepole/pull/48))
+* Add `--enable-migration-comments` option ([pull#50](https://github.com/winebarrel/ridgepole/pull/50))
+* Disable `rename_table_indexes`
+
+### 0.6.1
+
+* Support [PostgreSQL columns](https://github.com/winebarrel/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L79)
+
+### 0.6.0
+
+* Fix rails version `~> 4.2.1`
+* Disable following libraries support:
+    * activerecord-mysql-unsigned
+    * migration_comments
+    * foreigner
+* Disable sqlite support
+* Add PostgreSQL test
+* Remove `--mysql-awesome-unsigned-pk` option
+
+## 0.5
+
+### 0.5.2
+
+* Add `--enable-mysql-awesome` option ([activerecord-mysql-awesome](https://github.com/kamipo/activerecord-mysql-awesome) is required `>= 0.0.3`)
+* It is not possible to enable both `--enable-mysql-awesome` and `--enable-migration-comments`, `--enable-mysql-awesome` and `--enable-mysql-unsigned`, `--enable-mysql-awesome` and `--enable-mysql-pkdump`
+* Fix foreigner version `<= 1.7.1`
+
+### 0.5.1
+
+* Add `--enable-migration-comments` option ([migration_comments](https://github.com/pinnymz/migration_comments) is required)
+* Fix rails version `< 4.2.0`
+
+### 0.5.0
+
+* Fix `activerecord-mysql-unsigned` version: `~> 0.3.1`
+
+## 0.4
+
+### 0.4.12
+
+* Fix `activerecord-mysql-unsigned` version: `~> 0.2.0`
+
+### 0.4.11
+
+* Add `--enable-mysql-pkdump` option.
+
+### 0.4.8
+
+* `activerecord-mysql-unsigned` is now optional. Please pass `--enable-mysql-unsigned` after you install [activerecord-mysql-unsigned](https://github.com/waka/activerecord-mysql-unsigned) if you want to use.
+* Please pass `--enable-foreigner` after you install [foreigner](https://github.com/matthuhiggins/foreigner) if you want to use the foreign key.

data/README.md

@@ -6,150 +6,20 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 (like Chef/Puppet)
 
 [![Gem Version](https://badge.fury.io/rb/ridgepole.svg)](http://badge.fury.io/rb/ridgepole)
-[![Build Status](https://github.com/winebarrel/ridgepole/workflows/test/badge.svg?branch=0.9)](https://github.com/winebarrel/ridgepole/actions)
-[![Coverage Status](https://coveralls.io/repos/github/winebarrel/ridgepole/badge.svg?branch=0.9)](https://coveralls.io/github/winebarrel/ridgepole?branch=0.9)
-
-<details><summary>ChangeLog</summary>
-
-* `>= 0.4.8`
-  * `activerecord-mysql-unsigned` is now optional. Please pass `--enable-mysql-unsigned` after you install [activerecord-mysql-unsigned](https://github.com/waka/activerecord-mysql-unsigned) if you want to use.
-  * Please pass `--enable-foreigner` after you install [foreigner](https://github.com/matthuhiggins/foreigner) if you want to use the foreign key.
-* `>= 0.4.11`
-  * Add `--enable-mysql-pkdump` option.
-* `>= 0.4.12`
-  * Fix `activerecord-mysql-unsigned` version: `~> 0.2.0`
-* `>= 0.5.0`
-  * Fix `activerecord-mysql-unsigned` version: `~> 0.3.1`
-* `>= 0.5.1`
-  * Add `--enable-migration-comments` option ([migration_comments](https://github.com/pinnymz/migration_comments) is required)
-  * Fix rails version `< 4.2.0`
-* `>= 0.5.2`
-  * Add `--enable-mysql-awesome` option ([activerecord-mysql-awesome](https://github.com/kamipo/activerecord-mysql-awesome) is required `>= 0.0.3`)
-  * It is not possible to enable both `--enable-mysql-awesome` and `--enable-migration-comments`, `--enable-mysql-awesome` and `--enable-mysql-unsigned`, `--enable-mysql-awesome` and `--enable-mysql-pkdump`
-  * Fix foreigner version `<= 1.7.1`
-* `>= 0.6.0`
-  * Fix rails version `~> 4.2.1`
-  * Disable following libraries support:
-    * activerecord-mysql-unsigned
-    * migration_comments
-    * foreigner
-  * Disable sqlite support
-  * Add PostgreSQL test
-  * Remove `--mysql-awesome-unsigned-pk` option
-* `>= 0.6.1`
-  * Support [PostgreSQL columns](https://github.com/winebarrel/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L79)
-* `>= 0.6.3`
-  * Fix `default` option ([pull#48](https://github.com/winebarrel/ridgepole/pull/48))
-  * Add `--enable-migration-comments` option ([pull#50](https://github.com/winebarrel/ridgepole/pull/50))
-  * Disable `rename_table_indexes`
-* `>= 0.6.4`
-  * Execute sql using external script ([pull#56](https://github.com/winebarrel/ridgepole/pull/56))
-  * Add `--mysql-use-alter` option
-  * Add `--alter-extra` option
-  * Add `--dump-with-default-fk-name` option
-  * Support `t.index` ([pull#64](https://github.com/winebarrel/ridgepole/pull/64))
-  * Remove migration_comments
-  * Fix foreign key apply order
-* `>= 0.6.5`
-  * Fix rails version `'>= 4.2', '< 6'`
-  * Support new types ([pull#84](https://github.com/winebarrel/ridgepole/pull/84))
-  * Support `default: -> { ... }` ([pull#85](https://github.com/winebarrel/ridgepole/pull/85))
-  * Support DDL Comment (Rails5 only)
-  * Output schema diff when pass `--verbose`
-  * Support composite primary key (Rails5 only / [pull#97](https://github.com/winebarrel/ridgepole/pull/97))
-* `>= 0.6.6`
-  * Use `t.column` for migration ([pull#114](https://github.com/winebarrel/ridgepole/pull/114))
-  * Support DATABASE_URL format ([pull#118](https://github.com/winebarrel/ridgepole/pull/118))
-  * Add Ruby2.4 CI ([pull#119](https://github.com/winebarrel/ridgepole/pull/119))
-* `>= 0.7.0`
-  * Remove Rails 4.x support
-  * Add Rails 5.1 support
-  * Remove `--enable-mysql-awesome` option
-  * Add `--skip-drop-table` option
-  * Support foreign key without name
-  * Support MySQL JSON Type and Generated Columns
-  * Add `--mysql-change-table-options` option
-  * Pass config from env
-  * Fix change fk order
-  * Add `--check-relation-type` option
-  * Add `--skip-column-comment-change` option
-  * Add `--default-bigint-limit` option
-  * Add `--ignore-table-comment` option
-* `>= 0.7.1`
-  * Remove `--reverse` option
-  * Add `--allow-pk-change` option
-  * Add `--create-table-with-index` option
-  * Add `--mysql-dump-auto-increment` option (`rails >= 5.1`)
-* `>= 0.7.2`
-  * Support Rails 5.2
-* `>= 0.7.3`
-  * Add `--mysql-change-table-comment option` ([pull#166](https://github.com/winebarrel/ridgepole/pull/166))
-  * Refactoring with RuboCop
-  * Support primary key adding/dropping ([issue#246](https://github.com/winebarrel/ridgepole/issues/246))
-* `>= 0.7.4`
-  * Fix `add_foreign_key` options ([issue#250](https://github.com/winebarrel/ridgepole/issues/250))
-* `>= 0.7.5`
-  * Fix polymorphic options ([pull#263](https://github.com/winebarrel/ridgepole/pull/263))
-  * Fix `--mysql-use-alter` option ([pull#246](https://github.com/winebarrel/ridgepole/pull/264))
-  * Fix Database URI parsing ([pull#265](https://github.com/winebarrel/ridgepole/pull/265))
-* `>= 0.7.6`
-  * Fix database url check ([pull#266](https://github.com/winebarrel/ridgepole/pull/266))
-  * Add ignore option ([pull#267](https://github.com/winebarrel/ridgepole/pull/267))
-* `>= 0.7.7`
-  * Support URI query string ([pull#273](https://github.com/winebarrel/ridgepole/pull/273))
-* `>= 0.7.8`
-  * Fix for `add_foreign_key(..., column: ,,,)` ([pull#278](https://github.com/winebarrel/ridgepole/pull/278))
-* `>= 0.8.0`
-  * Support Rails 6.0
-* `>= 0.8.1`
-  * Drop tables in an order considering foreign key constraints ([pull#284](https://github.com/winebarrel/ridgepole/pull/284))
-* `>= 0.8.2`
-  * Support `postgres://` schema ([pull#285](https://github.com/winebarrel/ridgepole/pull/285))
-* `>= 0.8.3`
-  * Fix "topological sort failed" error ([pull#287](https://github.com/winebarrel/ridgepole/pull/287))
-* `>= 0.8.4`
-  * Display a warning if an InnoDB table doesn't have any indexes on a column where it has a foreign key ([pull#290](https://github.com/winebarrel/ridgepole/pull/290))
-* `>= 0.8.5`
-  * Improve warning message on table options ([pull#291](https://github.com/winebarrel/ridgepole/pull/291))
-* `>= 0.8.6`
-  * Support multiple databases feature ([pull#297](https://github.com/winebarrel/ridgepole/pull/297))
-* `>= 0.8.7`
-  * Support `require_relative` ([pull#298](https://github.com/winebarrel/ridgepole/pull/298))
-* `>= 0.8.8`
-  * Fix keyword arguments warnings in Ruby 2.7 ([pull#303](https://github.com/winebarrel/ridgepole/pull/303))
-* `>= 0.8.9`
-  * Fix unexpected differences on text types and blob types on Rails 6 ([pull#306](https://github.com/winebarrel/ridgepole/pull/306))
-  * Fix unexpected warning when a foreign key is added on the primary key ([pull#307](https://github.com/winebarrel/ridgepole/pull/307))
-* `>= 0.8.10`
-  * Raise an error if an InnoDB column has a foreign key but no index ([pull#310](https://github.com/winebarrel/ridgepole/pull/310))
-* `>= 0.8.11`
-  * Fix FK index check support multiple PK ([pull#315](https://github.com/winebarrel/ridgepole/pull/315))
-  * Support t.reference() foreign_key option ([pull#316](https://github.com/winebarrel/ridgepole/pull/316))
-* `>= 0.8.12`
-  * Pluralize column specified by `references` ([pull#317](https://github.com/winebarrel/ridgepole/pull/317))
-* `>= 0.8.13`
-  * Support `serial` and `bigserial` column types  ([pull#321](https://github.com/winebarrel/ridgepole/pull/321))
-* `>= 0.9.0`
-  * Remove `--mysql-use-alter` option ([pull#330](https://github.com/winebarrel/ridgepole/pull/330))
-  * Add `--table-hash-options` option ([pull#331](https://github.com/winebarrel/ridgepole/pull/331))
-  * Support Rails 6.1 ([pull#323](https://github.com/winebarrel/ridgepole/pull/323))
-  * Disable Rails 5.0 support ([pull#335](https://github.com/winebarrel/ridgepole/pull/335))
-  * Fix PK AUTO_INCREMENT change bug ([pull#334](https://github.com/winebarrel/ridgepole/pull/334))
-* `>= 0.9.1`
-  * Support `t.foreign_key` ([pull#348](https://github.com/winebarrel/ridgepole/pull/348))
-* `>= 0.9.2`
-  * Support `t.column index option` ([pull#353](https://github.com/winebarrel/ridgepole/pull/353))
-* `>= 0.9.3`
-  * Fix `limit` option for `t.integer` ([pull#354](https://github.com/winebarrel/ridgepole/pull/453))
-</details>
+[![Build Status](https://github.com/winebarrel/ridgepole/workflows/test/badge.svg?branch=1.0)](https://github.com/winebarrel/ridgepole/actions)
+[![Coverage Status](https://coveralls.io/repos/github/winebarrel/ridgepole/badge.svg?branch=1.0)](https://coveralls.io/github/winebarrel/ridgepole?branch=1.0)
 
 **Notice**
 
-ActiveRecord 6.1 is supported in ridgepole v0.9, but the ActiveRecord dump has been changed, so there is a difference between ActiveRecord 5.x/6.0 format.
-
-**If you use ActiveRecord 6.1, please modify Schemafile format**.
-
-cf. https://github.com/winebarrel/ridgepole/pull/323
+* ActiveRecord 6.1 is supported in ridgepole v0.9, but the ActiveRecord dump has been changed, so there is a difference between ActiveRecord 5.x/6.0 format.
+  * **If you use ActiveRecord 6.1, please modify Schemafile format**.
+  * cf. https://github.com/winebarrel/ridgepole/pull/323
+* `DROP TABLE` is skipped by default in v1.0 and later versions.
+  * If you want to `DROP TABLE`, please pass `--drop-table`.
+  * cf. https://github.com/ridgepole/ridgepole/pull/363
+* In Rails 7.0, the output of dumper is different from Rails 6.
+  * cf. https://github.com/rails/rails/issues/43909
+  * cf. https://github.com/rails/rails/commit/c2a6f618d22cca4d9b7be7fa7652e7aac509350c#diff-55f41513f027a3d219629f475f03c2d1105ca55c5093d691e1b3dc4710c6cc0b
 
 ## Installation
 
@@ -200,7 +70,7 @@ Usage: ridgepole [options]
         --dump-without-table-options
         --dump-with-default-fk-name
         --index-removed-drop-column
-        --skip-drop-table
+        --drop-table
         --mysql-change-table-options
         --mysql-change-table-comment
         --check-relation-type DEF_PK

data/bin/ridgepole

@@ -137,7 +137,7 @@ ARGV.options do |opt|
     opt.on('',   '--dump-without-table-options') { options[:dump_without_table_options] = true }
     opt.on('',   '--dump-with-default-fk-name') { options[:dump_with_default_fk_name] = true }
     opt.on('',   '--index-removed-drop-column') { options[:index_removed_drop_column] = true }
-    opt.on('',   '--skip-drop-table') { options[:skip_drop_table] = true }
+    opt.on('',   '--drop-table') { options[:force_drop_table] = true }
     opt.on('',   '--mysql-change-table-options') { options[:mysql_change_table_options] = true }
     opt.on('',   '--mysql-change-table-comment') { options[:mysql_change_table_comment] = true }
     opt.on('',   '--check-relation-type DEF_PK') { |v| options[:check_relation_type] = v }

data/docker-compose.yml

@@ -1,18 +1,26 @@
-mysql:
-  image: "mysql:5.6.38"
-  ports:
-    - "13316:3306"
-  environment:
-    MYSQL_ROOT_PASSWORD: password
-mysql57:
-  image: "mysql:5.7.20"
-  ports:
-    - "13317:3306"
-  environment:
-    MYSQL_ROOT_PASSWORD: password
-postgres:
-  image: "postgres:9.5"
-  ports:
-    - "15442:5432"
-  environment:
-    POSTGRES_PASSWORD: password
+version: "3.8"
+services:
+  mysql:
+    image: "mysql:5.6"
+    ports:
+      - "13316:3306"
+    environment:
+      MYSQL_ROOT_PASSWORD: password
+  mysql57:
+    image: "mysql:5.7"
+    ports:
+      - "13317:3306"
+    environment:
+      MYSQL_ROOT_PASSWORD: password
+  mysql80:
+    image: "mysql:8.0"
+    ports:
+      - "13318:3306"
+    environment:
+      MYSQL_ROOT_PASSWORD: password
+  postgres:
+    image: "postgres:14"
+    ports:
+      - "15442:5432"
+    environment:
+      POSTGRES_PASSWORD: password

data/gemfiles/activerecord_7.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.0.0"
+
+gemspec path: "../"

data/lib/ridgepole/delta.rb

@@ -191,7 +191,7 @@ module Ridgepole
       errmsg = lines.with_index.map do |l, i|
         line_num = i + 1
         prefix = line_num == err_num ? '* ' : '  '
-        format("#{prefix}%<line_num>#{digit_number}d: #{l}", line_num: line_num)
+        format("#{prefix}%<line_num>#{digit_number}d: %<line>s", line_num: line_num, line: l)
       end
 
       if err_num > 0

data/lib/ridgepole/diff.rb

@@ -41,7 +41,7 @@ module Ridgepole
 
       scan_relation_info(relation_info)
 
-      unless @options[:merge] || @options[:skip_drop_table]
+      if !@options[:merge] && @options[:force_drop_table]
         from.each do |table_name, from_attrs|
           next unless target?(table_name)
 
@@ -419,6 +419,9 @@ module Ridgepole
             opts[:limit] = 4_294_967_295
           end
         end
+
+        # Workaround for Active Record 7.0
+        opts.delete(:precision) if attrs[:type] == :datetime && opts[:precision].nil?
       end
     end
 

data/lib/ridgepole/execute_expander.rb

@@ -13,7 +13,10 @@ module Ridgepole
     end
 
     module ConnectionAdapterExt
-      def execute(sql, name = nil)
+      def execute(*args)
+        sql = args.fetch(0)
+        name = args[1]
+
         if Ridgepole::ExecuteExpander.noop
           if (callback = Ridgepole::ExecuteExpander.callback)
             sql = append_alter_extra(sql)
@@ -50,7 +53,7 @@ module Ridgepole
           case sql
           when /\AALTER\b/i
             sql += ',' + Ridgepole::ExecuteExpander.alter_extra
-          when /\A(CREATE|DROP)\s+INDEX\b/i
+          when /\A(CREATE|DROP)\s+((ONLINE|OFFLINE)\s+)?((UNIQUE|FULLTEXT|SPATIAL)\s+)?INDEX\b/i
             # https://dev.mysql.com/doc/refman/5.6/en/create-index.html
             # https://dev.mysql.com/doc/refman/5.6/en/drop-index.html
             sql += ' ' + Ridgepole::ExecuteExpander.alter_extra.tr(',', ' ')

data/lib/ridgepole/ext/abstract_adapter/disable_table_options.rb

@@ -36,6 +36,7 @@ module ActiveRecord
     class AbstractAdapter
       def self.inherited(subclass)
         subclass.prepend Ridgepole::Ext::AbstractAdapter::DisableTableOptions
+        super
       end
     end
   end

data/lib/ridgepole/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ridgepole
-  VERSION = '0.9.3'
+  VERSION = '1.0.0'
 end

data/ridgepole.gemspec

@@ -8,20 +8,23 @@ Gem::Specification.new do |spec|
   spec.name          = 'ridgepole'
   spec.version       = Ridgepole::VERSION
   spec.authors       = ['Genki Sugawara']
-  spec.email         = ['sugawara@cookpad.com']
+  spec.email         = ['sugawara@winebarrel.jp']
   spec.summary       = 'Ridgepole is a tool to manage DB schema.'
   spec.description   = 'Ridgepole is a tool to manage DB schema. It defines DB schema using Rails DSL, and updates DB schema according to DSL.'
-  spec.homepage      = 'https://github.com/winebarrel/ridgepole'
+  spec.homepage      = 'https://github.com/ridgepole/ridgepole'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
+    end
+  end
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   spec.required_ruby_version = Gem::Requirement.new('>= 2.2.7') # rubocop:disable Gemspec/RequiredRubyVersion
 
-  spec.add_dependency 'activerecord', '>= 5.1', '< 6.2'
+  spec.add_dependency 'activerecord', '>= 5.1', '< 7.1'
   spec.add_dependency 'diffy'
 
   spec.add_development_dependency 'appraisal', '>= 2.2.0'