ridgepole 0.6.5.beta9 → 0.6.5.beta10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 024470270cd96b582a5e6c0da47e8ca57bfae9a6
-  data.tar.gz: 870ce03f5efdf6d1cf888b35a22367524189fb39
+  metadata.gz: 145c30f16a0e8c3c7aa2a56ded6db3bbbabded5f
+  data.tar.gz: 577cacc926ed818f403cc066cc6f299f8faea54c
 SHA512:
-  metadata.gz: abfb2f146e7b6d57a72fdf4735227cc9e82e4cb11a1859dfc9666bc7c5c5851539c7a2891edc47075b02c6a09099d911f50f320d26de71e3a845b10a21733cc5
-  data.tar.gz: bca1b088bd0c3943202d51b49ea35304ca7adef09cd5d52581df67527340dfcb86f8262339f1a239ac7d3ee70fadc9c6722c8945c9698d81c2666134ccec6c0c
+  metadata.gz: cefea2b7ea2341fe5dd3155b81c34ea947fe4fd5e1b71ebf5436aa43d27e688d6f596b1834526617d13af74e2d8e94395ff7d9dbd63506221b49f18ebb48bd3f
+  data.tar.gz: 9d8070a7d1cad32919673def208f8bf66956fccb3c86fe4973272d5c82ae1444dfc12dd32b2cff1e7ccf499943b77300366f2b8a135405fed9e52b6ff76c8682

data/lib/ridgepole/dsl_parser.rb

@@ -174,7 +174,11 @@ class Ridgepole::DSLParser
 
     def add_index(table_name, column_name, options = {})
       table_name = table_name.to_s
-      column_name = [column_name].flatten.map {|i| i.to_s }
+      # Keep column_name for expression index support
+      # https://github.com/rails/rails/pull/23393
+      unless column_name.is_a?(String) && /\W/ === column_name
+        column_name = [column_name].flatten.map {|i| i.to_s }
+      end
       options[:name] = options[:name].to_s if options[:name]
       @__definition[table_name] ||= {}
       @__definition[table_name][:indices] ||= {}

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.6.5.beta9'
+  VERSION = '0.6.5.beta10'
 end

data/spec/postgresql/migrate/migrate_add_expression_index_spec.rb

@@ -0,0 +1,23 @@
+describe 'Ridgepole::Client#diff -> migrate', condition: [:activerecord_5] do
+  subject { client }
+
+  context 'when add_index contains expression' do
+    let(:actual_dsl) { '' }
+    let(:expected_dsl) { <<-EOS }
+      create_table "users", force: :cascade do |t|
+        t.string "name", null: false
+        t.datetime "created_at", null: false
+        t.datetime "updated_at", 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(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.beta9
+  version: 0.6.5.beta10
 platform: ruby
 authors:
 - Genki Sugawara
@@ -318,6 +318,7 @@ files:
 - spec/postgresql/fk/migrate_create_fk_spec.rb
 - spec/postgresql/fk/migrate_drop_fk_spec.rb
 - spec/postgresql/migrate/migrate_add_column_spec.rb
+- spec/postgresql/migrate/migrate_add_expression_index_spec.rb
 - spec/postgresql/migrate/migrate_bigint_spec.rb
 - spec/postgresql/migrate/migrate_change_column_default_spec.rb
 - spec/postgresql/migrate/migrate_change_column_spec.rb
@@ -447,6 +448,7 @@ test_files:
 - spec/postgresql/fk/migrate_create_fk_spec.rb
 - spec/postgresql/fk/migrate_drop_fk_spec.rb
 - spec/postgresql/migrate/migrate_add_column_spec.rb
+- spec/postgresql/migrate/migrate_add_expression_index_spec.rb
 - spec/postgresql/migrate/migrate_bigint_spec.rb
 - spec/postgresql/migrate/migrate_change_column_default_spec.rb
 - spec/postgresql/migrate/migrate_change_column_spec.rb