sql init

sql/data_init.sql

@@ -1,16 +1,6 @@
 --
 -- PostgreSQL database dump
 --
-
-SET statement_timeout = 0;
-SET lock_timeout = 0;
-SET client_encoding = 'UTF8';
-SET standard_conforming_strings = on;
-SET check_function_bodies = false;
-SET client_min_messages = warning;
-
-SET search_path = public, pg_catalog;
-
 --
 -- Data for Name: luticate_groups; Type: TABLE DATA; Schema: public; Owner: dev
 --
@@ -23,7 +13,7 @@ INSERT INTO luticate_groups VALUES (1, 'Administrators');
 -- Name: luticate_groups_id_seq; Type: SEQUENCE SET; Schema: public; Owner: dev
 --
 
-SELECT pg_catalog.setval('luticate_groups_id_seq', 1, true);
+SELECT pg_catalog.setval('luticate_groups_id_seq', 2, true);
 
 
 --
@@ -124,7 +114,7 @@ INSERT INTO luticate_permissions_groups VALUES ('LU_PERM_DEL', false, 1);
 --
 
 INSERT INTO luticate_users VALUES (0, 'anonymous', 'anonymous@example.com', '', '', NULL, 'anonymous', 'anonymous');
-INSERT INTO luticate_users VALUES (1, 'root', 'root@example.com', '$2y$10$ec8HHsBm1hFoiCtyj51Gwuj42PZ2oUp5BOnYq5/oh.FNAHIkgSGYO', 'LNzBBugvD6', NULL, 'root', 'root');
+INSERT INTO luticate_users VALUES (1, 'root', 'root@me.com', '$2y$10$m1aN1a1ZEr1vmjFPfWl4Pu/63EhcxVCrC/DF0DFhdGbvORwtJtCmy', '3vwW1qQ28I', NULL, 'root', 'root');
 
 
 --
