switching gorup permissions to pivot

generate.php

@@ -48,7 +48,8 @@ $gen->setConfig(array("dbo" =>
     "mode" => 0775,
     "ignore" => array(
         "tables" => array(
-            "/luticate_users_groups/"
+            "/luticate_users_groups/",
+            "/luticate_permissions_(groups|users)/"
         ),
         "sp" => array(),
         "controllers" => array()

dump.sql → sql/struct_init.sql

@@ -1,37 +1,23 @@
 --
 -- 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;
-
---
---
-
-CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
-
-
 --
+-- Name: sp_lu_get_all_user_permission(integer); Type: FUNCTION; Schema: public; Owner: dev
 --
 
-COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
-
-
-SET search_path = public, pg_catalog;
+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
+$$;
 
 --
 -- Name: sp_lu_get_user_permission(integer, character varying); Type: FUNCTION; Schema: public; Owner: dev
 --
 
 CREATE FUNCTION sp_lu_get_user_permission(_user_id integer, _permisson_name character varying, OUT val boolean) RETURNS boolean
-    LANGUAGE plpgsql IMMUTABLE SECURITY DEFINER COST 10
-    AS $$
+LANGUAGE plpgsql IMMUTABLE SECURITY DEFINER COST 10
+AS $$
 DECLARE
 groups int[];
 g INT;
@@ -49,30 +35,21 @@ BEGIN
 	END if;
 	IF val is null then
 	    SELECT "value" INTO val FROM luticate_permissions WHERE "name" = _permisson_name;
-	    IF val is null then
-	        val := FALSE;
-	    end if;
 	end if;
     END IF;
 END;
 $$;
 
-
-ALTER FUNCTION public.sp_lu_get_user_permission(_user_id integer, _permisson_name character varying, OUT val boolean) OWNER TO dev;
-
 --
 -- Name: luticate_groups_id_seq; Type: SEQUENCE; Schema: public; Owner: dev
 --
 
 CREATE SEQUENCE luticate_groups_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
-ALTER TABLE public.luticate_groups_id_seq OWNER TO dev;
+START WITH 1
+INCREMENT BY 1
+NO MINVALUE
+NO MAXVALUE
+CACHE 1;
 
 SET default_tablespace = '';
 
@@ -87,9 +64,6 @@ CREATE TABLE luticate_groups (
     name character varying NOT NULL
 );
 
-
-ALTER TABLE public.luticate_groups OWNER TO dev;
-
 --
 -- Name: luticate_permissions; Type: TABLE; Schema: public; Owner: dev; Tablespace: 
 --
@@ -99,9 +73,6 @@ CREATE TABLE luticate_permissions (
     value boolean NOT NULL
 );
 
-
-ALTER TABLE public.luticate_permissions OWNER TO dev;
-
 --
 -- Name: luticate_permissions_groups; Type: TABLE; Schema: public; Owner: dev; Tablespace: 
 --
@@ -112,9 +83,6 @@ CREATE TABLE luticate_permissions_groups (
     group_id integer NOT NULL
 );
 
-
-ALTER TABLE public.luticate_permissions_groups OWNER TO dev;
-
 --
 -- Name: luticate_permissions_users; Type: TABLE; Schema: public; Owner: dev; Tablespace: 
 --
@@ -122,25 +90,19 @@ ALTER TABLE public.luticate_permissions_groups OWNER TO dev;
 CREATE TABLE luticate_permissions_users (
     name character varying(128) NOT NULL,
     value boolean,
-    user_id integer
+    user_id integer NOT NULL
 );
 
-
-ALTER TABLE public.luticate_permissions_users OWNER TO dev;
-
 --
 -- Name: luticate_users_id_seq; Type: SEQUENCE; Schema: public; Owner: dev
 --
 
 CREATE SEQUENCE luticate_users_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
-ALTER TABLE public.luticate_users_id_seq OWNER TO dev;
+START WITH 1
+INCREMENT BY 1
+NO MINVALUE
+NO MAXVALUE
+CACHE 1;
 
 --
 -- Name: luticate_users; Type: TABLE; Schema: public; Owner: dev; Tablespace: 
@@ -151,12 +113,12 @@ CREATE TABLE luticate_users (
     username character varying(255) NOT NULL,
     email character varying(255) NOT NULL,
     password character varying(255) NOT NULL,
-    salt character varying(10) NOT NULL
+    salt character varying(10) NOT NULL,
+    profile_id integer,
+    firstname character varying(255) NOT NULL,
+    lastname character varying(255) NOT NULL
 );
 
-
-ALTER TABLE public.luticate_users OWNER TO dev;
-
 --
 -- Name: luticate_users_groups; Type: TABLE; Schema: public; Owner: dev; Tablespace: 
 --
@@ -166,15 +128,12 @@ CREATE TABLE luticate_users_groups (
     group_id integer NOT NULL
 );
 
-
-ALTER TABLE public.luticate_users_groups OWNER TO dev;
-
 --
 -- Name: luticate_groups_name_key; Type: CONSTRAINT; Schema: public; Owner: dev; Tablespace: 
 --
 
 ALTER TABLE ONLY luticate_groups
-    ADD CONSTRAINT luticate_groups_name_key UNIQUE (name);
+ADD CONSTRAINT luticate_groups_name_key UNIQUE (name);
 
 
 --
@@ -182,7 +141,7 @@ ALTER TABLE ONLY luticate_groups
 --
 
 ALTER TABLE ONLY luticate_groups
-    ADD CONSTRAINT luticate_groups_pkey PRIMARY KEY (id);
+ADD CONSTRAINT luticate_groups_pkey PRIMARY KEY (id);
 
 
 --
@@ -190,7 +149,15 @@ ALTER TABLE ONLY luticate_groups
 --
 
 ALTER TABLE ONLY luticate_permissions
-    ADD CONSTRAINT luticate_permissions_pkey PRIMARY KEY (name);
+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
+ADD CONSTRAINT luticate_permissions_users_pkey PRIMARY KEY (name, user_id);
 
 
 --
@@ -198,7 +165,7 @@ ALTER TABLE ONLY luticate_permissions
 --
 
 ALTER TABLE ONLY luticate_users
-    ADD CONSTRAINT luticate_users_email_key UNIQUE (email);
+ADD CONSTRAINT luticate_users_email_key UNIQUE (email);
 
 
 --
@@ -206,7 +173,7 @@ ALTER TABLE ONLY luticate_users
 --
 
 ALTER TABLE ONLY luticate_users_groups
-    ADD CONSTRAINT luticate_users_groups_pkey PRIMARY KEY (user_id, group_id);
+ADD CONSTRAINT luticate_users_groups_pkey PRIMARY KEY (user_id, group_id);
 
 
 --
@@ -214,7 +181,7 @@ ALTER TABLE ONLY luticate_users_groups
 --
 
 ALTER TABLE ONLY luticate_users
-    ADD CONSTRAINT luticate_users_pkey PRIMARY KEY (id);
+ADD CONSTRAINT luticate_users_pkey PRIMARY KEY (id);
 
 
 --
@@ -222,7 +189,7 @@ ALTER TABLE ONLY luticate_users
 --
 
 ALTER TABLE ONLY luticate_users
-    ADD CONSTRAINT luticate_users_username_key UNIQUE (username);
+ADD CONSTRAINT luticate_users_username_key UNIQUE (username);
 
 
 --
@@ -230,23 +197,23 @@ ALTER TABLE ONLY luticate_users
 --
 
 ALTER TABLE ONLY luticate_permissions_groups
-    ADD CONSTRAINT pkey PRIMARY KEY (name, group_id);
+ADD CONSTRAINT pkey PRIMARY KEY (name, group_id);
 
 
 --
 -- Name: foreign_group; Type: FK CONSTRAINT; Schema: public; Owner: dev
 --
 
-ALTER TABLE ONLY luticate_users_groups
-    ADD CONSTRAINT foreign_group FOREIGN KEY (group_id) REFERENCES luticate_groups(id);
+ALTER TABLE ONLY luticate_permissions_groups
+ADD CONSTRAINT foreign_group FOREIGN KEY (group_id) REFERENCES luticate_groups(id) ON DELETE CASCADE;
 
 
 --
 -- Name: foreign_group; Type: FK CONSTRAINT; Schema: public; Owner: dev
 --
 
-ALTER TABLE ONLY luticate_permissions_groups
-    ADD CONSTRAINT foreign_group FOREIGN KEY (group_id) REFERENCES luticate_groups(id);
+ALTER TABLE ONLY luticate_users_groups
+ADD CONSTRAINT foreign_group FOREIGN KEY (group_id) REFERENCES luticate_groups(id) ON DELETE CASCADE;
 
 
 --
@@ -254,7 +221,7 @@ ALTER TABLE ONLY luticate_permissions_groups
 --
 
 ALTER TABLE ONLY luticate_permissions_groups
-    ADD CONSTRAINT foreign_name FOREIGN KEY (name) REFERENCES luticate_permissions(name);
+ADD CONSTRAINT foreign_name FOREIGN KEY (name) REFERENCES luticate_permissions(name) ON DELETE CASCADE;
 
 
 --
@@ -262,15 +229,7 @@ ALTER TABLE ONLY luticate_permissions_groups
 --
 
 ALTER TABLE ONLY luticate_permissions_users
-    ADD CONSTRAINT foreign_name FOREIGN KEY (name) REFERENCES luticate_permissions(name);
-
-
---
---
-
-ALTER TABLE ONLY luticate_users_groups
-    ADD CONSTRAINT foreign_user FOREIGN KEY (user_id) REFERENCES luticate_users(id);
+ADD CONSTRAINT foreign_name FOREIGN KEY (name) REFERENCES luticate_permissions(name) ON DELETE CASCADE;
 
 
 --
@@ -278,20 +237,16 @@ ALTER TABLE ONLY luticate_users_groups
 --
 
 ALTER TABLE ONLY luticate_permissions_users
-    ADD CONSTRAINT foreign_user FOREIGN KEY (user_id) REFERENCES luticate_users(id);
+ADD CONSTRAINT foreign_user FOREIGN KEY (user_id) REFERENCES luticate_users(id) ON DELETE CASCADE;
 
 
 --
+-- Name: foreign_user; Type: FK CONSTRAINT; Schema: public; Owner: dev
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM postgres;
-GRANT ALL ON SCHEMA public TO postgres;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
+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
 --
-

src/Auth/DataAccess/LuticatePermissionsGroupsDataAccess.php

@@ -2,6 +2,7 @@
 
 namespace Luticate\Auth\DataAccess;
 
+use Luticate\Auth\DataAccess\Models\LuticateGroups;
 use Luticate\Utils\LuDataAccess;
 use Luticate\Auth\DataAccess\Models\LuticatePermissionsGroups;
 use Luticate\Auth\DBO\LuticatePermissionsGroupsDbo;
@@ -33,10 +34,11 @@ class LuticatePermissionsGroupsDataAccess extends LuDataAccess {
 
     public static function delete($group_id, $permission_name)
     {
-        $perm = self::getModelByName($group_id, $permission_name);
+        LuticateGroups::find($group_id)->permissions()->detach($permission_name);
+        /*$perm = self::getModelByName($group_id, $permission_name);
         if (is_null($perm))
             return;
-        $perm->delete();
+        $perm->delete();*/
     }
 
     public static function edit($group_id, $permission_name, $permission_value)

src/Auth/DataAccess/Models/LuticateGroups.php

@@ -10,4 +10,9 @@ class LuticateGroups extends LuticateGroupsModel
     {
         return $this->belongsToMany('Luticate\Auth\DataAccess\Models\LuticateUsers', "luticate_users_groups", "group_id", "user_id");
     }
+
+    public function permissions()
+    {
+        return $this->belongsToMany('Luticate\Auth\DataAccess\Models\LuticatePermissions', "luticate_permissions_groups", "group_id", "name");
+    }
 }

src/Auth/DataAccess/Models/LuticatePermissionsGroups.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace Luticate\Auth\DataAccess\Models;
-
-use Luticate\Auth\DBO\LuticatePermissionsGroupsDbo;
-
-class LuticatePermissionsGroups extends LuticatePermissionsGroupsModel
-{
-    protected $primaryKey = "name";
-}

src/Auth/DataAccess/Models/LuticatePermissionsGroupsModel.php

@@ -1,51 +0,0 @@
-<?php
-
-/**
- * AUTO GENERATED BY LUTICATE GENERATOR
- * ANY CHANGES WILL BE OVERWRITTEN
- * DO NOT DIRECTLY USE THIS FILE
- * USE LuticatePermissionsGroups.php
- * TO MAKE YOUR CHANGES AND DATABASE ACCESS
-*/
-
-namespace Luticate\Auth\DataAccess\Models;
-
-use Luticate\Utils\LuModel;
-use Luticate\Auth\DBO\LuticatePermissionsGroupsDbo;
-
-class LuticatePermissionsGroupsModel extends LuModel
-{
-    function __construct()
-    {
-        parent::__construct();
-        $this->timestamps = false;
-    }
-
-    public function toDbo()
-    {
-        $dbo = new LuticatePermissionsGroupsDbo();
-
-        $dbo->setName($this->name);
-        $dbo->setValue($this->value);
-        $dbo->setGroupId($this->group_id);
-
-        return $dbo;
-    }
-
-    /**
-     * @param $dbo LuticatePermissionsGroupsDbo
-     * @param $model LuModel|null
-     * @return LuticatePermissionsGroups
-     */
-    public function fromDbo($dbo, $model = null)
-    {
-        if (is_null($model))
-            $model = new LuticatePermissionsGroups();
-
-        $model->name = $dbo->getName();
-        $model->value = $dbo->getValue();
-        $model->group_id = $dbo->getGroupId();
-
-        return $model;
-    }
-}

src/Auth/DataAccess/Models/LuticatePermissionsUsers.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace Luticate\Auth\DataAccess\Models;
-
-use Luticate\Auth\DBO\LuticatePermissionsUsersDbo;
-
-class LuticatePermissionsUsers extends LuticatePermissionsUsersModel
-{
-    protected $primaryKey = "name";
-}

src/Auth/DataAccess/Models/LuticatePermissionsUsersModel.php

@@ -1,51 +0,0 @@
-<?php
-
-/**
- * AUTO GENERATED BY LUTICATE GENERATOR
- * ANY CHANGES WILL BE OVERWRITTEN
- * DO NOT DIRECTLY USE THIS FILE
- * USE LuticatePermissionsUsers.php
- * TO MAKE YOUR CHANGES AND DATABASE ACCESS
-*/
-
-namespace Luticate\Auth\DataAccess\Models;
-
-use Luticate\Utils\LuModel;
-use Luticate\Auth\DBO\LuticatePermissionsUsersDbo;
-
-class LuticatePermissionsUsersModel extends LuModel
-{
-    function __construct()
-    {
-        parent::__construct();
-        $this->timestamps = false;
-    }
-
-    public function toDbo()
-    {
-        $dbo = new LuticatePermissionsUsersDbo();
-
-        $dbo->setName($this->name);
-        $dbo->setValue($this->value);
-        $dbo->setUserId($this->user_id);
-
-        return $dbo;
-    }
-
-    /**
-     * @param $dbo LuticatePermissionsUsersDbo
-     * @param $model LuModel|null
-     * @return LuticatePermissionsUsers
-     */
-    public function fromDbo($dbo, $model = null)
-    {
-        if (is_null($model))
-            $model = new LuticatePermissionsUsers();
-
-        $model->name = $dbo->getName();
-        $model->value = $dbo->getValue();
-        $model->user_id = $dbo->getUserId();
-
-        return $model;
-    }
-}