postgres_ext 2.3.0 → 2.4.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f8878d742f2c1d692cca006bbd3fe55dfb69e1d
-  data.tar.gz: 64ae985d2dae1389ee05b0c843b2ad8d578d1ffc
+  metadata.gz: 45761b40db17573204e88b48c6eb91c135968fde
+  data.tar.gz: d774a33f235ac5f450df26f6f517575ba1360bed
 SHA512:
-  metadata.gz: 1a8cd94d52fce6e7dbf5472899b1a1f45b9328fbf31e42a912c4ec4cf10880d2e398f0f954bf9ab49fea5e503c11a660f6ee89fbf690162e2bf3c96d64a338bc
-  data.tar.gz: 66a9c9c002c548b0920657f243c6c23ea04a4468666b3799f5bc52ea76b25d0f47f2e84ec8071e2f818638f6af12e804223994e515456540b1eab9f38cbadcab
+  metadata.gz: c2b883ca3787352f2d6394d45116485565b4c0631b3f84e17405949cbd63049201c087860e470d88b3cad19e849f841b32d3537d5dfef29162d3e153bfb40538
+  data.tar.gz: 7f0224e503f2d0883aae7974b94de5366d612cba43ad4e243e1bf7d16bbffc5d3e2562eae66ad60e55af76915c5c7b1d45907d3652e607471f9e803d77994128

data/.travis.yml

@@ -5,6 +5,7 @@ rvm:
 gemfile:
   - gemfiles/Gemfile.activerecord-4.0.x
   - gemfiles/Gemfile.activerecord-4.1.x
+  - gemfiles/Gemfile.activerecord-4.2.x
 
 env: DATABASE_URL=postgres://postgres@localhost/postgres_ext_test
 

data/Rakefile

@@ -38,7 +38,7 @@ namespace :test do
   desc 'Test against all supported ActiveRecord versions'
   task :all do
     # Currently only supports Active Record v4.0
-    %w(4.0.x 4.1.x).each do |version|
+    %w(4.0.x 4.1.x 4.2.x).each do |version|
       sh "BUNDLE_GEMFILE='gemfiles/Gemfile.activerecord-#{version}' bundle install --quiet"
       sh "BUNDLE_GEMFILE='gemfiles/Gemfile.activerecord-#{version}' bundle exec rake test"
     end

data/gemfiles/Gemfile.activerecord-4.2.x

@@ -0,0 +1,9 @@
+source "https://rubygems.org"
+
+gemspec :path => '..'
+
+gem "activerecord", "~> 4.2.0.beta2"
+
+unless ENV['CI'] || RUBY_PLATFORM =~ /java/
+  gem 'byebug'
+end

data/lib/postgres_ext/active_record/cte_proxy.rb

@@ -22,34 +22,9 @@ class CTEProxy
     name
   end
 
-  def column_names
-    @model.column_names
-  end
-
-  def columns_hash
-    @model.columns_hash
-  end
-
-  def model_name
-    @model.model_name
-  end
-
-  def primary_key
-    @model.primary_key
-  end
-
-  def attribute_alias?(*args)
-    @model.attribute_alias?(*args)
-  end
-
-  def aggregate_reflections(*args)
-    @model.aggregate_reflections(*args)
-  end
-
-  def instantiate(record, column_types = {})
-    @model.instantiate(record, column_types)
-  end
-
+  delegate :column_names, :columns_hash, :model_name, :primary_key, :attribute_alias?,
+    :aggregate_reflections, :instantiate, :type_for_attribute, to: :@model
+  
   private
 
   def reflections

data/lib/postgres_ext/active_record/relation/predicate_builder.rb

@@ -8,7 +8,7 @@ module ActiveRecord
       case value
       when Array
         engine = attribute.relation.engine
-        column = engine.connection.columns(attribute.relation.name).detect{ |col| col.name.to_s == attribute.name.to_s }
+        column = engine.connection.schema_cache.columns(attribute.relation.name).detect{ |col| col.name.to_s == attribute.name.to_s }
         if column && column.array
           attribute.eq(value)
         else

data/lib/postgres_ext/active_record/relation/query_methods.rb

@@ -147,7 +147,6 @@ module ActiveRecord
     end
 
     def build_with(arel)
-      visitor = arel.engine.connection.visitor
       with_statements = with_values.flat_map do |with_value|
         case with_value
         when String
@@ -156,13 +155,11 @@ module ActiveRecord
           with_value.map  do |name, expression|
             case expression
             when String