@@ -134,7 +124,6 @@ INSERT INTO luticate_users VALUES (1, 'root', 'root@example.com', '$2y$10$ec8HHs
 INSERT INTO luticate_permissions_users VALUES ('LU_GROUP_ADD', false, 0);
 INSERT INTO luticate_permissions_users VALUES ('LU_GROUP_DEL', false, 0);
 INSERT INTO luticate_permissions_users VALUES ('LU_GROUP_EDIT', false, 0);
-INSERT INTO luticate_permissions_users VALUES ('LU_GROUP_GET', false, 0);
 INSERT INTO luticate_permissions_users VALUES ('LU_GROUP_USER_ADD', false, 0);
 INSERT INTO luticate_permissions_users VALUES ('LU_GROUP_USER_DEL', false, 0);
 INSERT INTO luticate_permissions_users VALUES ('LU_PERM_ADD', false, 0);
@@ -158,6 +147,7 @@ INSERT INTO luticate_permissions_users VALUES ('LU_USER_GET', false, 0);
 INSERT INTO luticate_permissions_users VALUES ('LU_USER_SET_PASSWORD', false, 0);
 INSERT INTO luticate_permissions_users VALUES ('LU_USER_SET_PASSWORD_ME', false, 0);
 INSERT INTO luticate_permissions_users VALUES ('LU_USER_LOGIN', true, 0);
+INSERT INTO luticate_permissions_users VALUES ('LU_GROUP_GET', false, 0);
 
 
 --
@@ -171,7 +161,7 @@ INSERT INTO luticate_users_groups VALUES (1, 0);
 -- Name: luticate_users_id_seq; Type: SEQUENCE SET; Schema: public; Owner: dev
 --
 
-SELECT pg_catalog.setval('luticate_users_id_seq', 1, true);
+SELECT pg_catalog.setval('luticate_users_id_seq', 2, true);
 
 
 --

sql/struct_init.sql

@@ -8,9 +8,11 @@
 CREATE FUNCTION sp_lu_get_all_user_permission(_user_id integer, OUT _permisson_name character varying, OUT val boolean) RETURNS SETOF record
 LANGUAGE sql IMMUTABLE SECURITY DEFINER COST 10
 AS $$
-	SELECT p.name, sp_lu_get_user_permission(_user_id, p.name) FROM luticate_permissions p
+SELECT p.name, sp_lu_get_user_permission(_user_id, p.name) FROM luticate_permissions p ORDER bY p.name
 $$;
 
+
+
 --
 -- Name: sp_lu_get_user_permission(integer, character varying); Type: FUNCTION; Schema: public; Owner: dev
 --
@@ -24,18 +26,19 @@ g INT;
 BEGIN
     SELECT "value" INTO val FROM luticate_permissions_users WHERE "user_id" = _user_id AND "name" = _permisson_name;
     IF val is null THEN
-	SELECT array_agg("group_id") INTO groups FROM luticate_users_groups  WHERE "user_id" = _user_id;
-	IF groups is not null then
-	    FOREACH g in ARRAY groups LOOP
-	        SELECT "value" INTO val FROM luticate_permissions_groups WHERE "group_id" = g AND "name" = _permisson_name;
-	        IF val = FALSE THEN
-	            EXIT;
-	        END IF;
-	    END LOOP;
-	END if;
-	IF val is null then
-	    SELECT "value" INTO val FROM luticate_permissions WHERE "name" = _permisson_name;
-	end if;
+        SELECT lpg."value" into val FROM luticate_permissions_groups lpg
+            INNER JOIN luticate_groups lg ON lg."id" = lpg."group_id"
+            INNER JOIN luticate_users_groups lug ON lug."user_id" = _user_id AND lug."group_id" = lg."id"
+        WHERE lpg."name" = _permisson_name and lpg."value" = FALSE;
+        IF val is null then
+            SELECT lpg."value" into val FROM luticate_permissions_groups lpg
+                INNER JOIN luticate_groups lg ON lg."id" = lpg."group_id"
+                INNER JOIN luticate_users_groups lug ON lug."user_id" = _user_id AND lug."group_id" = lg."id"
+            WHERE lpg."name" = _permisson_name and lpg."value" = TRUE;
+            IF val is null then
+                SELECT "value" INTO val FROM luticate_permissions WHERE "name" = _permisson_name;
+            END IF;
+        end if;
     END IF;
 END;
 $$;
@@ -56,7 +59,7 @@ SET default_tablespace = '';
 SET default_with_oids = false;
 
 --
+-- Name: luticate_groups; Type: TABLE; Schema: public; Owner: dev; Tablespace:
 --
 
 CREATE TABLE luticate_groups (
@@ -64,8 +67,10 @@ CREATE TABLE luticate_groups (
     name character varying NOT NULL
 );
 
+
+
 --
+-- Name: luticate_permissions; Type: TABLE; Schema: public; Owner: dev; Tablespace:
 --
 
 CREATE TABLE luticate_permissions (
@@ -73,8 +78,10 @@ CREATE TABLE luticate_permissions (
     value boolean NOT NULL
 );
 
+
+
 --
+-- Name: luticate_permissions_groups; Type: TABLE; Schema: public; Owner: dev; Tablespace:
 --
 
 CREATE TABLE luticate_permissions_groups (
@@ -83,8 +90,10 @@ CREATE TABLE luticate_permissions_groups (
     group_id integer NOT NULL
 );
 
+
+
 --
+-- Name: luticate_permissions_users; Type: TABLE; Schema: public; Owner: dev; Tablespace:
 --
 
 CREATE TABLE luticate_permissions_users (
@@ -93,6 +102,8 @@ CREATE TABLE luticate_permissions_users (
     user_id integer NOT NULL
 );
 
+
+
 --
 -- Name: luticate_users_id_seq; Type: SEQUENCE; Schema: public; Owner: dev
 --
@@ -104,8 +115,10 @@ NO MINVALUE
 NO MAXVALUE
 CACHE 1;
 
+
+
 --
+-- Name: luticate_users; Type: TABLE; Schema: public; Owner: dev; Tablespace:
 --
 
 CREATE TABLE luticate_users (
@@ -119,8 +132,10 @@ CREATE TABLE luticate_users (
     lastname character varying(255) NOT NULL
 );
 
+
+
 --
+-- Name: luticate_users_groups; Type: TABLE; Schema: public; Owner: dev; Tablespace:
 --
 
 CREATE TABLE luticate_users_groups (
@@ -128,8 +143,9 @@ CREATE TABLE luticate_users_groups (
     group_id integer NOT NULL
 );
 
+
 --
+-- Name: luticate_groups_name_key; Type: CONSTRAINT; Schema: public; Owner: dev; Tablespace:
 --
 
 ALTER TABLE ONLY luticate_groups
@@ -137,7 +153,7 @@ ADD CONSTRAINT luticate_groups_name_key UNIQUE (name);
 
 
 --
+-- Name: luticate_groups_pkey; Type: CONSTRAINT; Schema: public; Owner: dev; Tablespace:
 --
 
 ALTER TABLE ONLY luticate_groups
@@ -145,7 +161,7 @@ ADD CONSTRAINT luticate_groups_pkey PRIMARY KEY (id);
 
 
 --
+-- Name: luticate_permissions_pkey; Type: CONSTRAINT; Schema: public; Owner: dev; Tablespace:
 --
 
 ALTER TABLE ONLY luticate_permissions
@@ -153,7 +169,7 @@ ADD CONSTRAINT luticate_permissions_pkey PRIMARY KEY (name);
 
 
 --
+-- Name: luticate_permissions_users_pkey; Type: CONSTRAINT; Schema: public; Owner: dev; Tablespace:
 --
 
 ALTER TABLE ONLY luticate_permissions_users
@@ -161,7 +177,7 @@ ADD CONSTRAINT luticate_permissions_users_pkey PRIMARY KEY (name, user_id);
 
 
 --
+-- Name: luticate_users_email_key; Type: CONSTRAINT; Schema: public; Owner: dev; Tablespace:
 --
 
 ALTER TABLE ONLY luticate_users
@@ -169,7 +185,7 @@ ADD CONSTRAINT luticate_users_email_key UNIQUE (email);
 
 
 --
+-- Name: luticate_users_groups_pkey; Type: CONSTRAINT; Schema: public; Owner: dev; Tablespace:
 --
 
 ALTER TABLE ONLY luticate_users_groups
@@ -177,7 +193,7 @@ ADD CONSTRAINT luticate_users_groups_pkey PRIMARY KEY (user_id, group_id);
 
 
 --
+-- Name: luticate_users_pkey; Type: CONSTRAINT; Schema: public; Owner: dev; Tablespace:
 --
 
 ALTER TABLE ONLY luticate_users
@@ -185,7 +201,7 @@ ADD CONSTRAINT luticate_users_pkey PRIMARY KEY (id);
 
 
 --
+-- Name: luticate_users_username_key; Type: CONSTRAINT; Schema: public; Owner: dev; Tablespace:
 --
 
 ALTER TABLE ONLY luticate_users
@@ -193,7 +209,7 @@ ADD CONSTRAINT luticate_users_username_key UNIQUE (username);
 
 
 --
+-- Name: pkey; Type: CONSTRAINT; Schema: public; Owner: dev; Tablespace:
 --
 
 ALTER TABLE ONLY luticate_permissions_groups
@@ -247,6 +263,7 @@ ADD CONSTRAINT foreign_user FOREIGN KEY (user_id) REFERENCES luticate_users(id)
 ALTER TABLE ONLY luticate_users_groups
 ADD CONSTRAINT foreign_user FOREIGN KEY (user_id) REFERENCES luticate_users(id) ON DELETE CASCADE;
 
+
 --
 -- PostgreSQL database dump complete
 --