momomoto 0.1.4 → 0.1.5

data/lib/momomoto/base.rb

@@ -147,7 +147,7 @@ module Momomoto
       end
 
       # defines row setter and getter in the module StandardMethods which
-      # is later included in the Row class 
+      # is later included in the Row class
       def define_row_accessors( method_module, table, columns = self.columns )
         columns.each_with_index do | ( field_name, data_type ), index |
           method_module.instance_eval do

data/lib/momomoto/datatype/base.rb

@@ -34,6 +34,10 @@ module Momomoto
         case value
           when nil then
             raise Error, "nil values not allowed for #{field_name}"
+          when :NULL then
+            field_name.to_s + ' IS NULL'
+          when :NOT_NULL then
+            field_name.to_s + ' IS NOT NULL'
           when Array then
             raise Error, "empty array conditions are not allowed for #{field_name}" if value.empty?
             raise Error, "nil values not allowed in compile_rule for #{field_name}" if value.member?( nil )

data/test/test_base.rb

@@ -15,8 +15,11 @@ class TestBase < Test::Unit::TestCase
     assert_equal( "AND", t2.logical_operator )
     t1.logical_operator = "or"
     assert_equal( "OR", t1.logical_operator )
-    assert_equal( " WHERE first_name = E'a' OR person_id = '1'" , t1.instance_eval do compile_where(:person_id=>'1',:first_name=>'a') end )
-    assert_equal( " WHERE first_name = E'a' AND person_id = '1'" , t2.instance_eval do compile_where(:person_id=>'1',:first_name=>'a') end )
+    assert( t1.instance_eval do compile_where(:person_id=>'1',:first_name=>'a') end.match( / OR / ) )
+    assert( t2.instance_eval do compile_where(:person_id=>'1',:first_name=>'a') end.match( / AND / ) )
+    assert_raise( Momomoto::Error ) do
+      t1.logical_operator = "chunky"
+    end
   end
 
   def test_compile_where

data/test/test_datatype.rb

@@ -39,6 +39,14 @@ class TestDatatype < Test::Unit::TestCase
     end
   end
 
+  def test_compile_rule_null
+    DATATYPES.each do | type |
+      t = type.new
+      assert_equal( "field_name IS NULL", t.compile_rule( :field_name, :NULL) )
+      assert_equal( "field_name IS NOT NULL", t.compile_rule( :field_name, :NOT_NULL) )
+    end
+  end
+
   def test_operator_sign
     DATATYPES.each do | type |
       assert_equal( '<=', type.operator_sign( :le ) )

data/test/test_row.rb

@@ -43,6 +43,19 @@ class TestRow < Test::Unit::TestCase
     assert_equal( a.person_id, a['person_id'])
   end
 
+  def test_equal
+    a = Person.new
+    b = Person.new
+    assert( a == b )
+    assert( b == a )
+    a.person_id = 23
+    assert( a != b )
+    assert( b != a )
+    b.person_id = 23
+    assert( a == b )
+    assert( b == a )
+  end
+
   def test_primary_key_setting
     a = Person.select_single( nil, {:limit=>1})
     assert_raise( Momomoto::Error ) do

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: momomoto
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
-date: 2007-09-01 00:00:00 +02:00
+  version: 0.1.5
+date: 2007-09-15 00:00:00 +02:00
 summary: Momomoto is an object relational mapper for PostgreSQL.
 require_paths: 
 - lib
@@ -35,59 +35,59 @@ files:
 - lib/momomoto/row.rb
 - lib/momomoto/table.rb
 - lib/momomoto/procedure.rb
-- lib/momomoto/base.rb
 - lib/momomoto/datatype.rb
+- lib/momomoto/base.rb
 - lib/momomoto/order.rb
 - lib/momomoto/information_schema/table_constraints.rb
 - lib/momomoto/information_schema/columns.rb
-- lib/momomoto/information_schema/fetch_procedure_columns.rb
 - lib/momomoto/information_schema/fetch_procedure_parameters.rb
+- lib/momomoto/information_schema/fetch_procedure_columns.rb
 - lib/momomoto/information_schema/routines.rb
 - lib/momomoto/information_schema/key_column_usage.rb
-- lib/momomoto/datatype/date.rb
 - lib/momomoto/datatype/boolean.rb
+- lib/momomoto/datatype/date.rb
 - lib/momomoto/datatype/smallint.rb
 - lib/momomoto/datatype/real.rb
 - lib/momomoto/datatype/text.rb
 - lib/momomoto/datatype/interval.rb
-- lib/momomoto/datatype/time_without_time_zone.rb
-- lib/momomoto/datatype/character_varying.rb
 - lib/momomoto/datatype/character.rb
 - lib/momomoto/datatype/integer.rb
+- lib/momomoto/datatype/time_without_time_zone.rb
+- lib/momomoto/datatype/character_varying.rb
 - lib/momomoto/datatype/inet.rb
-- lib/momomoto/datatype/timestamp_without_time_zone.rb
-- lib/momomoto/datatype/time_with_time_zone.rb
 - lib/momomoto/datatype/numeric.rb
 - lib/momomoto/datatype/bytea.rb
-- lib/momomoto/datatype/timestamp_with_time_zone.rb
+- lib/momomoto/datatype/timestamp_without_time_zone.rb
+- lib/momomoto/datatype/time_with_time_zone.rb
 - lib/momomoto/datatype/base.rb
 - lib/momomoto/datatype/bigint.rb
+- lib/momomoto/datatype/timestamp_with_time_zone.rb
+- sql/procedures.sql
 - sql/types.sql
 - sql/install.sql
-- sql/procedures.sql
+- test/test_procedure.rb
 - test/test_boolean.rb
 - test/test_real.rb
 - test/test_smallint.rb
 - test/test_interval.rb
 - test/test_text.rb
 - test/test_table.rb
-- test/test_procedure.rb
+- test/test_numeric.rb
+- test/test_inet.rb
 - test/test_time_without_time_zone.rb
 - test/test_character_varying.rb
 - test/test_character.rb
 - test/test_integer.rb
-- test/test_inet.rb
+- test/test_datatype.rb
+- test/test_row.rb
 - test/test_timestamp_without_time_zone.rb
-- test/test_numeric.rb
 - test/test_time_with_time_zone.rb
 - test/test_database.rb
 - test/test_bytea.rb
 - test/test_information_schema.rb
-- test/test_row.rb
-- test/test_timestamp_with_time_zone.rb
 - test/test_base.rb
-- test/test_datatype.rb
 - test/test_bigint.rb
+- test/test_timestamp_with_time_zone.rb
 - test/test_date.rb
 - test/test_functions.sql
 - test/test.sql