[open-ils-commits] r18201 - in branches/rel_2_0/Open-ILS/src/sql/Pg: . upgrade (scottmk)

[svn at svn.open-ils.org]

Author: scottmk
Date: 2010-10-06 10:31:57 -0400 (Wed, 06 Oct 2010)
New Revision: 18201

Modified:
   branches/rel_2_0/Open-ILS/src/sql/Pg/110.hold_matrix.sql
   branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0428.schema.hold_retarget.sql
Log:
Backporting a syntax correction; SQL functions cannot reference
their parameters by name.

M    Pg/upgrade/0428.schema.hold_retarget.sql
M    Pg/110.hold_matrix.sql


Modified: branches/rel_2_0/Open-ILS/src/sql/Pg/110.hold_matrix.sql
===================================================================
--- branches/rel_2_0/Open-ILS/src/sql/Pg/110.hold_matrix.sql	2010-10-06 13:54:53 UTC (rev 18200)
+++ branches/rel_2_0/Open-ILS/src/sql/Pg/110.hold_matrix.sql	2010-10-06 14:31:57 UTC (rev 18201)
@@ -348,11 +348,11 @@
 $func$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION action.hold_request_permit_test( pickup_ou INT, request_ou INT, match_item BIGINT, match_user INT, match_requestor INT ) RETURNS SETOF action.matrix_test_result AS $func$
-    SELECT * FROM action.hold_request_permit_test(pickup_ou, request_ou, match_item, match_user, match_requestor, FALSE);
+    SELECT * FROM action.hold_request_permit_test( $1, $2, $3, $4, $5, FALSE);
 $func$ LANGUAGE SQL;
 
 CREATE OR REPLACE FUNCTION action.hold_retarget_permit_test( pickup_ou INT, request_ou INT, match_item BIGINT, match_user INT, match_requestor INT ) RETURNS SETOF action.matrix_test_result AS $func$
-    SELECT * FROM action.hold_request_permit_test(pickup_ou, request_ou, match_item, match_user, match_requestor, TRUE);
+    SELECT * FROM action.hold_request_permit_test( $1, $2, $3, $4, $5, TRUE );
 $func$ LANGUAGE SQL;
 
 COMMIT;

Modified: branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0428.schema.hold_retarget.sql
===================================================================
--- branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0428.schema.hold_retarget.sql	2010-10-06 13:54:53 UTC (rev 18200)
+++ branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0428.schema.hold_retarget.sql	2010-10-06 14:31:57 UTC (rev 18201)
@@ -182,11 +182,11 @@
 $func$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION action.hold_request_permit_test( pickup_ou INT, request_ou INT, match_item BIGINT, match_user INT, match_requestor INT ) RETURNS SETOF action.matrix_test_result AS $func$
-    SELECT * FROM action.hold_request_permit_test(pickup_ou, request_ou, match_item, match_user, match_requestor, FALSE);
+    SELECT * FROM action.hold_request_permit_test( $1, $2, $3, $4, $5, FALSE);
 $func$ LANGUAGE SQL;
 
 CREATE OR REPLACE FUNCTION action.hold_retarget_permit_test( pickup_ou INT, request_ou INT, match_item BIGINT, match_user INT, match_requestor INT ) RETURNS SETOF action.matrix_test_result AS $func$
-    SELECT * FROM action.hold_request_permit_test(pickup_ou, request_ou, match_item, match_user, match_requestor, TRUE);
+    SELECT * FROM action.hold_request_permit_test( $1, $2, $3, $4, $5, TRUE );
 $func$ LANGUAGE SQL;
 
 COMMIT;