postgres_ext 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3246d3eb02a37797d39a1e4c9eb7ef17e010b2b
-  data.tar.gz: 569c3f94c31b6b7979eb95da5d5ab2dcb5f376cb
+  metadata.gz: 98ff2c9bb400e566e90b0eee78c7fbc3c4d20626
+  data.tar.gz: 235aeec3bafdf81928a2abadd4e19dcfdfcf26dd
 SHA512:
-  metadata.gz: 5ab51fcf131d599a871238d2fd1738b43fc316df96f2810a9045bf513d515e29bfa13008077cf7cccf4349bd7cfbf569812156b9cd62c764d0a830328810dd9d
-  data.tar.gz: ba34c9e19290e4691dc28c337dc7aaa13b121b0fff51499a4720e16f816609e140115508f02c0a959971e74597ad46202822a7fabbb360d3b2d9c402ac533709
+  metadata.gz: 2fbaa25ab99012bea7aa49c91c95ccd088f8abe1b51a78b584454e661073224082782eeedca079b6d763d0fd0ac9a1ed44cfc5cd616eaa5440ab9d2b5bbbbbf5
+  data.tar.gz: 8991fc711864a429fcc3b95a9a76dbcd353f5723597d3027651934d5ef36208dcdf9fa3ee173dae52e821757582c7d2e39431326ad4971150564fe0ae47cd425

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.4.1
+
+ * Fixes error when creating a join between STI related models - edpaget
+
 ## 2.4.0
 
  * Fixes missing CTEProxy delegate - eidge

data/Rakefile

@@ -116,6 +116,8 @@ namespace :db do
       t.string   "categories",         array: true
       t.datetime "created_at"
       t.datetime "updated_at"
+      t.integer  "parent_id"
+      t.string   "type"
     end
 
     puts 'Database migrated'

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

@@ -7,7 +7,7 @@ module ActiveRecord
       when Array
         engine = attribute.relation.engine
         column = engine.connection.schema_cache.columns(attribute.relation.name).detect{ |col| col.name.to_s == attribute.name.to_s }
-        if column && column.array
+        if column && column.respond_to?(:array) && column.array
           attribute.eq(value)
         else
           values = value.to_a.map {|x| x.is_a?(Base) ? x.id : x}

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

@@ -12,7 +12,7 @@ module ActiveRecord
         def call_with_feature(attribute, value)
           engine = attribute.relation.engine
           column = engine.connection.schema_cache.columns(attribute.relation.name).detect{ |col| col.name.to_s == attribute.name.to_s }
-          if column.array
+          if column && column.respond_to?(:array) && column.array
             attribute.eq(value)
           else
             call_without_feature(attribute, value)

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

@@ -6,7 +6,16 @@ module Arel
       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
+        column = case a.try(:relation)
+                 when Arel::Nodes::TableAlias, NilClass
+                 # noop Prevent from searching for table alias name in schema cache
+                 # which won't exist for aliased table when used with Single Table
+                 # Inheritance. see dockyard/postgres_ext#154
+                 else
+                   a.relation.engine.connection.schema_cache.columns(a.relation.name)
+                     .find { |col| col.name == a.name.to_s }
+                 end
+        
         if column && column.respond_to?(:array) && column.array
           quoted o, a
         else

data/lib/postgres_ext/version.rb

@@ -1,3 +1,3 @@
 module PostgresExt
-  VERSION = '2.4.0'
+  VERSION = '2.4.1'
 end

data/test/queries/join_query_test.rb

@@ -0,0 +1,10 @@
+require 'test_helper'
+
+describe "Join queries" do
+  describe ".joins(:parent_tag) with STI" do
+    it 'returns a valid sql query' do
+      query = ChildTag.joins(:parent_tag).to_sql
+      query.must_match("SELECT \"tags\".* FROM \"tags\" INNER JOIN \"tags\" \"parent_tags_tags\" ON \"parent_tags_tags\".\"id\" = \"tags\".\"parent_id\" AND \"parent_tags_tags\".\"type\" IN ('ParentTag') WHERE \"tags\".\"type\" IN ('ChildTag')")
+    end
+  end
+end

data/test/test_helper.rb

@@ -27,6 +27,13 @@ class Tag < ActiveRecord::Base
   belongs_to :person
 end
 
+class ParentTag < Tag
+end
+
+class ChildTag < Tag
+  belongs_to :parent_tag, foreign_key: :parent_id
+end
+
 DatabaseCleaner.strategy = :deletion
 
 class MiniTest::Spec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postgres_ext
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Dan McClain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -195,6 +195,7 @@ files:
 - test/queries/array_queries_test.rb
 - test/queries/common_table_expression_test.rb
 - test/queries/contains_test.rb
+- test/queries/join_query_test.rb
 - test/queries/sanity_test.rb
 - test/queries/window_functions_test.rb
 - test/test_helper.rb
@@ -228,6 +229,7 @@ test_files:
 - test/queries/array_queries_test.rb
 - test/queries/common_table_expression_test.rb
 - test/queries/contains_test.rb
+- test/queries/join_query_test.rb
 - test/queries/sanity_test.rb
 - test/queries/window_functions_test.rb
 - test/test_helper.rb