Merge pull request #360 from activerecord-hackery/new_rails_dependency_and_ci_env

Support the latest 4-2-stable and 4.1.9+

Author: bigxiang

.travis.yml

@@ -8,31 +8,30 @@ script:
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
-  - 2.1.2
+  - 2.1.5
 
 env:
   global:
     - SQ_CONFIG_FILE=$TRAVIS_BUILD_DIR/spec/config.travis.yml
   matrix:
-    - RAILS=master AREL=master ADAPTER=sqlite3
+    - RAILS=4-2-stable AREL=6-0-stable 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-2-stable AREL=6-0-stable 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-2-stable AREL=6-0-stable 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-2-stable AREL=6-0-stable 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

CHANGELOG.md

@@ -1,4 +1,8 @@
-## 1.2.3 (Unreleased)
+## 1.2.4 (Unreleased)
+
+
+## 1.2.3 (2015-2-5)
+* Support the latest version of Rails 4.2 and 4.1. By @danielrhodes
 
 ## 1.2.2 (2014-11-25)
 

Gemfile

@@ -3,12 +3,8 @@ gemspec
 
 gem 'rake'
 
-rails = ENV['RAILS'] || 'master'
-arel = ENV['AREL'] || 'master'
-
-if rails == 'master'
-  gem 'i18n', github: 'svenfuchs/i18n', branch: 'master'
-end
+rails = ENV['RAILS'] || '4-2-stable'
+arel = ENV['AREL'] || '6-0-stable'
 
 arel_opts = case arel
 when /\// # A path

lib/squeel/adapters/active_record/4.1/relation_extensions.rb

@@ -80,16 +80,15 @@ def build_arel
 
           collapse_wheres(arel, where_visit((where_values - ['']).uniq))
 
-          arel.having(*having_visit(having_values.uniq.reject{|h| h.blank?})) unless having_values.empty?
+          arel.having(*having_visit(having_values.uniq.reject(&:blank?))) unless having_values.empty?
 
           arel.take(connection.sanitize_limit(limit_value)) if limit_value
           arel.skip(offset_value.to_i) if offset_value
-
-          arel.group(*group_visit(group_values.uniq.reject{|g| g.blank?})) unless group_values.empty?
+          arel.group(*group_visit(group_values.uniq.reject(&:blank?))) unless group_values.empty?
 
           build_order(arel)
 
-          build_select(arel, select_visit(select_values.uniq))
+          build_select(arel)
 
           arel.distinct(distinct_value)
           arel.from(build_from) if from_value
@@ -231,6 +230,14 @@ def build_order(arel)
           arel.order(*orders) unless orders.empty?
         end
 
+        def build_select(arel)
+          if select_values.any?
+            arel.project(*select_visit(select_values.uniq))
+          else
+            arel.project(@klass.arel_table[Arel.star])
+          end
+        end
+
         def where_values_hash_with_squeel(relation_table_name = table_name)
           equalities = find_equality_predicates(where_visit(where_values), relation_table_name)
           binds = Hash[bind_values.find_all(&:first).map { |column, v| [column.name, v] }]

lib/squeel/adapters/active_record/4.2/relation_extensions.rb

@@ -17,6 +17,30 @@ def reverse_order!
           self
         end
 
+        def build_arel
+          arel = Arel::SelectManager.new(table.engine, table)
+
+          build_joins(arel, joins_values.flatten) unless joins_values.empty?
+
+          collapse_wheres(arel, where_visit((where_values - ['']).uniq))
+
+          arel.having(*having_visit(having_values.uniq.reject(&:blank?))) unless having_values.empty?
+
+          arel.take(connection.sanitize_limit(limit_value)) if limit_value
+          arel.skip(offset_value.to_i) if offset_value
+          arel.group(*group_visit(group_values.uniq.reject(&:blank?))) unless group_values.empty?
+
+          build_order(arel)
+
+          build_select(arel)
+
+          arel.distinct(distinct_value)
+          arel.from(build_from) if from_value
+          arel.lock(lock_value) if lock_value
+
+          arel
+        end
+
         def build_join_dependency(manager, joins)
           buckets = joins.group_by do |join|
             case join
@@ -89,8 +113,7 @@ def where_values_hash_with_squeel(relation_table_name = table_name)
         def expand_attrs_from_hash(opts)
           opts = ::ActiveRecord::PredicateBuilder.resolve_column_aliases(klass, opts)
 
-          bv_len = bind_values.length
-          tmp_opts, bind_values = create_binds(opts, bv_len)
+          tmp_opts, bind_values = create_binds(opts)
           self.bind_values += bind_values
 
           attributes = @klass.send(:expand_hash_conditions_for_aggregates, tmp_opts)

spec/squeel/adapters/active_record/relation_extensions_spec.rb

@@ -134,7 +134,12 @@ module ActiveRecord
             })
 
             arel = relation.build_arel
-            arel.to_sql.should match /#{Q}parents_people_2#{Q}.#{Q}name#{Q} = 'bob'/
+
+            if activerecord_version_at_least('4.2.0')
+              arel.to_sql.should match /#{Q}parents_people_2#{Q}.#{Q}name#{Q} = ?/
+            else
+              arel.to_sql.should match /#{Q}parents_people_2#{Q}.#{Q}name#{Q} = 'bob'/
+            end
           end
 
           it 'combines multiple conditions of the same type against the same column with AND' do
@@ -174,7 +179,12 @@ module ActiveRecord
             })
 
             arel = relation.build_arel
-            arel.to_sql.should match /HAVING #{Q}parents_people_2#{Q}.#{Q}name#{Q} = 'joe'/
+
+            if activerecord_version_at_least('4.2.0')
+              arel.to_sql.should match /HAVING #{Q}parents_people_2#{Q}.#{Q}name#{Q} = ?/
+            else
+              arel.to_sql.should match /HAVING #{Q}parents_people_2#{Q}.#{Q}name#{Q} = 'joe'/
+            end
           end
 
           it 'maps orders inside a hash to their appropriate association table' do