squeel 1.1.1 → 1.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3d3196690094de459e3e30179f68ce63ee2032e1
+  data.tar.gz: 827a3e061d72e29cac9b615cbc3fb66c6c1e3462
+SHA512:
+  metadata.gz: fcf69aceda5afe483dfad4a91d40b21d8472b250c5a9eb719afaa6ccc1252d9488d176c0cc9d41d7a68e18a66f0dd5ff33dbcf4d77b59fd12c673e311cae680c
+  data.tar.gz: 6a934cabda1f179d9a920cf4974fe8776b68d4a58578ee2c067ae4f1e7fac78a0989268920e711845d78367d66521c297e0cb8215e5d8fe85b336d275ae0d249

data/.gitignore

@@ -3,3 +3,6 @@
 Gemfile.lock
 pkg/*
 .rvmrc
+.ruby-version
+.ruby-gemset
+script

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format documentation
+--backtrace

data/.travis.yml

@@ -1,8 +1,40 @@
+before_script:
+  - mysql -e "create database squeel_test_examples;"
+  - psql -c "create database squeel_test_examples;" -U postgres
+
+script:
+  - bundle exec rake test:$ADAPTER
+
 rvm:
   - 1.9.3
+  - 2.0.0
+  - 2.1.1
+  - 2.1.2
 
 env:
-  - RAILS=4-0-stable AREL=master
-  - RAILS=3-2-stable AREL=3-0-stable
-  - RAILS=3-1-stable AREL=2-2-stable
-  - RAILS=3-0-stable AREL=2-0-stable
+  global:
+    - SQ_CONFIG_FILE=$TRAVIS_BUILD_DIR/spec/config.travis.yml
+  matrix:
+    - RAILS=master AREL=master ADAPTER=sqlite3
+    - RAILS=4-1-stable AREL=5-0-stable ADAPTER=sqlite3
+    - RAILS=4-0-stable AREL=4-0-stable ADAPTER=sqlite3
+    - RAILS=3-2-stable AREL=3-0-stable ADAPTER=sqlite3
+    - RAILS=3-1-stable AREL=2-2-stable ADAPTER=sqlite3
+    - RAILS=3-0-stable AREL=2-0-stable ADAPTER=sqlite3
+    - RAILS=master AREL=master ADAPTER=mysql
+    - RAILS=4-1-stable AREL=5-0-stable ADAPTER=mysql
+    - RAILS=4-0-stable AREL=4-0-stable ADAPTER=mysql
+    - RAILS=3-2-stable AREL=3-0-stable ADAPTER=mysql
+    - RAILS=3-1-stable AREL=2-2-stable ADAPTER=mysql
+    - RAILS=3-0-stable AREL=2-0-stable ADAPTER=mysql
+    - RAILS=master AREL=master ADAPTER=mysql2
+    - RAILS=4-1-stable AREL=5-0-stable ADAPTER=mysql2
+    - RAILS=4-0-stable AREL=4-0-stable ADAPTER=mysql2
+    - RAILS=3-2-stable AREL=3-0-stable ADAPTER=mysql2
+    - RAILS=3-1-stable AREL=2-2-stable ADAPTER=mysql2
+    - RAILS=master AREL=master ADAPTER=postgresql
+    - RAILS=4-1-stable AREL=5-0-stable ADAPTER=postgresql
+    - RAILS=4-0-stable AREL=4-0-stable ADAPTER=postgresql
+    - RAILS=3-2-stable AREL=3-0-stable ADAPTER=postgresql
+    - RAILS=3-1-stable AREL=2-2-stable ADAPTER=postgresql
+    - RAILS=3-0-stable AREL=2-0-stable ADAPTER=postgresql

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 1.2.1 (Unreleased)
+
+* Run all specs against sqlite, mysql and postgresql!
+* Genereta table names correctly when joining through an association. Fixes#302.
+* Enable Arel nodes in Squeel with "|" operator. Fixes #314.
+* Properly append binds from a relation used in a subquery. Fixes #272.
+
+## 1.2.0 (2014-07-16)
+
+* Add compatibility to Ruby 2.0+ with Rails 4.1 and 4.2.0.alpha.
+  Fixes #301, #305, #307
+* Enable using a relation as a subquery. Fixes #309
+* Bind params correctly in subquery using associations. Fixes #312
+* Use the correct attribute name when finding a Join node. Fixes #273.
+
 ## 1.1.1 (2013-09-03)
 
 * Update relation extensions to support new count behavior in Active Record

data/Gemfile

@@ -3,7 +3,7 @@ gemspec
 
 gem 'rake'
 
-rails = ENV['RAILS'] || '4-0-stable'
+rails = ENV['RAILS'] || 'master'
 arel = ENV['AREL'] || 'master'
 
 arel_opts = case arel

data/README.md

@@ -1,4 +1,4 @@
-# Squeel [![Build Status](https://secure.travis-ci.org/ernie/squeel.png)](http://travis-ci.org/ernie/squeel) [![endorse](http://api.coderwall.com/ernie/endorsecount.png)](http://coderwall.com/ernie)
+# Squeel [![Build Status](https://secure.travis-ci.org/activerecord-hackery/squeel.png)](http://travis-ci.org/activerecord-hackery/squeel) [![endorse](http://api.coderwall.com/ernie/endorsecount.png)](http://coderwall.com/ernie)
 
 Squeel lets you write your Active Record queries with fewer strings, and more Ruby,
 by making the Arel awesomeness that lies beneath Active Record more accessible.
@@ -23,8 +23,10 @@ just a simple example -- Squeel's capable of a whole lot more. Keep reading.
 In your Gemfile:
 
 ```ruby
+# Make sure you are using the latest version of polyamorous
+gem "polyamorous", :git => "git://github.com/activerecord-hackery/polyamorous.git"
 gem "squeel"  # Last officially released gem
-# gem "squeel", :git => "git://github.com/ernie/squeel.git" # Track git repo
+# gem "squeel", :git => "git://github.com/activerecord-hackery/squeel.git" # Track git repo
 ```
 
 Then bundle as usual.
@@ -86,6 +88,24 @@ A Squeel keypath is essentially a more concise and readable alternative to a
 deeply nested hash. For instance, in standard Active Record, you might join several
 associations like this to perform a query:
 
+#### Rails 4+
+
+```ruby
+Person.joins(:articles => {:comments => :person}).references(:all)
+# => SELECT "people".* FROM "people"
+#    LEFT OUTER JOIN "articles" ON "articles"."person_id" = "people"."id"
+#    LEFT OUTER JOIN "comments" ON "comments"."article_id" = "articles"."id"
+#    LEFT OUTER JOIN "people" "people_comments" ON "people_comments"."id" = "comments"."person_id"
+```
+
+With a keypath, this would look like:
+
+```ruby
+Person.joins{articles.comments.person}.references(:all)
+```
+
+#### Rails 3.x
+
 ```ruby
 Person.joins(:articles => {:comments => :person})
 # => SELECT "people".* FROM "people"
@@ -413,6 +433,27 @@ Person.joins{children.parent.children}.
 
 Keypaths were used here for clarity, but nested hashes would work just as well.
 
+You can also use a subquery in a join.
+
+Notice:
+1. Squeel can only accept an ActiveRecord::Relation class of subqueries in a join.
+2. Use the chain with caution. You should call `as` first to get a Nodes::As, then call `on` to get a join node.
+
+```ruby
+subquery = OrderItem.group(:orderable_id).select { [orderable_id, sum(quantity * unit_price).as(amount)] }
+Seat.joins { [payment.outer, subquery.as('seat_order_items').on { id == seat_order_items.orderable_id}.outer] }.
+              select { [seat_order_items.amount, "seats.*"] }
+# => SELECT "seat_order_items"."amount", seats.*
+#    FROM "seats"
+#    LEFT OUTER JOIN "payments" ON "payments"."id" = "seats"."payment_id"
+#    LEFT OUTER JOIN (
+#      SELECT "order_items"."orderable_id",
+#             sum("order_items"."quantity" * "order_items"."unit_price") AS amount
+#      FROM "order_items"
+#      GROUP BY "order_items"."orderable_id"
+#    ) seat_order_items ON "seats"."id" = "seat_order_items"."orderable_id"
+```
+
 ### Functions
 
 You can call SQL functions just like you would call a method in Ruby...
@@ -470,7 +511,7 @@ As you can see, just like functions, these operations can be given aliases.
 To select more than one attribute (or calculated attribute) simply put them into an array:
 
 ```ruby
-p = Person.select{[ name.op('||', '-diddly').as(flanderized_name), 
+p = Person.select{[ name.op('||', '-diddly').as(flanderized_name),
                     coalesce(name, '<no name given>').as(name_with_default) ]}.first
 p.flanderized_name
 # => "Aric Smith-diddly"
@@ -537,9 +578,9 @@ For further information, see
 [this post to the Rails list](https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-core/NQJJzZ7R7S0),
 [this commit](https://github.com/lifo/docrails/commit/50c5005bafe7e43f81a141cd2c512379aec74325) to
 the [Active Record guides](http://edgeguides.rubyonrails.org/active_record_querying.html#hash-conditions),
-[#67](https://github.com/ernie/squeel/issues/67),
-[#75](https://github.com/ernie/squeel/issues/75), and
-[#171](https://github.com/ernie/squeel/issues/171).
+[#67](https://github.com/activerecord-hackery/squeel/issues/67),
+[#75](https://github.com/activerecord-hackery/squeel/issues/75), and
+[#171](https://github.com/activerecord-hackery/squeel/issues/171).
 
 ## Compatibility with MetaWhere
 

data/Rakefile

@@ -4,10 +4,22 @@ require 'rspec/core/rake_task'
 Bundler::GemHelper.install_tasks
 
 RSpec::Core::RakeTask.new(:spec) do |rspec|
-  rspec.rspec_opts = ['--backtrace']
+  rspec.rspec_opts = ['--backtrace', '--color', '--format documentation']
 end
 
-task :default => :spec
+task :default => 'test_sqlite3'
+
+%w(sqlite3 mysql mysql2 postgresql).each do |adapter|
+  namespace :test do
+    task(adapter => ["#{adapter}:env", "spec"])
+  end
+
+  namespace adapter do
+    task(:env) { ENV['SQ_DB'] = adapter }
+  end
+
+  task "test_#{adapter}" => ["#{adapter}:env", "test:#{adapter}"]
+end
 
 desc "Open an irb session with Squeel and the sample data used in specs"
 task :console do

data/lib/squeel.rb

@@ -1,7 +1,16 @@
 require 'squeel/configuration'
+require 'polyamorous'
 
 module Squeel
 
+  if defined?(Arel::InnerJoin)
+    InnerJoin = Arel::InnerJoin
+    OuterJoin = Arel::OuterJoin
+  else
+    InnerJoin = Arel::Nodes::InnerJoin
+    OuterJoin = Arel::Nodes::OuterJoin
+  end
+
   extend Configuration
 
   # Prevent warnings on the console when doing things some might describe as "evil"
@@ -30,7 +39,6 @@ module Squeel
       alias_predicate aliaz, original
     end
   end
-
 end
 
 require 'squeel/dsl'

data/lib/squeel/adapters/active_record.rb

@@ -1,7 +1,6 @@
 case ActiveRecord::VERSION::MAJOR
 when 3, 4
   ActiveRecord::Relation.send :include, Squeel::Nodes::Aliasing
-  require 'squeel/adapters/active_record/join_dependency_extensions'
   require 'squeel/adapters/active_record/base_extensions'
 
   adapter_directory = "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"

data/lib/squeel/adapters/active_record/3.0/join_dependency_extensions.rb

@@ -0,0 +1 @@
+require 'squeel/adapters/active_record/join_dependency_extensions'

data/lib/squeel/adapters/active_record/3.0/relation_extensions.rb

@@ -54,8 +54,9 @@ module Squeel
           end
 
           stashed_association_joins = joins.grep(::ActiveRecord::Associations::ClassMethods::JoinDependency::JoinAssociation)
+          subquery_joins = joins.grep(Nodes::SubqueryJoin)
 
-          non_association_joins = (joins - association_joins - stashed_association_joins)
+          non_association_joins = (joins - association_joins - stashed_association_joins - subquery_joins)
           custom_joins = custom_join_sql(*non_association_joins)
 
           self.join_dependency = JoinDependency.new(@klass, association_joins, custom_joins)
@@ -79,6 +80,16 @@ module Squeel
             relation = relation.join(left, join_type).on(*right)
           end
 
+          subquery_joins.each do |join|
+            relation = relation.
+              join(
+                Arel::Nodes::TableAlias.new(
+                  join.subquery.right,
+                  Arel::Nodes::Grouping.new(join.subquery.left.arel.ast)),
+                join.type).
+              on(*where_visit(join.constraints))
+          end
+
           relation = relation.join(custom_joins)
         end
 

data/lib/squeel/adapters/active_record/3.1/join_dependency_extensions.rb

@@ -0,0 +1 @@
+require 'squeel/adapters/active_record/join_dependency_extensions'

data/lib/squeel/adapters/active_record/3.2/join_dependency_extensions.rb

@@ -0,0 +1 @@
+require 'squeel/adapters/active_record/join_dependency_extensions'

data/lib/squeel/adapters/active_record/4.0/join_dependency_extensions.rb

@@ -0,0 +1 @@
+require 'squeel/adapters/active_record/join_dependency_extensions'

data/lib/squeel/adapters/active_record/4.0/relation_extensions.rb

@@ -30,6 +30,24 @@ module Squeel
           end
         end
 
+        def where_unscoping(target_value)
+          target_value = target_value.to_s
+
+          where_values.reject! do |rel|
+            case rel
+            when Arel::Nodes::In, Arel::Nodes::NotIn, Arel::Nodes::Equality, Arel::Nodes::NotEqual
+              subrelation = (rel.left.kind_of?(Arel::Attributes::Attribute) ? rel.left : rel.right)
+              subrelation.name == target_value
+            when Hash
+              rel.stringify_keys.has_key?(target_value)
+            when Squeel::Nodes::Predicate
+              rel.expr.symbol.to_s == target_value
+            end
+          end
+
+          bind_values.reject! { |col,_| col.name == target_value }
+        end
+
         def build_arel
           arel = Arel::SelectManager.new(table.engine, table)
 
@@ -52,9 +70,49 @@ module Squeel
           arel.from(build_from) if from_value
           arel.lock(lock_value) if lock_value
 
+          # Reorder bind indexes when joins or subqueries include more bindings.
+          # Special for PostgreSQL
+          if bind_values.size > 1
+            bvs = bind_values
+            arel.ast.grep(Arel::Nodes::BindParam).each_with_index do |bp, i|
+              column = bvs[i].first
+              bp.replace connection.substitute_at(column, i)
+            end
+          end
+
           arel
         end
 
+        def build_where(opts, other = [])
+          case opts
+          when String, Array
+            super
+          else  # Let's prevent PredicateBuilder from doing its thing
+            [opts, *other].map do |arg|
+              case arg
+              when Array  # Just in case there's an array in there somewhere
+                @klass.send(:sanitize_sql, arg)
+              when Hash
+                attributes = @klass.send(:expand_hash_conditions_for_aggregates, arg)
+
+                attributes.values.grep(::ActiveRecord::Relation) do |rel|
+                  self.bind_values += rel.bind_values
+                end
+
+                preprocess_attrs_with_ar(attributes)
+
+              when Squeel::Nodes::Node
+                arg.grep(::ActiveRecord::Relation) do |rel|
+                  self.bind_values += rel.bind_values
+                end
+                arg
+              else
+                arg
+              end
+            end
+          end
+        end
+
         def build_from
           opts, name = from_visit(from_value)
           case opts
@@ -109,6 +167,40 @@ module Squeel
           self
         end
 
+        def where_values_hash_with_squeel(relation_table_name = table_name)
+          equalities = find_equality_predicates(where_visit(with_default_scope.where_values), relation_table_name)
+
+          binds = Hash[bind_values.find_all(&:first).map { |column, v| [column.name, v] }]
+
+          Hash[equalities.map { |where|
+            name = where.left.name
+            [name, binds.fetch(name.to_s) { where.right }]
+          }]
+        end
+
+        def to_sql_with_binding_params
+          @to_sql ||= begin
+            relation   = self
+            connection = klass.connection
+
+            if eager_loading?
+              find_with_associations { |rel| relation = rel }
+            end
+
+            ast   = relation.arel.ast
+            binds = relation.bind_values.dup
+
+            visitor = connection.visitor.clone
+            visitor.class_eval do
+              include ::Arel::Visitors::BindVisitor
+            end
+
+            visitor.accept(ast) do
+              connection.quote(*binds.shift.reverse)
+            end
+          end
+        end
+
         private
 
         def dehashified_order_values

data/lib/squeel/adapters/active_record/4.1/compat.rb

@@ -0,0 +1,15 @@
+require 'squeel/adapters/active_record/compat'
+
+module ActiveRecord
+  module Associations
+    class AssociationScope
+      def eval_scope(klass, scope, owner)
+        if scope.is_a?(Relation)
+          scope
+        else
+          klass.unscoped.instance_exec(owner, &scope).visited
+        end
+      end
+    end
+  end
+end

data/lib/squeel/adapters/active_record/4.1/context.rb

@@ -0,0 +1,88 @@
+require 'squeel/adapters/active_record/context'
+
+module Squeel
+  module Adapters
+    module ActiveRecord
+      class Context < ::Squeel::Context
+        class NoParentFoundError < RuntimeError; end
+
+        def initialize(object)
+          super
+          @base = object.join_root
+          @engine = @base.base_klass.arel_engine
+          @arel_visitor = get_arel_visitor
+          @default_table = Arel::Table.new(@base.table_name, :as => @base.aliased_table_name, :engine => @engine)
+        end
+
+        def find(object, parent = @base)
+          if ::ActiveRecord::Associations::JoinDependency::JoinPart === parent
+            case object
+            when String, Symbol, Nodes::Stub
+              assoc_name = object.to_s
+              find_string_symbol_stub_association(@base.children, @base, assoc_name, parent)
+            when Nodes::Join
+              find_node_join_association(@base.children, @base, object, parent)
+            else
+              find_other_association(@base.children, @base, object, parent)
+            end
+          end
+        end
+
+        def find!(object, parent = @base)
+          if ::ActiveRecord::Associations::JoinDependency::JoinPart === parent
+            result =
+              case object
+                when String, Symbol, Nodes::Stub
+                  assoc_name = object.to_s
+                  find_string_symbol_stub_association(@base.children, @base, assoc_name, parent)
+                when Nodes::Join
+                  find_node_join_association(@base.children, @base, object, parent)
+                else
+                  find_other_association(@base.children, @base, object, parent)
+                end
+
+            result || raise(NoParentFoundError, "can't find #{object} in #{parent}")
+          else
+            raise NoParentFoundError, "can't find #{object} in #{parent}"
+          end
+        end
+
+        def traverse!(keypath, parent = @base, include_endpoint = false)
+          parent = @base if keypath.absolute?
+          keypath.path_without_endpoint.each do |key|
+            parent = find!(key, parent)
+          end
+          parent = find!(keypath.endpoint, parent) if include_endpoint
+
+          parent
+        end
+
+        private
+          def find_string_symbol_stub_association(join_associations, current_parent, assoc_name, target_parent)
+            join_associations.each do |assoc|
+              return assoc if assoc.reflection.name.to_s == assoc_name && current_parent.equal?(target_parent)
+              child_assoc = find_string_symbol_stub_association(assoc.children, assoc, assoc_name, target_parent)
+              return child_assoc if child_assoc
+            end && false
+          end
+
+          def find_node_join_association(join_associations, current_parent, object, target_parent)
+            join_associations.each do |assoc|
+              return assoc if assoc.reflection.name == object._name && current_parent.equal?(target_parent) &&
+                (object.polymorphic? ? assoc.reflection.klass == object._klass : true)
+              child_assoc = find_node_join_association(assoc.children, assoc, object, target_parent)
+              return child_assoc if child_assoc
+            end && false
+          end
+
+          def find_other_association(join_associations, current_parent, object, target_parent)
+            join_associations.each do |assoc|
+              return assoc if assoc.reflection == object && current_parent.equal?(target_parent)
+              child_assoc = find_other_association(assoc.children, assoc, object, target_parent)
+              return child_assoc if child_assoc
+            end && false
+          end
+      end
+    end
+  end
+end