momomoto 0.1.16 → 0.1.17

data/lib/momomoto/procedure.rb

@@ -65,7 +65,11 @@ module Momomoto
 
       # executes the stored procedure
       def call( params = {}, conditions = {}, options = {} )
-        sql = "SELECT #{columns.keys.join(',')} FROM "
+        if columns.length > 0
+          sql = "SELECT #{columns.keys.join(',')} FROM "
+        else
+          sql = "SELECT "
+        end
         sql += "#{full_name}(#{compile_parameter(params)})"
         sql += compile_where( conditions )
         sql += compile_order( options[:order] ) if options[:order]

data/sql/procedures.sql

@@ -41,13 +41,15 @@ BEGIN
       END LOOP;
     ELSIF typ.typtype = 'p' THEN
       -- pseudo type
-      FOR i IN array_lower(proc.proallargtypes, 1) .. array_upper(proc.proallargtypes, 1)
-      LOOP
-        CONTINUE WHEN proc.proargmodes[ i ] = 'i';
-        col.column_name = proc.proargnames[ i ];
-        col.data_type = format_type( proc.proallargtypes[ i ], NULL );
-        RETURN NEXT col;
-      END LOOP;
+      IF typ.typname <> 'void' THEN
+        FOR i IN array_lower(proc.proallargtypes, 1) .. array_upper(proc.proallargtypes, 1)
+        LOOP
+          CONTINUE WHEN proc.proargmodes[ i ] = 'i';
+          col.column_name = proc.proargnames[ i ];
+          col.data_type = format_type( proc.proallargtypes[ i ], NULL );
+          RETURN NEXT col;
+        END LOOP;
+      END IF;
     ELSE
       RAISE EXCEPTION 'Not yet implemented';
     END IF;

data/test/test_functions.sql

@@ -32,6 +32,9 @@ CREATE OR REPLACE FUNCTION test_set_returning( person_id INTEGER ) RETURNS SETOF
   END;
 $$ LANGUAGE plpgsql;
 
+CREATE OR REPLACE FUNCTION test_returns_void() RETURNS VOID AS $$
+$$ LANGUAGE SQL;
+
 CREATE OR REPLACE FUNCTION test_parameter_inout_sql( IN param1 INTEGER, OUT ret1 INTEGER ) AS $$
   SELECT $1;
 $$ LANGUAGE sql;

data/test/test_procedure.rb

@@ -77,6 +77,12 @@ class TestProcedure < Test::Unit::TestCase
     Test_set_returning.call({:person_id => 5},{:person_id => 5},{:order=>:person_id,:limit=>10} )
   end
 
+  def test_returns_void
+    self.class.const_set(:Test_returns_void, Class.new( Momomoto::Procedure ) )
+    assert_equal( "test_returns_void", Test_returns_void.procedure_name )
+    Test_returns_void.call()
+  end
+
   def test_call_strict
     a = Class.new(Momomoto::Procedure)
     a.procedure_name("test_parameter_sql")

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: momomoto
 version: !ruby/object:Gem::Version 
-  version: 0.1.16
-date: 2008-01-21 00:00:00 +01:00
+  version: 0.1.17
+date: 2008-03-09 00:00:00 +01:00
 summary: Momomoto is an object relational mapper for PostgreSQL.
 require_paths: 
 - lib