[open-ils-commits] r15449 - in trunk/Open-ILS/src/sql/Pg: . upgrade (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2010-02-04 13:09:07 -0500 (Thu, 04 Feb 2010)
New Revision: 15449

Added:
   trunk/Open-ILS/src/sql/Pg/upgrade/0150.data.permission.merge_users.sql
Modified:
   trunk/Open-ILS/src/sql/Pg/002.schema.config.sql
   trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql
Log:
Give the correct i18n ID to MERGE_USERS (thanks to Benjamin Shum for catching this)

Also add MERGE_USERS to the schema upgrade


Modified: trunk/Open-ILS/src/sql/Pg/002.schema.config.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/002.schema.config.sql	2010-02-04 17:21:37 UTC (rev 15448)
+++ trunk/Open-ILS/src/sql/Pg/002.schema.config.sql	2010-02-04 18:09:07 UTC (rev 15449)
@@ -51,7 +51,7 @@
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0149'); -- Scott McKellar
+INSERT INTO config.upgrade_log (version) VALUES ('0150'); -- dbs
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,

Modified: trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql	2010-02-04 17:21:37 UTC (rev 15448)
+++ trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql	2010-02-04 18:09:07 UTC (rev 15449)
@@ -1252,7 +1252,7 @@
     (359, 'HOLD_ITEM_CHECKED_OUT.override', oils_i18n_gettext(359, 'Allows a user to place a hold on an item that they already have checked out', 'ppl', 'description')),
     (360, 'RETRIEVE_RESERVATION_PULL_LIST', oils_i18n_gettext(360, 'Allows a user to retrieve a booking reservation pull list', 'ppl', 'description')),
     (361, 'CAPTURE_RESERVATION', oils_i18n_gettext(361, 'Allows a user to capture booking reservations', 'ppl', 'description')),
-    (362, 'MERGE_USERS', oils_i18n_gettext(361, 'Allows user records to be merged', 'ppl', 'description'))
+    (362, 'MERGE_USERS', oils_i18n_gettext(362, 'Allows user records to be merged', 'ppl', 'description'))
 ;
 
 SELECT SETVAL('permission.perm_list_id_seq'::TEXT, 1000);

Added: trunk/Open-ILS/src/sql/Pg/upgrade/0150.data.permission.merge_users.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/upgrade/0150.data.permission.merge_users.sql	                        (rev 0)
+++ trunk/Open-ILS/src/sql/Pg/upgrade/0150.data.permission.merge_users.sql	2010-02-04 18:09:07 UTC (rev 15449)
@@ -0,0 +1,8 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0150'); -- dbs
+
+INSERT INTO permission.perm_list (id, code, description)
+    VALUES (362, 'MERGE_USERS', 'Allows user records to be merged');
+
+COMMIT;