-              select = Arel::SqlLiteral.new "(#{expression})"
-            when ActiveRecord::Relation
-              select = Arel::SqlLiteral.new "(#{expression.to_sql})"
-            when Arel::SelectManager
-              select = Arel::SqlLiteral.new visitor.accept(expression)
+              select = Arel::Nodes::SqlLiteral.new "(#{expression})"
+            when ActiveRecord::Relation, Arel::SelectManager
+              select = Arel::Nodes::SqlLiteral.new "(#{expression.to_sql})"
             end
-            as = Arel::Nodes::As.new Arel::SqlLiteral.new("\"#{name.to_s}\""), select
+            Arel::Nodes::As.new Arel::Nodes::SqlLiteral.new("\"#{name.to_s}\""), select
           end
         end
       end

data/lib/postgres_ext/arel/{visitors/visitor.rb → 4.1/visitors/postgresql.rb}

@@ -1,9 +1,19 @@
-require 'arel/visitors/visitor'
+require 'arel/visitors/postgresql'
+
 module Arel
   module Visitors
-    class Visitor
-      # We are adding our visitors to the main visitor for the time being until the right spot is found to monkey patch
+    class PostgreSQL
       private
+      
+      def visit_Array o, a
+        column = a.relation.engine.connection.schema_cache.columns(a.relation.name).find { |col| col.name == a.name.to_s } if a
+        if column && column.respond_to?(:array) && column.array
+          quoted o, a
+        else
+          o.empty? ? 'NULL' : o.map { |x| visit x }.join(', ')
+        end
+      end
+      
       def visit_Arel_Nodes_ContainedWithin o, a = nil
         "#{visit o.left, a} << #{visit o.right, o.left}"
       end

data/lib/postgres_ext/arel/4.1/visitors.rb

@@ -0,0 +1 @@
+require 'postgres_ext/arel/4.1/visitors/postgresql'

data/lib/postgres_ext/arel/4.2/predications.rb

@@ -0,0 +1,35 @@
+require 'arel/predications'
+
+module Arel
+  module Predications
+    def contained_within(other)
+      Nodes::ContainedWithin.new self, Nodes.build_quoted(other, self)
+    end
+
+    def contained_within_or_equals(other)
+      Nodes::ContainedWithinEquals.new self, Nodes.build_quoted(other, self)
+    end
+
+    def contains(other)
+      Nodes::Contains.new self, Nodes.build_quoted(other, self)
+    end
+
+    def contains_or_equals(other)
+      Nodes::ContainsEquals.new self, Nodes.build_quoted(other, self)
+    end
+
+    def overlap(other)
+      Nodes::Overlap.new self, Nodes.build_quoted(other, self)
+    end
+
+    def any(other)
+      any_tags_function = Arel::Nodes::NamedFunction.new('ANY', [self])
+      Arel::Nodes::Equality.new(Nodes.build_quoted(other, self), any_tags_function)
+    end
+
+    def all(other)
+      any_tags_function = Arel::Nodes::NamedFunction.new('ALL', [self])
+      Arel::Nodes::Equality.new(Nodes.build_quoted(other, self), any_tags_function)
+    end
+  end
+end

data/lib/postgres_ext/arel/4.2/visitors/postgresql.rb

@@ -0,0 +1,39 @@
+require 'arel/visitors/postgresql'
+
+module Arel
+  module Visitors
+    class PostgreSQL
+      private
+     
+      def visit_Arel_Nodes_ContainedWithin o, collector
+        infix_value o, collector, " << " 
+      end
+
+      def visit_Arel_Nodes_ContainedWithinEquals o, collector
+        infix_value o, collector, " <<= " 
+      end
+
+      def visit_Arel_Nodes_Contains o, collector
+        left_column = o.left.relation.engine.columns.find { |col| col.name == o.left.name.to_s }
+
+        if left_column && (left_column.type == :hstore || (left_column.respond_to?(:array) && left_column.array))
+          infix_value o, collector, " @> " 
+        else
+          infix_value o, collector, " >> " 
+        end
+      end
+
+      def visit_Arel_Nodes_ContainsEquals o, collector
+        infix_value o, collector, " >>= " 
+      end
+
+      def visit_Arel_Nodes_Overlap o, collector
+        infix_value o, collector, " && "
+      end
+
+      def visit_IPAddr value, collector
+        collector << quote("#{value.to_s}/#{value.instance_variable_get(:@mask_addr).to_s(2).count('1')}")
+      end
+    end
+  end
+end

data/lib/postgres_ext/arel/4.2/visitors.rb

@@ -0,0 +1 @@
+require 'postgres_ext/arel/4.2/visitors/postgresql'

data/lib/postgres_ext/arel.rb

