momomoto 0.1.11 → 0.1.12

data/lib/momomoto/base.rb

@@ -87,17 +87,22 @@ module Momomoto
 
       def compile_expression( conditions, operator )
         where = []
-        conditions.each do | key , value |
-          key = key.to_sym if key.kind_of?( String )
-          case key
-            when :OR then
-              where << compile_expression( value, "OR" )
-            when :AND then
-              where << compile_expression( value, "AND" )
-            else
-              raise CriticalError, "condition key '#{key}' not a column in table '#{table_name}'" unless columns.keys.member?( key )
-              where << columns[key].compile_rule( key, value )
-          end
+        case conditions
+          when Array then
+            conditions.each do | value |
+              where << compile_expression( value, operator )
+            end
+          when Hash then
+            conditions.each do | key , value |
+              key = key.to_sym if key.kind_of?( String )
+              case key
+                when :OR then where << "(" + compile_expression( value, "OR" ) + ")"
+                when :AND then where << "(" + compile_expression( value, "AND" ) + ")"
+                else
+                  raise CriticalError, "condition key '#{key}' not a column in table '#{table_name}'" unless columns.keys.member?( key )
+                  where << columns[key].compile_rule( key, value )
+              end
+            end
         end
         where.join( " #{operator} ")
       end

data/test/test_base.rb

@@ -32,10 +32,12 @@ class TestBase < Test::Unit::TestCase
     assert_equal( " WHERE first_name = E'1'" , t.instance_eval do compile_where( :first_name => '1' ) end )
     assert_equal( " WHERE first_name = E'chu''nky'" , t.instance_eval do compile_where( :first_name => "chu'nky" ) end )
     assert_equal( " WHERE first_name IN (E'chu''nky',E'bac''n')" , t.instance_eval do compile_where( :first_name => ["chu'nky","bac'n"] ) end )
-    assert_equal( " WHERE person_id = '1'" , t.instance_eval do compile_where( :OR => { :person_id => '1' } ) end )
-    assert_equal( " WHERE person_id = '1'" , t.instance_eval do compile_where( :AND => { :person_id => '1' } ) end )
-    assert_equal( " WHERE person_id = '1' OR first_name = E's'" , t.instance_eval do compile_where( :OR => { :person_id => '1',:first_name=>'s' } ) end )
-    assert_equal( " WHERE person_id = '1' AND first_name = E's'" , t.instance_eval do compile_where( :AND => { :person_id => '1',:first_name=>'s' } ) end )
+    assert_equal( " WHERE (person_id = '1')" , t.instance_eval do compile_where( :OR => { :person_id => '1' } ) end )
+    assert_equal( " WHERE (person_id = '1')" , t.instance_eval do compile_where( :AND => { :person_id => '1' } ) end )
+    assert_equal( " WHERE (person_id = '1' OR first_name = E's')" , t.instance_eval do compile_where( :OR => { :person_id => '1',:first_name=>'s' } ) end )
+    assert_equal( " WHERE (person_id = '1' AND first_name = E's')" , t.instance_eval do compile_where( :AND => { :person_id => '1',:first_name=>'s' } ) end )
+    assert_equal( " WHERE (person_id = '1' AND person_id = '2')" , t.instance_eval do compile_where( :AND =>[{:person_id=>1},{:person_id=>2}] ) end )
+    assert_equal( " WHERE (person_id = '1' OR person_id = '2')" , t.instance_eval do compile_where( :OR =>[{:person_id=>1},{:person_id=>2}] ) end )
   end
 
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: momomoto
 version: !ruby/object:Gem::Version 
-  version: 0.1.11
-date: 2007-11-16 00:00:00 +01:00
+  version: 0.1.12
+date: 2007-11-17 00:00:00 +01:00
 summary: Momomoto is an object relational mapper for PostgreSQL.
 require_paths: 
 - lib