From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Tue, 8 Aug 2017 21:28:43 +0000 (-0400)
Subject: LP#1480432: stamp DB update
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=db7b67abd0c52a1ae92f35a7b4f28f441a9af8ad;p=evergreen%2Fpines.git

LP#1480432: stamp DB update

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 6cc41db27a..9dc75dfbb5 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -90,7 +90,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 ('1049', :eg_version); -- mmorgan/stompro/gmcharlt
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1050', :eg_version); -- mmorgan/cesardv/gmcharlt
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/1050.function.permission.user_perms.sql b/Open-ILS/src/sql/Pg/upgrade/1050.function.permission.user_perms.sql
new file mode 100644
index 0000000000..5a9b0d53e0
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/1050.function.permission.user_perms.sql
@@ -0,0 +1,27 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('1050', :eg_version); -- mmorgan/cesardv/gmcharlt
+
+CREATE OR REPLACE FUNCTION permission.usr_perms ( INT ) RETURNS SETOF permission.usr_perm_map AS $$
+    SELECT	DISTINCT ON (usr,perm) *
+	  FROM	(
+			(SELECT * FROM permission.usr_perm_map WHERE usr = $1)
+            UNION ALL
+			(SELECT	-p.id, $1 AS usr, p.perm, p.depth, p.grantable
+			  FROM	permission.grp_perm_map p
+			  WHERE	p.grp IN (
+      SELECT	(permission.grp_ancestors(
+      (SELECT profile FROM actor.usr WHERE id = $1)
+					)).id
+				)
+			)
+            UNION ALL
+			(SELECT	-p.id, $1 AS usr, p.perm, p.depth, p.grantable
+			  FROM	permission.grp_perm_map p
+			  WHERE	p.grp IN (SELECT (permission.grp_ancestors(m.grp)).id FROM permission.usr_grp_map m WHERE usr = $1))
+		) AS x
+	  ORDER BY 2, 3, 4 ASC, 5 DESC ;
+$$ LANGUAGE SQL STABLE ROWS 10;
+
+COMMIT;
+
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.function.permission.user_perms.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.function.permission.user_perms.sql
deleted file mode 100644
index 10af7ba973..0000000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.function.permission.user_perms.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-BEGIN;
-
-SELECT evergreen.upgrade_deps_block_check('0991', :eg_version);
-
-CREATE OR REPLACE FUNCTION permission.usr_perms ( INT ) RETURNS SETOF permission.usr_perm_map AS $$
-    SELECT	DISTINCT ON (usr,perm) *
-	  FROM	(
-			(SELECT * FROM permission.usr_perm_map WHERE usr = $1)
-            UNION ALL
-			(SELECT	-p.id, $1 AS usr, p.perm, p.depth, p.grantable
-			  FROM	permission.grp_perm_map p
-			  WHERE	p.grp IN (
-      SELECT	(permission.grp_ancestors(
-      (SELECT profile FROM actor.usr WHERE id = $1)
-					)).id
-				)
-			)
-            UNION ALL
-			(SELECT	-p.id, $1 AS usr, p.perm, p.depth, p.grantable
-			  FROM	permission.grp_perm_map p
-			  WHERE	p.grp IN (SELECT (permission.grp_ancestors(m.grp)).id FROM permission.usr_grp_map m WHERE usr = $1))
-		) AS x
-	  ORDER BY 2, 3, 4 ASC, 5 DESC ;
-$$ LANGUAGE SQL STABLE ROWS 10;
-
-COMMIT;
-