Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes bug when table do not exists (join) #164

Closed
wants to merge 6 commits into from
Closed

Fixes bug when table do not exists (join) #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ccc68ef
Update array_handler.rb
imton May 17, 2015
9ee58a5
Update predicate_builder.rb
imton May 17, 2015
4a6fdf7
Update postgresql.rb
imton May 17, 2015
84f1b80
Update array_handler.rb
imton May 17, 2015
3ab9d2f
Update predicate_builder.rb
imton May 17, 2015
2152f8b
Update Gemfile
imton May 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 1 addition & 5 deletions Gemfile
View file
Open in desktop
Expand Up @@ -3,10 +3,6 @@ source 'https://rubygems.org'
# Specify your gem's dependencies in postgres_ext.gemspec
gemspec
unless ENV['CI']
if RUBY_PLATFORM =~ /java/
gem 'ruby-debug'
else
gem 'byebug'
end
gem 'byebug'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@danmcclain I'm going to clean this PR up and merge it since it seems useful. Do you want this part in the final result?

end
gem 'fivemat'
10 changes: 8 additions & 2 deletions lib/postgres_ext/active_record/relation/predicate_builder.rb
View file
Open in desktop
Expand Up @@ -5,8 +5,14 @@ class PredicateBuilder # :nodoc:
def self.build(attribute, value)
case value
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 }
column = case attribute.try(:relation)
when Arel::Nodes::TableAlias, NilClass
else
cache = attribute.relation.engine.connection.schema_cache
if cache.table_exists? attribute.relation.name
cache.columns(attribute.relation.name).detect{ |col| col.name.to_s == attribute.name.to_s }
end
end
if column && column.respond_to?(:array) && column.array
attribute.eq(value)
else
Expand Down
10 changes: 8 additions & 2 deletions lib/postgres_ext/active_record/relation/predicate_builder/array_handler.rb
View file
Open in desktop
Expand Up @@ -10,8 +10,14 @@ module ArrayHandlerPatch

included do
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 }
column = case attribute.try(:relation)
when Arel::Nodes::TableAlias, NilClass
else
cache = attribute.relation.engine.connection.schema_cache
if cache.table_exists? attribute.relation.name
cache.columns(attribute.relation.name).detect{ |col| col.name.to_s == attribute.name.to_s }
end
end
if column && column.respond_to?(:array) && column.array
attribute.eq(value)
else
Expand Down
8 changes: 5 additions & 3 deletions lib/postgres_ext/arel/4.1/visitors/postgresql.rb
View file
Open in desktop
Expand Up @@ -5,15 +5,17 @@ module Visitors
class PostgreSQL
private

def visit_Array o, a
def visit_Array o, a
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please kill the whitespace at the end of this line

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 }
cache = a.relation.engine.connection.schema_cache
if cache.table_exists? a.relation.name
cache.columns(a.relation.name).find { |col| col.name == a.name.to_s }
end
end

if column && column.respond_to?(:array) && column.array
Expand Down