schema_plus_pg_indexes 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab9e97841907e541e956b5913588e9da67ac61a3
-  data.tar.gz: 24f847eed723f93c188de98e38bdf32380a1b681
+  metadata.gz: b2b5b828916853a511caa4f8b19f8a7e79fe8442
+  data.tar.gz: 5ff7110ccc48476917619787863700670b89c0f7
 SHA512:
-  metadata.gz: 7b37d277f416c7bbbcafe1228cf0e96d8d7cc11f10d3e880076c587eef9a2d0d9e159091ed7d69f372bea5cc752d86e01796ea7019eabbc67c16ea27413c0f42
-  data.tar.gz: c162ca9beb5865f541193730ba48d1bb28566c8a874cbc45fe851b60ee4521d6e3f7c1488e9f7b0a6898669b8fc1fa88cb8ad04d223d4fd46ed13d97a77a5448
+  metadata.gz: bbab6a29c45ba788aaf81951efa439b3e9ce2f4de676db318393a1edf08fdeea3e3d3d0098cbe986e912ef6381f20e5850829235e3d097abc52522e7a1abbdd8
+  data.tar.gz: 9ab3c857047c7e6627e3d0888aef4c9b6060f63810e72c2994d05673eb659d52deeb243a98535e9f3861a8780af5a4663dd299b5f7fd53c3fe300299a5eab065

data/.travis.yml

@@ -8,7 +8,7 @@ rvm:
 - 1.9.3
 - 2.1.5
 gemfile:
-- gemfiles/rails-4.2/Gemfile.postgresql
+- gemfiles/activerecord-4.2/Gemfile.postgresql
 env: POSTGRESQL_DB_USER=postgres
 addons:
   postgresql: '9.3'

data/Gemfile

@@ -1,3 +1,5 @@
 source "http://rubygems.org"
 
 gemspec
+
+File.exist?(gemfile_local = File.expand_path('../Gemfile.local', __FILE__)) and eval File.read(gemfile_local), binding, gemfile_local

data/README.md

@@ -33,11 +33,25 @@ 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 **1.9.3** with rails **4.2**, using **postgresql**
-* ruby **2.1.5** with rails **4.2**, using **postgresql**
+* ruby **1.9.3** with activerecord **4.2**, using **postgresql**
+* ruby **2.1.5** with activerecord **4.2**, using **postgresql**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 
+## Deprecations
+
+SchemaPlus 1.8.x provided some options and accessors that are now available
+in rails 4.2, in slightly different form.  SchemaPlusPgIndexes supports the
+SchemaPlus 1.8.x form but issues deprecation warnings in favor of the rails
+form:
+
+* Index definition deprecates these options:
+  * `:conditions` => `:where`
+  * `:kind` => `:using`
+
+* `IndexDefinition` deprecates accessors: 
+  * `#conditions` in favor of `#where`
+  * `#kind` in favor of `#using.to_s`
 
 ## History
 

data/gemfiles/{rails-4.2 → activerecord-4.2}/Gemfile.base

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

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

@@ -3,15 +3,10 @@ module SchemaPlusPgIndexes
     module Postgresql
       module Dumper
 
-        def self.insert
-          SchemaMonkey::Middleware::Dumper::Indexes.append DumpExtensions
-          SchemaMonkey::Middleware::Dumper::Table.append InlineIndexes
-        end
-
-        class DumpExtensions < SchemaMonkey::Middleware::Base
-          def call(env)
-            continue env
+        module Indexes
 
+          # Dump index extensions
+          def after(env)
             index_defs = Dumper.get_index_defiinitions(env, env.table)
 
             env.table.indexes.each do |index_dump|
@@ -32,10 +27,10 @@ module SchemaPlusPgIndexes
           end
         end
 
-        class InlineIndexes < SchemaMonkey::Middleware::Base
-          def call(env)
-            continue env
+        module Table
 
+          # Move index definitions inline
+          def after(env)
             index_defs = Dumper.get_index_defiinitions(env, env.table)
 
             env.table.indexes.select(&its.columns.blank?).each do |index|

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

@@ -7,19 +7,20 @@ module SchemaPlusPgIndexes
           SchemaMonkey::Middleware::Migration::IndexComponentsSql.append DefineExtensions
         end
 
-        class DeprecateArgs < SchemaMonkey::Middleware::Base
-          def call(env)
+        module Index
+          # Deprecate args
+          def before(env)
             {:conditions => :where, :kind => :using}.each do |deprecated, proper|
               if env.options[deprecated]
                 ActiveSupport::Deprecation.warn "ActiveRecord index option #{deprecated.inspect} is deprecated, use #{proper.inspect} instead"
                 env.options[proper] = env.options.delete(deprecated)
               end
             end
-            continue env
           end
         end
 
-        class DefineExtensions < SchemaMonkey::Middleware::Base
+        module IndexComponentsSql
+
           # SchemaPlusPgIndexes provides the following extra options for PostgreSQL
           # indexes:
           # * +:expression+ - SQL expression to index.  column_name can be nil or ommitted, in which case :name must be provided
@@ -33,7 +34,7 @@ module SchemaPlusPgIndexes
           # using <tt>:expression</tt>, this raises an ArgumentError if both
           # are specified simultaneously.
           #
-          def call(env)
+          def around(env)
             options = env.options
             column_names = env.column_names
             table_name = env.table_name
