composite_primary_keys 4.0.0.beta6 → 4.0.0.beta7

data/History.txt

@@ -1,4 +1,4 @@
-== 4.0.0.beta6 2011-07-26
+== 4.0.0.beta7 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.

data/lib/composite_primary_keys/composite_predicates.rb

@@ -11,9 +11,11 @@ module CompositePrimaryKeys
     def cpk_or_predicate(predicates)
       # 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 ")
+      predicates = predicates.map do |predicate|
+        "(#{predicate.to_sql})"
+      end
+      predicates = "(#{predicates.join(" OR ")})"
+      Arel::Nodes::SqlLiteral.new(predicates)
     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, 'beta6'].join('.')
+    STRING = [MAJOR, MINOR, TINY, 'beta7'].join('.')
   end
 end

data/test/fixtures/products.yml

@@ -1,9 +1,11 @@
 first_product:
   id: 1
   name: Product One
+
 second_product:
   id: 2
   name: Product Two
+
 third_product:
   id: 3
   name: Product Three

data/test/fixtures/restaurants.yml

@@ -2,10 +2,12 @@ mcdonalds:
   franchise_id: 1
   store_id: 1
   name: McDonalds
+
 subway_one:
   franchise_id: 2
   store_id: 1
   name: Subway 1
+
 subway_two:
   franchise_id: 2
   store_id: 2

data/test/test_habtm.rb

@@ -1,8 +1,6 @@
 require 'abstract_unit'
-require 'ruby-debug'
 
 class TestHabtm < ActiveSupport::TestCase
-
   fixtures :suburbs, :restaurants, :restaurants_suburbs, :products
 
   def test_has_and_belongs_to_many
@@ -107,10 +105,9 @@ class TestHabtm < ActiveSupport::TestCase
     
     # reload to force reload of associations
     product_one = Product.find(1)
+    assert_equal 2, product_one.restaurants.size
+
     product_three = Product.find(3)
-    
     assert_equal 0, product_three.restaurants.size
-    assert_equal 2, product_one.restaurants.size
   end
-
 end

data/test/test_predicates.rb

@@ -10,12 +10,12 @@ class TestEqual < ActiveSupport::TestCase
 
     predicates = Array.new
 
-    5.times do |i|
+    3.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',
+    assert_equal('(("departments"."id" = 0) OR ("departments"."id" = 1) OR ("departments"."id" = 2))',
                  pred)
   end
 
@@ -24,12 +24,12 @@ class TestEqual < ActiveSupport::TestCase
 
     predicates = Array.new
 
-    5.times do |i|
+    3.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',
+    assert_equal('"departments"."id" = 0 AND "departments"."id" = 1 AND "departments"."id" = 2',
                 pred.to_sql)
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  hash: 62196271
+  hash: 62196269
   prerelease: 6
   segments: 
   - 4
   - 0
   - 0
   - beta
-  - 6
-  version: 4.0.0.beta6
+  - 7
+  version: 4.0.0.beta7
 platform: ruby
 authors: 
 - Dr Nic Williams