schema_plus_pg_indexes 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23c0466d72bdac73b797047b1b0db33bbb840672
-  data.tar.gz: 51c899f934b0d2b480d63e2759b4b9d148b3351d
+  metadata.gz: 07fa2b71ce5644fe20cbee97ea3f62c18c608edf
+  data.tar.gz: 164420fd746ac63af76cf83348ed307b6d2c7047
 SHA512:
-  metadata.gz: e1690a53c5d96bbdfa7f5a33a12db3a91f72c59c3907bee9908f1556bc83eaaa2c629080ac5ed5c9ee57989094fb27d63e43b40b70574b88e65bc13cc4ea1ce1
-  data.tar.gz: b5fc2d3442f501ec154f79f8f2a0d018ca667ea11e266df1232fe2a45be825d3989234c540f31a60366009aaaf20c8e3fdda96f0bfb0a967bdf1bdeba64cc743
+  metadata.gz: 414e5cd0a8822d29a9c414e8eefab09dc6948b5c2ff9b8fba1c961a547f9d76d4efe1267bd658d1e603d80c36ff0e5f532ef137363033db7760b90fbae95f15b
+  data.tar.gz: 0ce973e0818352c72a27f2d98acd47e3d459c002f7fdb8b0f1a0a9b664b58046fb3b36ec2b97922ee81c56c05e05d229c098712a29a5a9d51836bfe5e3992125

data/README.md

@@ -61,6 +61,7 @@ schema_plus_pg_indexes is tested on
 
 ## History
 
+* v0.1.8 - Bug fix: expression with operator class (#7)
 * v0.1.7 - Bug fix: mix of columns & expressions (#5)
 * v0.1.6 - Bug fix: operator class & multiple columns (#4).  Thanks to [@nbudin](https://github.com/nbudin)
 * v0.1.5 - Bug fix: `t.index` without column in `change_table`

data/lib/schema_plus_pg_indexes/middleware/postgresql/dumper.rb

@@ -14,7 +14,7 @@ module SchemaPlusPgIndexes
               index_dump.add_option "case_sensitive: false" unless index_def.case_sensitive?
               index_dump.add_option "expression: #{index_def.expression.inspect}" if index_def.expression and index_def.case_sensitive?
               unless index_def.operator_classes.blank?
-                if index_def.columns.uniq.length == 1 && index_def.operator_classes.values.uniq.length == 1
+                if index_def.columns.uniq.length <= 1 && index_def.operator_classes.values.uniq.length == 1
                   index_dump.add_option "operator_class: #{index_def.operator_classes.values.first.inspect}"
                 else
                   index_dump.add_option "operator_class: {" + index_def.operator_classes.map{|column, val| "#{column.inspect}=>#{val.inspect}"}.join(", ") + "}"

data/lib/schema_plus_pg_indexes/middleware/postgresql/sql.rb

@@ -49,13 +49,15 @@ module SchemaPlusPgIndexes
             yield env
 
             if operator_classes and not operator_classes.is_a? Hash
-              operator_classes = Hash[column_names.map {|name| [name, operator_classes]}]
+              val = operator_classes
+              operator_classes = Hash[column_names.map {|name| [name, val]}]
+              operator_classes[nil] = val if expression
             end
 
             if operator_classes or case_insensitive
               option_strings = Hash[column_names.map {|name| [name, '']}]
               (operator_classes||{}).stringify_keys.each do |column, opclass|
-                option_strings[column] += " #{opclass}" if opclass
+                option_strings[column] += " #{opclass}" if opclass and column.present?
               end
               option_strings = connection.send :add_index_sort_order, option_strings, column_names, options
 
@@ -72,6 +74,7 @@ module SchemaPlusPgIndexes
             end
 
             if expression
+              expression = [expression, operator_classes[nil]].compact.join(' ') if operator_classes
               env.sql.columns = (env.sql.columns.split(/ *, */).reject{|col| expression =~ %r{\b#{col.gsub(/['"]/, '')}\b} } + [expression]).join(', ')
             end
           end

data/lib/schema_plus_pg_indexes/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlusPgIndexes
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/spec/index_spec.rb

@@ -3,19 +3,13 @@ require 'spec_helper'
 describe "index" do
 
   let(:migration) { ::ActiveRecord::Migration }
-  let(:connection) { ::ActiveRecord::Base.connection }
 
   describe "add_index" do
 
     class User < ::ActiveRecord::Base ; end
 
     after(:each) do
-      migration.suppress_messages do
-        User.indexes.each do |index|
-          migration.remove_index :users, name: index.name, if_exists: true
-        end
-        User.reset_column_information
-      end
+      User.reset_column_information
     end
 
     context "extra features" do

data/spec/schema_dumper_spec.rb

@@ -99,6 +99,13 @@ describe "Schema dump" do
       end
     end
 
+    it "should define expression with operator_class" do
+      with_index Post, :name => "expr_with_opclass", :expression => "upper(str_short || string_no_default)", :operator_class => 'text_pattern_ops' do
+        expect(dump_posts).to include(%q{t.index name: "expr_with_opclass", expression: "upper(((str_short)::text || (string_no_default)::text))", operator_class: "text_pattern_ops"})
+      end
+    end
+
+
     it "should define multi-column operator classes " do
       with_index Post, [:body, :string_no_default], :operator_class => {body: 'text_pattern_ops', string_no_default: 'varchar_pattern_ops' } do
         expect(dump_posts).to match(/body.*index:.*operator_class: {"body"=>"text_pattern_ops", "string_no_default"=>"varchar_pattern_ops"}/)
@@ -142,9 +149,7 @@ describe "Schema dump" do
   def with_index(*args)
     options = args.extract_options!
     model, columns = args
-    ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Migration.add_index(model.table_name, columns, options)
-    end
+    ActiveRecord::Migration.add_index(model.table_name, columns, options)
     model.reset_column_information
     yield
   end

data/spec/spec_helper.rb

@@ -19,6 +19,9 @@ RSpec.configure do |config|
   config.warnings = true
   config.around(:each) do |example|
     ActiveRecord::Migration.suppress_messages do
+      ActiveRecord::Base.connection.tables.each do |table|
+        ActiveRecord::Migration.drop_table table, force: :cascade
+      end
       example.run
     end
   end
@@ -26,7 +29,7 @@ end
 
 def define_schema(&block)
   ActiveRecord::Schema.define do
-    connection.tables.each do |table|
+    ActiveRecord::Base.connection.tables.each do |table|
       drop_table table, force: :cascade
     end
     instance_eval &block

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_pg_indexes
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-11 00:00:00.000000000 Z
+date: 2015-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord