schema_plus_pg_indexes 0.1.12 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dce15f060c1c297e62d79ec6a9686344e0b369d7
-  data.tar.gz: 57f3ec5dcef7f3830336fa14d9a515427b6934cd
+  metadata.gz: a32103d4c7753e4551e51ed658016996e2cdc180
+  data.tar.gz: edf9dddc470db8759c183b18d33df4f649dc32f1
 SHA512:
-  metadata.gz: e1d3b38c63cf9a3c8a76adc1164ad0ef0c23d10a892469b109ef264974ae3bef546ffee9fc848700f2d2d4521f3ce9ad67a49d6395b158c509b4051c461b024f
-  data.tar.gz: e524a633fe1e45e3a67fe10895890e39b2c1967b3941a2c38d1fc73957b090cb0d3e36b8c4001b7623e6caafc08a14d8445b5797c37005458a51370997775120
+  metadata.gz: 3e304b33918637897b17bb7518f6d962849ed17a2a1606a994a7159c3d9f4a1489abbb8f1d174660c896f3f4f44cfe0083f8480f74cab6b925062e14ae1f0e7a
+  data.tar.gz: 774d15bd7fce97f4d39926310c36457861bb44533219b19a9a5f936e8eca9d40e00ded2e9b871971c2fe0209e7271c8eaacdc9f29905e903a9d5d80f0ade2299

data/.travis.yml

@@ -5,9 +5,9 @@
 ---
 sudo: false
 rvm:
-- 2.1.5
+- 2.3.1
 gemfile:
-- gemfiles/activerecord-4.2/Gemfile.postgresql
+- gemfiles/activerecord-5.0/Gemfile.postgresql
 env: POSTGRESQL_DB_USER=postgres
 addons:
   postgresql: '9.4'

data/README.md

@@ -55,12 +55,13 @@ schema_plus_pg_indexes is tested on
 
 <!-- SCHEMA_DEV: MATRIX - begin -->
 <!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
-* ruby **2.1.5** with activerecord **4.2**, using **postgresql**
+* ruby **2.3.1** with activerecord **5.0**, using **postgresql**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 
 ## History
 
+* v0.2.0  - Support Rails 5 (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-4.2 → activerecord-5.0}/Gemfile.base

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

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

@@ -2,44 +2,35 @@ module SchemaPlusPgIndexes
   module Middleware
     module Postgresql
       module Dumper
-
-        module Indexes
+        module Table
 
           # Dump index extensions
           def after(env)
-            index_defs = Dumper.get_index_definitions(env, env.table)
+            index_defs = env.connection.indexes(env.table.name)
 
-            env.table.indexes.each do |index_dump|
-              index_def = index_defs.find(&its.name == index_dump.name)
-              index_dump.options[:case_sensitive] = false unless index_def.case_sensitive?
-              index_dump.options[:expression] = index_def.expression if index_def.expression and index_def.case_sensitive?
+            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
-                  index_dump.options[:operator_class] = index_def.operator_classes.values.first
+                  options[:operator_class] = index_def.operator_classes.values.first
                 else
-                  index_dump.options[:operator_class] = index_def.operator_classes
+                  options[:operator_class] = index_def.operator_classes
                 end
               end
             end
-          end
-        end
 
-        module Table
-
-          # Move index definitions inline
-          def after(env)
-            index_defs = Dumper.get_index_definitions(env, env.table)
+            env.table.columns.each do |column_dump|
+              index = column_dump.options[:index]
+              set_index_options(index[:name], index, index_defs) if index
+            end
 
-            env.table.indexes.select(&its.columns.blank?).each do |index|
-              env.table.statements << "t.index #{{name: index.name}.merge(index.options).to_s.sub(/^{(.*)}$/, '\1')}"
-              env.table.indexes.delete(index)
+            env.table.indexes.each do |index_dump|
+              set_index_options(index_dump.name, index_dump.options, index_defs)
             end
           end
-        end
 
-        def self.get_index_definitions(env, table_dump)
-          env.dump.data.index_definitions ||= {}
-          env.dump.data.index_definitions[table_dump.name] ||= env.connection.indexes(table_dump.name)
         end
       end
     end

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

@@ -53,7 +53,7 @@ module SchemaPlusPgIndexes
 
             env.index_definitions += result.map do |(index_name, unique, indkey, inddef, oid, using, conditions, expression, indclass)|
               index_keys = indkey.split(" ")
-              opclasses = indclass.split(" ")
+              opclasses = indclass.split(" ").map(&:to_i)
 
               rows = env.connection.query(<<-SQL, 'SCHEMA')
                 SELECT CAST(a.attnum as VARCHAR), a.attname, t.typname