@@ -1,3 +1,14 @@
+## TODO: Change to ~> 4.2.0 on gem release
+
+gdep = Gem::Dependency.new('activerecord', '~> 4.2.0.beta2')
+ar_version_cutoff = gdep.matching_specs.sort_by(&:version).last
+
 require 'postgres_ext/arel/nodes'
-require 'postgres_ext/arel/predications'
-require 'postgres_ext/arel/visitors'
+if ar_version_cutoff
+  require 'postgres_ext/arel/4.2/predications'
+  require 'postgres_ext/arel/4.2/visitors'
+else
+  require 'postgres_ext/arel/4.1/predications'
+  require 'postgres_ext/arel/4.1/visitors'
+end
+

data/lib/postgres_ext/version.rb

@@ -1,3 +1,3 @@
 module PostgresExt
-  VERSION = '2.3.0'
+  VERSION = '2.4.0.beta.1'
 end

data/test/arel/array_test.rb

@@ -32,7 +32,7 @@ describe 'Array Column Predicates' do
 
   describe 'Array Overlap' do
     it 'converts Arel overlap statement' do
-      arel_table.where(arel_table[:tags].overlap(['tag','tag 2'])).to_sql.must_match /&& '\{"tag","tag 2"\}'/
+      arel_table.where(arel_table[:tags].overlap(['tag','tag 2'])).to_sql.must_match /&& '\{"?tag"?,"tag 2"\}'/
     end
 
     it 'converts Arel overlap statement' do
@@ -61,7 +61,7 @@ describe 'Array Column Predicates' do
 
   describe 'Array Contains' do
     it 'converts Arel contains statement and escapes strings' do
-      arel_table.where(arel_table[:tags].contains(['tag','tag 2'])).to_sql.must_match /@> '\{"tag","tag 2"\}'/
+      arel_table.where(arel_table[:tags].contains(['tag','tag 2'])).to_sql.must_match /@> '\{"?tag"?,"tag 2"\}'/
     end
 
     it 'converts Arel contains statement with numbers' do

