[open-ils-commits] [GIT] Evergreen ILS branch master updated. 082bb7963d7c7dec1c0f9859d2ff16dad2221eec
Evergreen Git
git at git.evergreen-ils.org
Thu Mar 29 10:19:46 EDT 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via 082bb7963d7c7dec1c0f9859d2ff16dad2221eec (commit)
via 08810b77f44975536bb2658c9886fed6d5742237 (commit)
from b9bb6d473cfc5e500218dcdf9f0cbd2875bdbac4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 082bb7963d7c7dec1c0f9859d2ff16dad2221eec
Author: Thomas Berezansky <tsbere at mvlc.org>
Date: Thu Mar 29 10:15:30 2012 -0400
Stamping No plperl Upgrade Script
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 52dbf17..c2fc9a0 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -86,7 +86,7 @@ CREATE TRIGGER no_overlapping_deps
BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0695', :eg_version); -- phasefx/tsbere
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0696', :eg_version); -- tsbere
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.no_plperl.sql b/Open-ILS/src/sql/Pg/upgrade/0696.no_plperl.sql
similarity index 69%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.no_plperl.sql
rename to Open-ILS/src/sql/Pg/upgrade/0696.no_plperl.sql
index c2157db..38ba028 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.no_plperl.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0696.no_plperl.sql
@@ -1,3 +1,11 @@
+-- Evergreen DB patch 0696.no_plperl.sql
+--
+-- FIXME: insert description of change, if needed
+--
+BEGIN;
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0696', :eg_version);
-- Re-create these as plperlu instead of plperl
CREATE OR REPLACE FUNCTION auditor.set_audit_info(INT, INT) RETURNS VOID AS $$
@@ -14,4 +22,7 @@ CREATE OR REPLACE FUNCTION auditor.clear_audit_info() RETURNS VOID AS $$
delete($_SHARED{"eg_audit_ws"});
$$ LANGUAGE plperlu;
+-- And remove the language so that we don't use it later.
DROP LANGUAGE plperl;
+
+COMMIT;
commit 08810b77f44975536bb2658c9886fed6d5742237
Author: Thomas Berezansky <tsbere at mvlc.org>
Date: Tue Mar 27 12:48:31 2012 -0400
We use plperlu, not plperl. So don't load both!
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
Signed-off-by: Jason Stephenson <jstephenson at 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
--- 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
--- 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
--- 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
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;
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/900.audit-functions.sql | 6 ++--
Open-ILS/src/sql/Pg/create_database.sql | 2 +-
Open-ILS/src/sql/Pg/create_database_9_1.sql | 2 +-
Open-ILS/src/sql/Pg/upgrade/0696.no_plperl.sql | 28 ++++++++++++++++++++++++
5 files changed, 34 insertions(+), 6 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0696.no_plperl.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list