@@ -98,14 +98,14 @@ module SchemaPlusPgIndexes
               orders = desc_order_columns.any? ? Hash[column_names.map {|column| [column, desc_order_columns.include?(column) ? :desc : :asc]}] : {}
 
               ::ActiveRecord::ConnectionAdapters::IndexDefinition.new(env.table_name, column_names,
-                                                                      :name => index_name,
-                                                                      :unique => (unique == 't'),
-                                                                      :orders => orders,
-                                                                      :where => conditions,
-                                                                      :case_sensitive => case_sensitive,
-                                                                      :using => using.downcase == "btree" ? nil : using.to_sym,
-                                                                      :operator_classes => operator_classes,
-                                                                      :expression => expression)
+                                                                      name:             index_name,
+                                                                      unique:           unique,
+                                                                      orders:           orders,
+                                                                      where:            conditions,
+                                                                      case_sensitive:   case_sensitive,
+                                                                      using:            using.downcase == "btree" ? nil : using.to_sym,
+                                                                      operator_classes: operator_classes,
+                                                                      expression:       expression)
             end
           end
 

data/lib/schema_plus_pg_indexes/version.rb

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

data/schema_dev.yml

@@ -1,6 +1,6 @@
 ruby:
-    - 2.1.5
+    - 2.3.1
 activerecord:
-    - 4.2
+    - 5.0
 db:
     - postgresql

data/schema_plus_pg_indexes.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "activerecord", "~> 4.2"
-  gem.add_dependency "schema_plus_indexes", "~> 0.1", ">= 0.1.3"
-  gem.add_dependency "schema_plus_core", "~> 1.0"
+  gem.add_dependency "activerecord", "~> 5.0"
+  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"
 
   gem.add_development_dependency "bundler", "~> 1.7"

data/spec/schema_dumper_spec.rb

@@ -54,7 +54,7 @@ describe "Schema dump" do
 
     it "should define index with type cast" do
       with_index Post, [:integer_col], :name => "index_with_type_cast", :expression => "LOWER(integer_col::text)" do
-        expect(dump_posts).to include(%q{t.index :name=>"index_with_type_cast", :expression=>"lower((integer_col)::text)"})
+        expect(dump_posts).to include(%q{t.index [], :name=>"index_with_type_cast", :expression=>"lower((integer_col)::text)"})
       end
     end
 
@@ -82,7 +82,7 @@ describe "Schema dump" do
 
     it "should define expression" do
       with_index Post, :name => "posts_freaky_index", :expression => "USING hash (least(id, user_id))" do
-        expect(dump_posts).to include(%q{t.index :name=>"posts_freaky_index", :using=>:hash, :expression=>"LEAST(id, user_id)"})
+        expect(dump_posts).to include(%q{t.index [], :name=>"posts_freaky_index", :using=>:hash, :expression=>"LEAST(id, user_id)"})
       end
     end
 
@@ -101,7 +101,7 @@ describe "Schema dump" do
 
     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"})
+        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
 
@@ -126,14 +126,14 @@ describe "Schema dump" do
 
     it "should dump unique: true with expression (Issue #142)" do
       with_index Post, :name => "posts_user_body_index", :unique => true, :expression => "BTRIM(LOWER(body))" do
-        expect(dump_posts).to include(%q{t.index :name=>"posts_user_body_index", :unique=>true, :expression=>"btrim(lower(body))"})
+        expect(dump_posts).to include(%q{t.index [], :name=>"posts_user_body_index", :unique=>true, :expression=>"btrim(lower(body))"})
       end
     end
 
 
     it "should not define :case_sensitive => false with non-trivial expression" do
       with_index Post, :name => "posts_user_body_index", :expression => "BTRIM(LOWER(body))" do
-        expect(dump_posts).to include(%q{t.index :name=>"posts_user_body_index", :expression=>"btrim(lower(body))"})
+        expect(dump_posts).to include(%q{t.index [], :name=>"posts_user_body_index", :expression=>"btrim(lower(body))"})
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_pg_indexes
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.2.0
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,48 +16,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: schema_plus_indexes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: schema_plus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: its-it
   requirement: !ruby/object:Gem::Requirement
@@ -170,8 +170,8 @@ files:
 - README.md
 - Rakefile
 - gemfiles/Gemfile.base
-- gemfiles/activerecord-4.2/Gemfile.base
-- gemfiles/activerecord-4.2/Gemfile.postgresql
+- gemfiles/activerecord-5.0/Gemfile.base
+- gemfiles/activerecord-5.0/Gemfile.postgresql
 - lib/schema_plus_pg_indexes.rb
 - lib/schema_plus_pg_indexes/active_record/connection_adapters/index_definition.rb
 - lib/schema_plus_pg_indexes/active_record/connection_adapters/postgresql_adapter.rb
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Adds support in ActiveRecord for PostgreSQL index expressions and operator