momomoto 0.1.10 → 0.1.11

data/lib/momomoto/base.rb

@@ -80,16 +80,29 @@ module Momomoto
 
       # compiles the where-clause of the query
       def compile_where( conditions )
-        conditions = {} if not conditions
-        where = ''
+        conditions ||= {}
+        where = compile_expression( conditions, logical_operator )
+        where.empty? ? '' : " WHERE #{where}"
+      end
+
+      def compile_expression( conditions, operator )
+        where = []
         conditions.each do | key , value |
           key = key.to_sym if key.kind_of?( String )
-          raise CriticalError, "condition key '#{key}' not a column in table '#{table_name}'" unless columns.keys.member?( key )
-          where = where_append( where, columns[key].compile_rule( key, value ) )
+          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
-        where
+        where.join( " #{operator} ")
       end
 
+
       # compiles the sql statement defining the limit
       def compile_limit( limit )
         " LIMIT #{Integer(limit)}"
@@ -120,11 +133,6 @@ module Momomoto
         " ORDER BY #{order.join(',')}"
       end
 
-      # append where string
-      def where_append( where, append )
-        ( where.empty? ? ' WHERE ' : where + ' ' + logical_operator + ' ' ) + append
-      end
-
       # construct the Row class for the table
       def initialize_row( row, table, columns = table.columns )
 

data/lib/momomoto/procedure.rb

@@ -13,6 +13,7 @@ module Momomoto
         @schema_name ||= construct_schema_name( self.name )
         @parameters ||= database.fetch_procedure_parameters( procedure_name )
         @columns ||= database.fetch_procedure_columns( procedure_name )
+        @logical_operator ||= "AND"
 
         const_set( :Row, Class.new( Momomoto::Row ) ) if not const_defined?( :Row )
         initialize_row( const_get( :Row ), self )
@@ -77,7 +78,7 @@ module Momomoto
         parameters.each do | parameter |
           field_name, datatype = parameter.to_a.first
           raise Error, "parameter #{field_name} not specified" if not params.member?( field_name )
-          raise Error, "Not null fields(#{field_name}) need to be set" if !params[field_name] && datatype.not_null?
+          raise Error, "Not null fields(#{field_name}) need to be set in #{procedure_name}" if !params[field_name] && datatype.not_null?
           args << datatype.escape( params[field_name] )
         end
         args.join(',')

data/lib/timeinterval.rb

@@ -55,7 +55,7 @@ class TimeInterval
         @sec = d%60
       when String then
         parsed = Date._parse( d, false)
-        if ( parsed.empty? && d.length > 0 ) || !(parsed.keys - [:hour,:min,:sec]).empty?
+        if ( parsed.empty? && d.length > 0 ) || !(parsed.keys - [:hour,:min,:sec,:sec_fraction]).empty?
           raise ParseError, "Could not parse interval `#{d}`"
         end
         @hour = parsed[:hour] || 0

data/test/test_base.rb

@@ -26,12 +26,16 @@ class TestBase < Test::Unit::TestCase
     t = Class.new( Momomoto::Table )
     t.table_name = 'person'
     t.initialize_table
-      assert_equal( " WHERE person_id = '1'" , t.instance_eval do compile_where( :person_id => '1' ) end )
-      assert_equal( " WHERE person_id IN ('1')" , t.instance_eval do compile_where( :person_id => ['1'] ) end )
-      assert_equal( " WHERE person_id IN ('1','2')" , t.instance_eval do compile_where( :person_id => ['1',2] ) end )
-      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( :person_id => '1' ) end )
+    assert_equal( " WHERE person_id IN ('1')" , t.instance_eval do compile_where( :person_id => ['1'] ) end )
+    assert_equal( " WHERE person_id IN ('1','2')" , t.instance_eval do compile_where( :person_id => ['1',2] ) end )
+    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 )
   end
 
 end

data/test/test_table.rb

@@ -157,6 +157,8 @@ class TestTable < Test::Unit::TestCase
   def test_select
     r = Person.select( nil, {:limit => 3})
     assert_equal( 3, r.length )
+    Person.select({:OR=>{:person_id=>1}})
+    Person.select({:AND=>{:person_id=>1}})
     Person.select( nil, {:limit => 3, :order => :person_id})
     Person.select( nil, {:limit => 3, :order => "person_id"})
     Person.select( nil, {:limit => 3, :order => ["person_id"]})

metadata

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