composite_primary_keys 4.0.0.beta5 → 4.0.0.beta6

data/History.txt

@@ -1,3 +1,8 @@
+== 4.0.0.beta6 2011-07-26
+* Compatible with Rails 3.1 RC5 (TycoooN)
+* Do not use Arel::Nodes::Or to combine predicates because it creates a
+  deeply nested stack that blows up.
+
 == 4.0.0.beta4 2011-07-22
 * Compatible with Rails 3.1 stable branch.  No longer works with RC4 (Charlie Savage)
 * Do not require loading of postgresql gem unless needed (Charlie Savage)

data/lib/composite_primary_keys.rb

@@ -26,7 +26,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 unless defined?(ActiveRecord)
   require 'rubygems'
-  gem 'activerecord', '~> 3.1.0.rc4'
+  gem 'activerecord', '= 3.1.0.rc5'
   require 'active_record'
 end
 

data/lib/composite_primary_keys/composite_predicates.rb

@@ -9,11 +9,11 @@ module CompositePrimaryKeys
     end
     
     def cpk_or_predicate(predicates)
-      result = predicates.shift
-      predicates.each do |predicate|
-        result = result.or(predicate)
-      end
-      result
+      # Can't do or here, arel does the wrong thing and makes a really
+      # deeply nested stack that blows up
+      predicates.map do |predicate|
+        predicate.to_sql
+      end.join(" OR ")
     end
 
     def cpk_id_predicate(table, keys, values)

data/lib/composite_primary_keys/version.rb

@@ -3,6 +3,6 @@ module CompositePrimaryKeys
     MAJOR = 4
     MINOR = 0
     TINY  = 0
-    STRING = [MAJOR, MINOR, TINY, 'beta5'].join('.')
+    STRING = [MAJOR, MINOR, TINY, 'beta6'].join('.')
   end
 end

data/test/test_predicates.rb

@@ -0,0 +1,35 @@
+require 'abstract_unit'
+
+class TestEqual < ActiveSupport::TestCase
+  fixtures :departments
+
+  include CompositePrimaryKeys::Predicates
+
+  def test_or
+    dep = Arel::Table.new(:departments)
+
+    predicates = Array.new
+
+    5.times do |i|
+      predicates << dep[:id].eq(i)
+    end
+
+    pred = cpk_or_predicate(predicates)
+    assert_equal('"departments"."id" = 0 OR "departments"."id" = 1 OR "departments"."id" = 2 OR "departments"."id" = 3 OR "departments"."id" = 4',
+                 pred)
+  end
+
+  def test_and
+    dep = Arel::Table.new(:departments)
+
+    predicates = Array.new
+
+    5.times do |i|
+      predicates << dep[:id].eq(i)
+    end
+
+    pred = cpk_and_predicate(predicates)
+    assert_equal('"departments"."id" = 0 AND "departments"."id" = 1 AND "departments"."id" = 2 AND "departments"."id" = 3 AND "departments"."id" = 4',
+                pred.to_sql)
+  end
+end

data/test/test_suite.rb

@@ -15,6 +15,7 @@ require 'test_ids'
 require 'test_miscellaneous'
 require 'test_pagination'
 require 'test_polymorphic'
+require 'test_predicates'
 require 'test_santiago'
 require 'test_tutorial_example'
 require 'test_update'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  hash: 62196265
+  hash: 62196271
   prerelease: 6
   segments: 
   - 4
   - 0
   - 0
   - beta
-  - 5
-  version: 4.0.0.beta5
+  - 6
+  version: 4.0.0.beta6
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -26,16 +26,16 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 15424109
+        hash: 15424111
         segments: 
         - 3
         - 1
         - 0
         - rc
-        - 4
-        version: 3.1.0.rc4
+        - 5
+        version: 3.1.0.rc5
   type: :runtime
   version_requirements: *id001
 description: Composite key support for ActiveRecord 3
@@ -184,6 +184,7 @@ files:
 - test/test_miscellaneous.rb
 - test/test_pagination.rb
 - test/test_polymorphic.rb
+- test/test_predicates.rb
 - test/test_santiago.rb
 - test/test_suite.rb
 - test/test_tutorial_example.rb
@@ -248,6 +249,7 @@ test_files:
 - test/test_miscellaneous.rb
 - test/test_pagination.rb
 - test/test_polymorphic.rb
+- test/test_predicates.rb
 - test/test_santiago.rb
 - test/test_suite.rb
 - test/test_tutorial_example.rb