schema_plus_pg_indexes 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a32103d4c7753e4551e51ed658016996e2cdc180
-  data.tar.gz: edf9dddc470db8759c183b18d33df4f649dc32f1
+  metadata.gz: 54562a8d42de79c647bd53129db15ea7d7ba28a8
+  data.tar.gz: 58c89fd5d525991ec196991984e197fdbe6e2f5d
 SHA512:
-  metadata.gz: 3e304b33918637897b17bb7518f6d962849ed17a2a1606a994a7159c3d9f4a1489abbb8f1d174660c896f3f4f44cfe0083f8480f74cab6b925062e14ae1f0e7a
-  data.tar.gz: 774d15bd7fce97f4d39926310c36457861bb44533219b19a9a5f936e8eca9d40e00ded2e9b871971c2fe0209e7271c8eaacdc9f29905e903a9d5d80f0ade2299
+  metadata.gz: a4484ac41d541b88d0e153ab45ca72a5fbfc1229da39dc3e743d63688761266580d26ed5e7563f2da2032f447f6971dbae31224e0599a4777f780129d721f900
+  data.tar.gz: 382626aa0c5ae82cc0fb9e6465e66ee7b6f48c205f034e1ff5dfd2af84057bb8b611fd9c0fc02fee48b2c1c170b4b683e1b943a1cdabd74a49021b84a173e773

data/README.md

