momomoto 0.1.6 → 0.1.7

data/lib/momomoto/database.rb

@@ -108,7 +108,7 @@ module Momomoto
       conditions = { :table_name => table_name }
       conditions[:table_schema] = schema_name if schema_name
       cols = Momomoto::Information_schema::Columns.select( conditions )
-      raise CriticalError, "Table without columns" if cols.length < 1
+      raise CriticalError, "Table without columns (#{table_name})" if cols.length < 1
       cols.each do  | col |
         columns[col.column_name.to_sym] = Momomoto::Datatype.const_get(col.data_type.gsub(' ','_').capitalize).new( col )
       end
@@ -123,6 +123,12 @@ module Momomoto
       params.each do  | param |
         p << { param.parameter_name.to_sym => Momomoto::Datatype.const_get(param.data_type.gsub(' ','_').capitalize).new }
       end
+      # mark parameters of strict procedures as not null
+      if Information_schema::Routines.select_single(:routine_name=>procedure_name).is_null_call == 'YES'
+        p.each do | param | 
+          param[param.keys.first].instance_variable_set(:@not_null,true) 
+        end
+      end
       p
     end
 
@@ -137,7 +143,6 @@ module Momomoto
       c
     end
 
-
     # begin a transaction
     def begin
       execute( "BEGIN;" )

data/lib/momomoto/information_schema/key_column_usage.rb

@@ -2,17 +2,7 @@
 module Momomoto
   module Information_schema
     class Key_column_usage < Momomoto::Table
-      primary_keys( [] )
       schema_name( "information_schema" )
-      columns( { :constraint_catalog        => Momomoto::Datatype::Character_varying.new,
-                 :constraint_schema         => Momomoto::Datatype::Character_varying.new,
-                 :constraint_name           => Momomoto::Datatype::Character_varying.new,
-                 :table_catalog             => Momomoto::Datatype::Character_varying.new,
-                 :table_schema              => Momomoto::Datatype::Character_varying.new,
-                 :table_name                => Momomoto::Datatype::Character_varying.new,
-                 :column_name               => Momomoto::Datatype::Character_varying.new,
-                 :ordinal_position          => Momomoto::Datatype::Integer.new
-               } )
     end
   end
 end

data/lib/momomoto/information_schema/routines.rb

@@ -4,7 +4,7 @@ module Momomoto
   module Information_schema
 
     class Routines < Momomoto::Table
-
+      schema_name( "information_schema" )
     end
 
   end

data/lib/momomoto/information_schema/table_constraints.rb

@@ -4,16 +4,6 @@ module Momomoto
     class Table_constraints < Momomoto::Table
       primary_keys( [] )
       schema_name( "information_schema" )
-      columns( { :constraint_catalog        => Momomoto::Datatype::Text.new,
-                 :constraint_schema         => Momomoto::Datatype::Text.new,
-                 :constraint_name           => Momomoto::Datatype::Text.new,
-                 :table_catalog             => Momomoto::Datatype::Text.new,
-                 :table_schema              => Momomoto::Datatype::Text.new,
-                 :table_name                => Momomoto::Datatype::Text.new,
-                 :constraint_type           => Momomoto::Datatype::Text.new,
-                 :is_deferrable             => Momomoto::Datatype::Text.new,
-                 :initially_deferred        => Momomoto::Datatype::Text.new
-               } )
     end
   end
 end

data/lib/momomoto/procedure.rb

@@ -77,6 +77,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?
           args << datatype.escape( params[field_name] )
         end
         args.join(',')

data/test/test_functions.sql

@@ -3,6 +3,10 @@ CREATE OR REPLACE FUNCTION test_parameter_sql( param1 INTEGER ) RETURNS INTEGER
   SELECT $1;
 $$ LANGUAGE sql;
 
+CREATE OR REPLACE FUNCTION test_parameter_sql_strict( param1 INTEGER ) RETURNS INTEGER AS $$
+  SELECT $1;
+$$ LANGUAGE sql STRICT;
+
 CREATE OR REPLACE FUNCTION test_parameter_plpgsql( param1 INTEGER, param2 TEXT ) RETURNS INTEGER AS $$
   DECLARE
   BEGIN
@@ -10,6 +14,13 @@ CREATE OR REPLACE FUNCTION test_parameter_plpgsql( param1 INTEGER, param2 TEXT )
   END;
 $$ LANGUAGE plpgsql;
 
+CREATE OR REPLACE FUNCTION test_parameter_plpgsql_strict( param1 INTEGER, param2 TEXT ) RETURNS INTEGER AS $$
+  DECLARE
+  BEGIN
+    RETURN param1;
+  END;
+$$ LANGUAGE plpgsql STRICT;
+
 CREATE OR REPLACE FUNCTION test_set_returning( person_id INTEGER ) RETURNS SETOF person AS $$
   DECLARE
     result RECORD;

data/test/test_procedure.rb

@@ -71,5 +71,22 @@ class TestProcedure < Test::Unit::TestCase
     Test_set_returning.call({:person_id => 5},{:person_id => 5},{:order=>:person_id,:limit=>10} )
   end
 
+  def test_call_strict
+    a = Class.new(Momomoto::Procedure)
+    a.procedure_name("test_parameter_sql")
+    assert_equal( false, a.parameters[0][:param1].not_null? )
+    assert_raise( Momomoto::Error ) { a.call }
+    assert_nothing_raised { a.call({:param1=>nil})}
+    assert_nothing_raised { a.call({:param1=>1})}
+
+    b = Class.new(Momomoto::Procedure)
+    b.procedure_name("test_parameter_sql_strict")
+    assert_equal( true, b.parameters[0][:param1].not_null? )
+    assert_raise( Momomoto::Error ) { b.call }
+    assert_raise( Momomoto::Error ) { b.call({:param1=>nil})}
+    assert_nothing_raised { b.call({:param1=>1})}
+
+  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.6
-date: 2007-09-24 00:00:00 +02:00
+  version: 0.1.7
+date: 2007-10-07 00:00:00 +02:00
 summary: Momomoto is an object relational mapper for PostgreSQL.
 require_paths: 
 - lib