data/test/queries/array_queries_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 describe 'Array queries' do
-  let(:equality_regex) { %r{\"people\"\.\"tags\" = '\{\"working\"\}'} }
+  let(:equality_regex) { %r{\"people\"\.\"tags\" = '\{"?working"?\}'} }
   let(:overlap_regex)  { %r{\"people\"\.\"tag_ids\" && '\{1,2\}'} }
   let(:any_regex)      { %r{2 = ANY\(\"people\"\.\"tag_ids\"\)} }
   let(:all_regex)      { %r{2 = ALL\(\"people\"\.\"tag_ids\"\)} }

data/test/queries/common_table_expression_test.rb

@@ -4,22 +4,22 @@ describe 'Common Table Expression queries' do
   describe '.with(common_table_expression_hash)' do
     it 'generates an expression with the CTE' do
       query = Person.with(lucky_number_seven: Person.where(lucky_number: 7)).joins('JOIN lucky_number_seven ON lucky_number_seven.id = people.id')
-      query.to_sql.must_equal 'WITH "lucky_number_seven" AS (SELECT "people".* FROM "people"  WHERE "people"."lucky_number" = 7) SELECT "people".* FROM "people" JOIN lucky_number_seven ON lucky_number_seven.id = people.id'
+      query.to_sql.must_match(/WITH "lucky_number_seven" AS \(SELECT "people".* FROM "people"(\s+)WHERE "people"."lucky_number" = 7\) SELECT "people".* FROM "people" JOIN lucky_number_seven ON lucky_number_seven.id = people.id/)
     end
 
     it 'generates an expression with multiple CTEs' do
       query = Person.with(lucky_number_seven: Person.where(lucky_number: 7), lucky_number_three: Person.where(lucky_number: 3)).joins('JOIN lucky_number_seven ON lucky_number_seven.id = people.id').joins('JOIN lucky_number_three ON lucky_number_three.id = people.id')
-      query.to_sql.must_equal 'WITH "lucky_number_seven" AS (SELECT "people".* FROM "people"  WHERE "people"."lucky_number" = 7), "lucky_number_three" AS (SELECT "people".* FROM "people"  WHERE "people"."lucky_number" = 3) SELECT "people".* FROM "people" JOIN lucky_number_seven ON lucky_number_seven.id = people.id JOIN lucky_number_three ON lucky_number_three.id = people.id'
+      query.to_sql.must_match(/WITH "lucky_number_seven" AS \(SELECT "people".* FROM "people"(\s+)WHERE "people"."lucky_number" = 7\), "lucky_number_three" AS \(SELECT "people".* FROM "people"(\s+)WHERE "people"."lucky_number" = 3\) SELECT "people".* FROM "people" JOIN lucky_number_seven ON lucky_number_seven.id = people.id JOIN lucky_number_three ON lucky_number_three.id = people.id/)
     end
 
     it 'generates an expression with multiple with calls' do
       query = Person.with(lucky_number_seven: Person.where(lucky_number: 7)).with(lucky_number_three: Person.where(lucky_number: 3)).joins('JOIN lucky_number_seven ON lucky_number_seven.id = people.id').joins('JOIN lucky_number_three ON lucky_number_three.id = people.id')
-      query.to_sql.must_equal 'WITH "lucky_number_seven" AS (SELECT "people".* FROM "people"  WHERE "people"."lucky_number" = 7), "lucky_number_three" AS (SELECT "people".* FROM "people"  WHERE "people"."lucky_number" = 3) SELECT "people".* FROM "people" JOIN lucky_number_seven ON lucky_number_seven.id = people.id JOIN lucky_number_three ON lucky_number_three.id = people.id'
+      query.to_sql.must_match(/WITH "lucky_number_seven" AS \(SELECT "people".* FROM "people"(\s+)WHERE "people"."lucky_number" = 7\), "lucky_number_three" AS \(SELECT "people".* FROM "people"(\s+)WHERE "people"."lucky_number" = 3\) SELECT "people".* FROM "people" JOIN lucky_number_seven ON lucky_number_seven.id = people.id JOIN lucky_number_three ON lucky_number_three.id = people.id/)
     end
 
     it 'generates an expression with recursive' do
       query = Person.with.recursive(lucky_number_seven: Person.where(lucky_number: 7)).joins('JOIN lucky_number_seven ON lucky_number_seven.id = people.id')
-      query.to_sql.must_equal 'WITH RECURSIVE "lucky_number_seven" AS (SELECT "people".* FROM "people"  WHERE "people"."lucky_number" = 7) SELECT "people".* FROM "people" JOIN lucky_number_seven ON lucky_number_seven.id = people.id'
+      query.to_sql.must_match(/WITH RECURSIVE "lucky_number_seven" AS \(SELECT "people".* FROM "people"(\s+)WHERE "people"."lucky_number" = 7\) SELECT "people".* FROM "people" JOIN lucky_number_seven ON lucky_number_seven.id = people.id/)
     end
 
     it 'accepts Arel::SelectMangers' do
@@ -34,7 +34,7 @@ describe 'Common Table Expression queries' do
   describe '.from_cte(common_table_expression_hash)' do
     it 'generates an expression with the CTE as the main table' do
       query = Person.from_cte('lucky_number_seven', Person.where(lucky_number: 7)).where(id: 5)
-      query.to_sql.must_equal 'WITH "lucky_number_seven" AS (SELECT "people".* FROM "people"  WHERE "people"."lucky_number" = 7) SELECT "lucky_number_seven".* FROM "lucky_number_seven"  WHERE "lucky_number_seven"."id" = 5'
+      query.to_sql.must_match(/WITH "lucky_number_seven" AS \(SELECT "people".* FROM "people"(\s+)WHERE "people"."lucky_number" = 7\) SELECT "lucky_number_seven".* FROM "lucky_number_seven"(\s+)WHERE "lucky_number_seven"."id" = 5/)
     end
 
     it 'returns instances of the model' do

data/test/queries/contains_test.rb

@@ -7,7 +7,7 @@ describe 'Contains queries' do
   let(:contains_array_regex)          { %r{\"people\"\.\"tag_ids\" @> '\{1,2\}'} }
   let(:contains_hstore_regex)         { %r{\"people\"\.\"data\" @> '\"nickname\"=>"Dan"'} }
   let(:contains_equals_regex)         { %r{\"people\"\.\"ip\" >>= '127.0.0.1'} }
-  let(:equality_regex) { %r{\"people\"\.\"tags\" = '\{\"working\"\}'} }
+  let(:equality_regex) { %r{\"people\"\.\"tags\" = '\{"?working"?\}'} }
 
   describe '.where.contained_within(:column, value)' do
     it 'generates the appropriate where clause' do

data/test/queries/sanity_test.rb

@@ -17,8 +17,8 @@ describe 'Ensure that we don\'t stomp on Active Record\'s queries' do
 
   describe '.where(joins: { column: [] })' do
     it 'generates IN clause for non array columns' do
-      query = Person.joins(:hm_tags).where(tags: { id: ['working'] }).to_sql
-      query.must_match /WHERE "tags"\."id" IN \('working'\)/
+      query = Person.joins(:hm_tags).where(tags: { id: [1,2,3] }).to_sql
+      query.must_match /WHERE "tags"\."id" IN \(1, 2, 3\)/
     end
   end
 

data/test/queries/window_functions_test.rb

@@ -4,12 +4,12 @@ describe 'Window functions' do
   describe 'ranked' do
     it 'uses the order when no order is passed to ranked' do
       query = Person.order(lucky_number: :desc).ranked
-      query.to_sql.must_equal 'SELECT "people".*, rank() OVER (ORDER BY "people"."lucky_number" DESC) FROM "people"   ORDER BY "people"."lucky_number" DESC'
+      query.to_sql.must_match(/SELECT "people".*, rank\(\) OVER \(ORDER BY "people"."lucky_number" DESC\) FROM "people"(\s+)ORDER BY "people"."lucky_number" DESC/)
     end
 
     it 'uses the order when no order is passed to ranked, swapped calls' do
       query = Person.ranked.order(lucky_number: :desc)
-      query.to_sql.must_equal 'SELECT "people".*, rank() OVER (ORDER BY "people"."lucky_number" DESC) FROM "people"   ORDER BY "people"."lucky_number" DESC'
+      query.to_sql.must_match(/SELECT "people".*, rank\(\) OVER \(ORDER BY "people"."lucky_number" DESC\) FROM "people"(\s+)ORDER BY "people"."lucky_number" DESC/)
     end
 
     it 'uses the rank value when there is an order passed to it' do
@@ -29,7 +29,7 @@ describe 'Window functions' do
 
     it 'combines the order and rank' do
       query = Person.ranked(lucky_number: :desc).order(id: :asc)
-      query.to_sql.must_equal 'SELECT "people".*, rank() OVER (ORDER BY "people"."lucky_number" DESC) FROM "people"   ORDER BY "people"."id" ASC'
+      query.to_sql.must_match(/SELECT "people".*, rank\(\) OVER \(ORDER BY "people"."lucky_number" DESC\) FROM "people"(\s+)ORDER BY "people"."id" ASC/)
     end
 
     it 'executes the query with the rank' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postgres_ext
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0.beta.1
 platform: ruby
 authors:
 - Dan McClain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -168,6 +168,7 @@ files:
 - docs/querying.md
 - gemfiles/Gemfile.activerecord-4.0.x
 - gemfiles/Gemfile.activerecord-4.1.x
+- gemfiles/Gemfile.activerecord-4.2.x
 - lib/postgres_ext.rb
 - lib/postgres_ext/active_record.rb
 - lib/postgres_ext/active_record/cte_proxy.rb
@@ -176,13 +177,15 @@ files:
 - lib/postgres_ext/active_record/relation/predicate_builder.rb
 - lib/postgres_ext/active_record/relation/query_methods.rb
 - lib/postgres_ext/arel.rb
+- lib/postgres_ext/arel/4.1/predications.rb
+- lib/postgres_ext/arel/4.1/visitors.rb
+- lib/postgres_ext/arel/4.1/visitors/postgresql.rb
+- lib/postgres_ext/arel/4.2/predications.rb
+- lib/postgres_ext/arel/4.2/visitors.rb
+- lib/postgres_ext/arel/4.2/visitors/postgresql.rb
 - lib/postgres_ext/arel/nodes.rb
 - lib/postgres_ext/arel/nodes/array_nodes.rb
 - lib/postgres_ext/arel/nodes/contained_within.rb
-- lib/postgres_ext/arel/predications.rb
-- lib/postgres_ext/arel/visitors.rb
-- lib/postgres_ext/arel/visitors/to_sql.rb
-- lib/postgres_ext/arel/visitors/visitor.rb
 - lib/postgres_ext/version.rb
 - postgres_ext.gemspec
 - test/arel/array_test.rb
@@ -208,9 +211,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.0

data/lib/postgres_ext/arel/visitors/to_sql.rb

@@ -1,16 +0,0 @@
-require 'arel/visitors/to_sql'
-
-module Arel
-  module Visitors
-    class ToSql
-      def visit_Array o, a
-        column = a.relation.engine.connection.columns(a.relation.name).find { |col| col.name == a.name.to_s } if a
-        if column && column.respond_to?(:array) && column.array
-          quoted o, a
-        else
-          o.empty? ? 'NULL' : o.map { |x| visit x }.join(', ')
-        end
-      end
-    end
-  end
-end

data/lib/postgres_ext/arel/visitors.rb

@@ -1,2 +0,0 @@
-require 'postgres_ext/arel/visitors/visitor'
-require 'postgres_ext/arel/visitors/to_sql'