@@ -1,7 +1,7 @@
 [![Gem Version](https://badge.fury.io/rb/schema_plus_pg_indexes.svg)](http://badge.fury.io/rb/schema_plus_pg_indexes)
 [![Build Status](https://secure.travis-ci.org/SchemaPlus/schema_plus_pg_indexes.svg)](http://travis-ci.org/SchemaPlus/schema_plus_pg_indexes)
 [![Coverage Status](https://img.shields.io/coveralls/SchemaPlus/schema_plus_pg_indexes.svg)](https://coveralls.io/r/SchemaPlus/schema_plus_pg_indexes)
-[![Dependency Status](https://gemnasium.com/lomba/schema_plus_pg_indexes.svg)](https://gemnasium.com/SchemaPlus/schema_plus_pg_indexes)
+[![Dependency Status](https://gemnasium.com/SchemaPlus/schema_plus_pg_indexes.svg)](https://gemnasium.com/SchemaPlus/schema_plus_pg_indexes)
 
 # schema_plus_pg_indexes
 
@@ -61,7 +61,8 @@ schema_plus_pg_indexes is tested on
 
 ## History
 
-* v0.2.0  - Support Rails 5 (Removed Rails 4.2 support)
+* v0.2.1  - Added Rails 5.0.1 support (Removed Rails 5.0.0 support)
+* v0.2.0  - Added Rails 5 support (Removed Rails 4.2 support)
 * v0.1.12 - Missing require
 * v0.1.11 - Explicit gem dependencies
 * v0.1.10 - Upgrade to schmea_plus_core 1.0

data/gemfiles/activerecord-5.0/Gemfile.base

@@ -1,3 +1,3 @@
 eval File.read File.expand_path('../../Gemfile.base', __FILE__)
 
-gem "activerecord", "~> 5.0.0"
+gem "activerecord", "~> 5.0.1"

data/lib/schema_plus_pg_indexes/active_record/connection_adapters/postgresql_adapter.rb

@@ -3,7 +3,7 @@ module SchemaPlusPgIndexes
     module ConnectionAdapters
       module PostgresqlAdapter
         #
-        # SchemaPlusPgIndexes allows the column_names paramter
+        # SchemaPlusPgIndexes allows the column_names parameter
         # to be left off
         #
         def add_index(table_name, column_names, options={})

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

@@ -8,19 +8,6 @@ module SchemaPlusPgIndexes
           def after(env)
             index_defs = env.connection.indexes(env.table.name)
 
-            def set_index_options(name, options, index_defs)
-              index_def = index_defs.find(&its.name == name)
-              options[:case_sensitive] = false unless index_def.case_sensitive?
-              options[:expression] = index_def.expression 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
-                  options[:operator_class] = index_def.operator_classes.values.first
-                else
-                  options[:operator_class] = index_def.operator_classes
-                end
-              end
-            end
-
             env.table.columns.each do |column_dump|
               index = column_dump.options[:index]
               set_index_options(index[:name], index, index_defs) if index
@@ -31,6 +18,20 @@ module SchemaPlusPgIndexes
             end
           end
 
+          def set_index_options(name, options, index_defs)
+            index_def = index_defs.find(&its.name == name)
+            options[:case_sensitive] = false unless index_def.case_sensitive?
+            options[:expression] = index_def.expression 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
+                options[:operator_class] = index_def.operator_classes.values.first
+              else
+                options[:operator_class] = index_def.operator_classes
+              end
+            end
+          end
+
+
         end
       end
     end

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

@@ -34,7 +34,7 @@ module SchemaPlusPgIndexes
             case_insensitive = (options.delete(:case_sensitive) == false)
 
             if expression
-              raise ArgumentError, "Cannot specify :case_sensitive => false with an expression.  Use LOWER(column_name)" if case_insensitive
+              raise ArgumentError, "Cannot specify :case_sensitive => false with an expression. Use LOWER(column_name)" if case_insensitive
               expression.strip!
               if m = expression.match(/^using\s+(?<using>\S+)\s*(?<rest>.*)/i)
                 options[:using] = m[:using]
@@ -55,22 +55,23 @@ module SchemaPlusPgIndexes
             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 and column.present?
-              end
-              option_strings = connection.send :add_index_sort_order, option_strings, column_names, options
-
               if case_insensitive
                 caseable_columns = connection.columns(table_name).select { |col| [:string, :text].include?(col.type) }.map(&:name)
                 quoted_column_names = column_names.map do |col_name|
-                  (caseable_columns.include?(col_name.to_s) ? "LOWER(#{connection.quote_column_name(col_name)})" : connection.quote_column_name(col_name)) + option_strings[col_name]
+                  [col_name, (caseable_columns.include?(col_name.to_s) ?
+                    "LOWER(#{connection.quote_column_name(col_name)})" : connection.quote_column_name(col_name))]
                 end
+                quoted_columns = Hash[quoted_column_names]
               else
-                quoted_column_names = column_names.map { |col_name| connection.quote_column_name(col_name) + option_strings[col_name] }
+                quoted_columns = Hash[column_names.map { |col_name| [col_name, connection.quote_column_name(col_name)] }]
+              end
+
+              (operator_classes||{}).stringify_keys.each do |column, opclass|
+                quoted_columns[column] += " #{opclass}" if opclass and column.present?
               end
+              quoted_columns = connection.send :add_index_sort_order, quoted_columns, **options
 
-              env.sql.columns = quoted_column_names.join(', ')
+              env.sql.columns = quoted_columns.values.join(', ')
             end
 
             if expression

data/lib/schema_plus_pg_indexes/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlusPgIndexes
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/schema_plus_pg_indexes.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "activerecord", "~> 5.0"
+  gem.add_dependency "activerecord", "~> 5.0", ">= 5.0.1"
   gem.add_dependency "schema_plus_indexes", "~> 0.2", ">= 0.2.4"
   gem.add_dependency "schema_plus_core", "~> 2.0"
   gem.add_dependency "its-it", "~> 1.2"
@@ -25,7 +25,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "bundler", "~> 1.7"
   gem.add_development_dependency "rake", "~> 10.0"
   gem.add_development_dependency "rspec", "~> 3.0.0"
-  gem.add_development_dependency "schema_dev", "~> 3.6"
+  gem.add_development_dependency "schema_dev", "~> 3.8"
   gem.add_development_dependency "simplecov"
   gem.add_development_dependency "simplecov-gem-profile"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_pg_indexes
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2017-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: schema_plus_indexes
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +126,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement