ridgepole 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3453e48af2d76cbb35301fcc70d7177f0016c47f4279593b6adbf269190d0b01
-  data.tar.gz: e4e61ed5bbbfae92a0660244a4e021fc387d945ccd5e85971d20c1ff184dc79f
+  metadata.gz: 4b1fa89270221dcad6cdfa188a879de277c0ed1ea8672d2d9456b3057fe70ac1
+  data.tar.gz: 1d30c79ae7adf620347c70f769a12e0cb01e38fdf799cf6cbe67f952ab014d9c
 SHA512:
-  metadata.gz: aa213105207d7a0a73adae7254885966fb06b0e0cc22cec7e2e44f7bd2082f7a6b10b2e7d8b5c5822c57b333447cd8ebb591db691b95a541f1493adcf3d46153
-  data.tar.gz: 3e1a1c8bbcde1f7d313df1a151d5ca3096e1bba911a099cc4e8969b877941dd85061d2c3d18c17afff976c5119d3cc00f9c9966f9037af5365d8d5b0c87243c0
+  metadata.gz: 853d1138335b2c697c7f84d1beceae743badacc2891fd05bb8d9349c7b8c10d763516d5d2c6e63d88a7f60d0c0f887270baa03738cc3496409bca6609990097c
+  data.tar.gz: f4b38e66c8a5295bdc7241a407b5a2c848a3558d6421a1cbe12520f5cd85aff08154783d353f0fc2d7ce4798f620e31e5b59fc31f2225ec4d52fefc33e8dec14

data/README.md

@@ -140,7 +140,9 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 * `>= 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))
+  * Fix `limit` option for `t.integer` ([pull#354](https://github.com/winebarrel/ridgepole/pull/354))
+* `>= 0.9.4`
+  * Fix `--alter-extra` option for unique index ([pull#356](https://github.com/winebarrel/ridgepole/pull/356))
 </details>
 
 **Notice**

data/lib/ridgepole/execute_expander.rb

@@ -50,7 +50,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/version.rb

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

data/spec/mysql/migrate/migrate_add_column_with_alter_extra_spec.rb

@@ -186,6 +186,51 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
   end
 
+  context 'when add unique index' do
+    let(:actual_dsl) do
+      erbh(<<-ERB)
+        create_table "employees", primary_key: "emp_no", force: :cascade do |t|
+          t.date   "birth_date", null: false
+          t.string "first_name", limit: 14, null: false
+          t.string "last_name", limit: 16, null: false
+          t.string "gender", limit: 1, null: false
+          t.date   "hire_date", null: false
+        end
+      ERB
+    end
+
+    let(:expected_dsl) do
+      erbh(<<-ERB)
+        create_table "employees", primary_key: "emp_no", force: :cascade do |t|
+          t.date   "birth_date", null: false
+          t.string "first_name", limit: 14, null: false
+          t.string "last_name", limit: 16, null: false
+          t.string "gender", limit: 1, null: false
+          t.date   "hire_date", null: false
+          t.index  ["first_name"], name: "idx_first_name", unique: true
+        end
+      ERB
+    end
+
+    let(:alter_extra) { 'LOCK=DEFAULT, ALGORITHM=DEFAULT' }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_ruby actual_dsl
+      migrated, sql = delta.migrate(alter_extra: alter_extra, noop: true)
+      expect(migrated).to be_truthy
+      expect(sql).to match_fuzzy erbh(<<-SQL)
+        CREATE UNIQUE INDEX `idx_first_name` ON `employees` (`first_name`)  LOCK=DEFAULT  ALGORITHM=DEFAULT
+      SQL
+      delta.migrate(alter_extra: alter_extra)
+      expect(subject.dump).to match_ruby expected_dsl
+    }
+  end
+
   context 'when drop index' do
     let(:actual_dsl) do
       erbh(<<-ERB)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-12 00:00:00.000000000 Z
+date: 2021-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -472,7 +472,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Ridgepole is a tool to manage DB schema.