@@ -61,7 +62,7 @@ module SchemaPlusPgIndexes
               end
             end
 
-            continue env
+            yield env
 
             if operator_classes and not operator_classes.is_a? Hash
               operator_classes = Hash[column_names.map {|name| [name, operator_classes]}]

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

@@ -2,11 +2,7 @@ module SchemaPlusPgIndexes
   module Middleware
     module Postgresql
       module Query
-        def self.insert
-          SchemaMonkey::Middleware::Query::Indexes.append LookupExtensions
-        end
-
-        class LookupExtensions < SchemaMonkey::Middleware::Base
+        module Indexes
 
           def get_opclass_names(env, opclasses)
             @opclass_names ||= {}
@@ -21,7 +17,7 @@ module SchemaPlusPgIndexes
             end
           end
 
-          def call(env)
+          def implement(env)
             # Ideally we'd let AR do its stuff and then add the extras.
             #
             # But one of the extras is expressions.  AR completely strips out
@@ -38,24 +34,21 @@ module SchemaPlusPgIndexes
             # query we have the opportunity to handle tables of the form
             # 'namespace.tablename'
             #
-            # So, we use our code and DO NOT DO:
-            #
-            #      continue env
-            #
-            result = env.connection.query(<<-SQL, 'SCHEMA')
+            # So, this replacs the AR implementation
 
-           SELECT distinct i.relname, d.indisunique, d.indkey, pg_get_indexdef(d.indexrelid), t.oid,
-                  m.amname, pg_get_expr(d.indpred, t.oid) as conditions, pg_get_expr(d.indexprs, t.oid) as expression,
-                  d.indclass
-           FROM pg_class t
-           INNER JOIN pg_index d ON t.oid = d.indrelid
-           INNER JOIN pg_class i ON d.indexrelid = i.oid
-           INNER JOIN pg_am m ON i.relam = m.oid
-           WHERE i.relkind = 'i'
-             AND d.indisprimary = 'f'
-             AND t.relname = '#{table_name_without_namespace(env.table_name)}'
-             AND i.relnamespace IN (SELECT oid FROM pg_namespace WHERE nspname = #{namespace_sql(env.table_name)} )
-          ORDER BY i.relname
+            result = env.connection.query(<<-SQL, 'SCHEMA')
+              SELECT distinct i.relname, d.indisunique, d.indkey, pg_get_indexdef(d.indexrelid), t.oid,
+                      m.amname, pg_get_expr(d.indpred, t.oid) as conditions, pg_get_expr(d.indexprs, t.oid) as expression,
+                      d.indclass
+              FROM pg_class t
+              INNER JOIN pg_index d ON t.oid = d.indrelid
+              INNER JOIN pg_class i ON d.indexrelid = i.oid
+              INNER JOIN pg_am m ON i.relam = m.oid
+              WHERE i.relkind = 'i'
+                AND d.indisprimary = 'f'
+                AND t.relname = '#{table_name_without_namespace(env.table_name)}'
+                AND i.relnamespace IN (SELECT oid FROM pg_namespace WHERE nspname = #{namespace_sql(env.table_name)} )
+              ORDER BY i.relname
             SQL
 
             env.index_definitions += result.map do |(index_name, unique, indkey, inddef, oid, using, conditions, expression, indclass)|
@@ -63,10 +56,10 @@ module SchemaPlusPgIndexes
               opclasses = indclass.split(" ")
 
               rows = env.connection.query(<<-SQL, 'SCHEMA')
-              SELECT CAST(a.attnum as VARCHAR), a.attname, t.typname
-              FROM pg_attribute a
-              INNER JOIN pg_type t ON a.atttypid = t.oid
-              WHERE a.attrelid = #{oid}
+                SELECT CAST(a.attnum as VARCHAR), a.attname, t.typname
+                FROM pg_attribute a
+                INNER JOIN pg_type t ON a.atttypid = t.oid
+                WHERE a.attrelid = #{oid}
               SQL
               columns = {}
               types = {}

data/lib/schema_plus_pg_indexes/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlusPgIndexes
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/schema_dev.yml

@@ -1,7 +1,7 @@
 ruby:
     - 1.9.3
     - 2.1.5
-rails:
+activerecord:
     - 4.2
 db:
     - postgresql

data/schema_plus_pg_indexes.gemspec

@@ -18,13 +18,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activerecord", "~> 4.2"
-  spec.add_dependency "schema_monkey", "~> 0.3"
+  spec.add_dependency "schema_monkey", "~> 1.0", ">= 1.0.1"
   spec.add_dependency "schema_plus_indexes", "~> 0.1"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0.0"
-  spec.add_development_dependency "schema_dev", "~> 2.0", ">= 2.0.3"
+  spec.add_development_dependency "schema_dev", "~> 3.0"
   spec.add_development_dependency "simplecov"
   spec.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.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,14 +30,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: schema_plus_indexes
   requirement: !ruby/object:Gem::Requirement
@@ -100,20 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -156,8 +156,8 @@ files:
 - README.md
 - Rakefile
 - gemfiles/Gemfile.base
-- gemfiles/rails-4.2/Gemfile.base
-- gemfiles/rails-4.2/Gemfile.postgresql
+- gemfiles/activerecord-4.2/Gemfile.base
+- gemfiles/activerecord-4.2/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/middleware/postgresql/dumper.rb