We use plperlu, not plperl. So don't load both!

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>

diff --git a/Open-ILS/src/sql/Pg/900.audit-functions.sql b/Open-ILS/src/sql/Pg/900.audit-functions.sql
index 6c0dc3f..5e1239e 100644 (file)
--- a/Open-ILS/src/sql/Pg/900.audit-functions.sql
+++ b/Open-ILS/src/sql/Pg/900.audit-functions.sql
@@ -28,18 +28,18 @@ CREATE SCHEMA auditor;
 CREATE OR REPLACE FUNCTION auditor.set_audit_info(INT, INT) RETURNS VOID AS $$
     $_SHARED{"eg_audit_user"} = $_[0];
     $_SHARED{"eg_audit_ws"} = $_[1];
-$$ LANGUAGE plperl;
+$$ LANGUAGE plperlu;
 
 -- Get the User AND workstation in one call. Less calls, useful for joins ;)
 CREATE OR REPLACE FUNCTION auditor.get_audit_info() RETURNS TABLE (eg_user INT, eg_ws INT) AS $$
     return [{eg_user => $_SHARED{"eg_audit_user"}, eg_ws => $_SHARED{"eg_audit_ws"}}];
-$$ LANGUAGE plperl;
+$$ LANGUAGE plperlu;
 
 -- Clear the audit info, for whatever reason
 CREATE OR REPLACE FUNCTION auditor.clear_audit_info() RETURNS VOID AS $$
     delete($_SHARED{"eg_audit_user"});
     delete($_SHARED{"eg_audit_ws"});
-$$ LANGUAGE plperl;
+$$ LANGUAGE plperlu;
 
 CREATE FUNCTION auditor.create_auditor_seq     ( sch TEXT, tbl TEXT ) RETURNS BOOL AS $creator$
 BEGIN

diff --git a/Open-ILS/src/sql/Pg/create_database.sql b/Open-ILS/src/sql/Pg/create_database.sql
index b3be0f0..aec933e 100644 (file)
--- a/Open-ILS/src/sql/Pg/create_database.sql
+++ b/Open-ILS/src/sql/Pg/create_database.sql
@@ -14,7 +14,7 @@ CREATE DATABASE :db_name TEMPLATE template0 ENCODING 'UNICODE' LC_COLLATE 'C' LC
 
 \connect :db_name
 
-CREATE LANGUAGE plperl;
+--CREATE LANGUAGE plperl;
 CREATE LANGUAGE plperlu;
 
 -- This dance is because :variable/blah doesn't seem to work when doing \i

diff --git a/Open-ILS/src/sql/Pg/create_database_9_1.sql b/Open-ILS/src/sql/Pg/create_database_9_1.sql
index 97739f9..dd6066f 100644 (file)
--- a/Open-ILS/src/sql/Pg/create_database_9_1.sql
+++ b/Open-ILS/src/sql/Pg/create_database_9_1.sql
@@ -14,7 +14,7 @@ CREATE DATABASE :db_name TEMPLATE template0 ENCODING 'UNICODE' LC_COLLATE 'C' LC
 
 \connect :db_name
 
-CREATE LANGUAGE plperl;
+--CREATE LANGUAGE plperl;
 CREATE LANGUAGE plperlu;
 
 CREATE EXTENSION tablefunc;

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.no_plperl.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.no_plperl.sql
new file mode 100644 (file)
index 0000000..c2157db
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.no_plperl.sql
@@ -0,0 +1,17 @@
+
+-- Re-create these as plperlu instead of plperl
+CREATE OR REPLACE FUNCTION auditor.set_audit_info(INT, INT) RETURNS VOID AS $$
+    $_SHARED{"eg_audit_user"} = $_[0];
+    $_SHARED{"eg_audit_ws"} = $_[1];
+$$ LANGUAGE plperlu;
+
+CREATE OR REPLACE FUNCTION auditor.get_audit_info() RETURNS TABLE (eg_user INT, eg_ws INT) AS $$
+    return [{eg_user => $_SHARED{"eg_audit_user"}, eg_ws => $_SHARED{"eg_audit_ws"}}];
+$$ LANGUAGE plperlu;
+
+CREATE OR REPLACE FUNCTION auditor.clear_audit_info() RETURNS VOID AS $$
+    delete($_SHARED{"eg_audit_user"});
+    delete($_SHARED{"eg_audit_ws"});
+$$ LANGUAGE plperlu;
+
+DROP LANGUAGE plperl;