ridgepole 0.6.5.beta11 → 0.6.5.beta12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d9f5c2109909e6a196908e0a0990e62a5b00030
-  data.tar.gz: 30a539a691cf72848afa5ba2ef81c9ce8a7dc2ce
+  metadata.gz: fe78b203c5736b9c91293c2e678889afe4b1e927
+  data.tar.gz: d4bf1df43c6676eb5817b38cc377d02d826dab65
 SHA512:
-  metadata.gz: a404a78077b95bd8feeac8e3cabc25910440784f9b9c1db0fa144332a9352a47465b86e0f24df5f08ecc9003e405db9e73b282cb4abd085a8fc595f22763d9c6
-  data.tar.gz: 597e212b753edf77db08483b1b827951dd893c5b129b75a7fd509ac317c3b49241f3797324774de04283faac3b2527ae1640c838e70e9899430b6062c45bbb71
+  metadata.gz: 29d7d68475863ef2e2575eef3fb2162c38f84659c8f56c5b5c5f36d339f185a7c686ca7feb31ef5c9fd2192cbf87d23318630aaf36a468333daf2a873804f5d0
+  data.tar.gz: a8173e2d906dfef78b698abe9723aa0dad1ec67af06918095074934d599dcd7a170e7a7763a5240de74eee8aa802cd63eac45fc1dd4022c37b990c1f2d3b3e49

data/lib/ridgepole/diff.rb

@@ -168,7 +168,7 @@ class Ridgepole::Diff
           modified_indices = []
 
           from_indices.each do |name, attrs|
-            if attrs[:column_name].delete(column_name)
+            if attrs[:column_name].is_a?(Array) && attrs[:column_name].delete(column_name)
               modified_indices << name
             end
           end
@@ -181,7 +181,7 @@ class Ridgepole::Diff
           end
 
           from_indices.reject! do |name, attrs|
-            attrs[:column_name].empty?
+            attrs[:column_name].is_a?(Array) && attrs[:column_name].empty?
           end
         end
       end
@@ -303,6 +303,10 @@ class Ridgepole::Diff
   end
 
   def columns_all_include?(expected_columns, actual_columns, table_options)
+    unless expected_columns.is_a?(Array)
+      return true
+    end
+
     if table_options[:id] != false
       actual_columns = actual_columns + [(table_options[:primary_key] || 'id').to_s]
     end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.6.5.beta11'
+  VERSION = '0.6.5.beta12'
 end

data/spec/postgresql/migrate/migrate_drop_expression_index_spec.rb

@@ -0,0 +1,57 @@
+describe 'Ridgepole::Client#diff -> migrate', condition: [:activerecord_5] do
+  subject { client }
+
+  before do
+    subject.diff(actual_dsl).migrate
+  end
+
+  context 'when drop column from table containing an expression index' do
+    let(:actual_dsl) { <<-EOS }
+      create_table "users", force: :cascade do |t|
+        t.string "name", null: false
+        t.datetime "created_at", null: false
+        t.index "lower((name)::text)", name: "index_users_on_lower_name", using: :btree
+      end
+    EOS
+
+    let(:expected_dsl) { <<-EOS }
+      create_table "users", force: :cascade do |t|
+        t.string "name", null: false
+        t.index "lower((name)::text)", name: "index_users_on_lower_name", using: :btree
+      end
+    EOS
+
+    specify do
+      delta = subject.diff(expected_dsl)
+      expect(delta).to be_differ
+      expect(delta.script).to match_fuzzy('remove_column("users", "created_at")')
+      expect(subject.dump).to match_fuzzy(actual_dsl)
+      delta.migrate
+      expect(subject.dump).to match_fuzzy(expected_dsl)
+    end
+  end
+
+  context 'when drop expression index' do
+    let(:actual_dsl) { <<-EOS }
+      create_table "users", force: :cascade do |t|
+        t.string "name", null: false
+        t.index "lower((name)::text)", name: "index_users_on_lower_name", using: :btree
+      end
+    EOS
+
+    let(:expected_dsl) { <<-EOS }
+      create_table "users", force: :cascade do |t|
+        t.string "name", null: false
+      end
+    EOS
+
+    specify do
+      delta = subject.diff(expected_dsl)
+      expect(delta).to be_differ
+      expect(delta.script).to match_fuzzy('remove_index("users", {:name=>"index_users_on_lower_name"})')
+      expect(subject.dump).to match_fuzzy(actual_dsl)
+      delta.migrate
+      expect(subject.dump).to match_fuzzy(expected_dsl)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.6.5.beta11
+  version: 0.6.5.beta12
 platform: ruby
 authors:
 - Genki Sugawara
@@ -327,6 +327,7 @@ files:
 - spec/postgresql/migrate/migrate_create_table_with_default_proc_spec.rb
 - spec/postgresql/migrate/migrate_drop_column_spec.rb
 - spec/postgresql/migrate/migrate_drop_column_with_index_spec.rb
+- spec/postgresql/migrate/migrate_drop_expression_index_spec.rb
 - spec/postgresql/migrate/migrate_drop_index_spec.rb
 - spec/postgresql/migrate/migrate_drop_table_spec.rb
 - spec/postgresql/migrate/migrate_ext_cols_spec.rb
@@ -457,6 +458,7 @@ test_files:
 - spec/postgresql/migrate/migrate_create_table_with_default_proc_spec.rb
 - spec/postgresql/migrate/migrate_drop_column_spec.rb
 - spec/postgresql/migrate/migrate_drop_column_with_index_spec.rb
+- spec/postgresql/migrate/migrate_drop_expression_index_spec.rb
 - spec/postgresql/migrate/migrate_drop_index_spec.rb
 - spec/postgresql/migrate/migrate_drop_table_spec.rb
 - spec/postgresql/migrate/migrate_ext_cols_spec.rb