momomoto 0.2.0 → 0.2.1

data/lib/momomoto/datatype/base.rb

@@ -73,6 +73,14 @@ module Momomoto
             return compile_rule( field_name, value[0] ) if value.length == 1
             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 )
+            # do the right thing when NULL is part of an array
+            if value.delete( :NULL )
+              if value.length == 0
+                return compile_rule( field_name, :NULL )
+              else
+                return " (#{compile_rule( field_name, :NULL)} OR #{compile_rule( field_name, value )} ) "
+              end
+            end
             field_name.to_s + ' IN (' + value.map{ | v | escape(filter_set(v)) }.join(',') + ')'
           when Hash then
             raise Error, "empty hash conditions are not allowed for #{field_name}" if value.empty?

data/lib/momomoto/table.rb

@@ -360,7 +360,10 @@ module Momomoto
                   klass.schema_name = constraint.table_schema
                   namespace.const_set( constraint.table_name.capitalize, klass )
                 end
-                fk_helper_multiple( constraint.table_name, klass, primary_keys )
+                # double check we really got the right class as the class we got might be in another schema
+                if klass.table_name == constraint.table_name && klass.schema_name == constraint.table_schema
+                  fk_helper_multiple( constraint.table_name, klass, primary_keys )
+                end
               end
             end
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: momomoto
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Sven Klemm
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-13 00:00:00 +01:00
+date: 2009-04-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency