From: Alan Knowles <alan@roojs.com>
Date: Tue, 11 Oct 2016 06:06:50 +0000 (+0800)
Subject: Merge branch 'master' of http://git.roojs.com:8081/Pman.Core
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=f9252e32d35c80920796dd0dcc71bdf16bda4108;hp=eda3b4e572b8976d9e2fb757061dac47f9a593b2

Merge branch 'master' of git.roojs.com:8081/Pman.Core
---

diff --git a/mysql/person_get_action_type.sql b/mysql/person_get_action_type.sql
deleted file mode 100644
index dcd36804..00000000
--- a/mysql/person_get_action_type.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-
-DROP FUNCTION IF EXISTS person_get_action_type;
-
-DELIMITER $$
-CREATE FUNCTION person_get_action_type(in_id INT(11))  RETURNS VARCHAR(32) DETERMINISTIC
-    BEGIN
-        
-        DECLARE v_ret VARCHAR(32);
-        SET v_ret= '';
-        SELECT action_type INTO v_ret  FROM Person WHERE id = in_id  LIMIT 1;
-        RETURN v_ret;
-    END $$
-DELIMITER ;
diff --git a/mysql/person_get_by_email.sql b/mysql/person_get_by_email.sql
deleted file mode 100644
index a098e615..00000000
--- a/mysql/person_get_by_email.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-
-DROP FUNCTION IF EXISTS person_get_by_email;
-
-DELIMITER $$
-CREATE FUNCTION person_get_by_email(  
-        in_addr VARCHAR(254)
-        
-
-    )  RETURNS INT(11) DETERMINISTIC
-    BEGIN
-        
-        DECLARE v_id INT(11);
-        SET v_id = 0;
-        SELECT id INTO v_id FROM Person WHERE email = in_addr LIMIT 1;
-        RETURN v_id;
-        
-    END $$
-DELIMITER ;
diff --git a/mysql/person_get_company.sql b/mysql/person_get_company.sql
deleted file mode 100644
index a5dc09ec..00000000
--- a/mysql/person_get_company.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-
-DROP FUNCTION IF EXISTS person_get_company;
-
-DELIMITER $$
-CREATE FUNCTION person_get_company(  
-       in_id INT(11)
-    )  RETURNS INT(11) DETERMINISTIC
-    BEGIN
-        
-        DECLARE v_id INT(11);
-        SET v_id = 0;
-        SELECT company_id INTO v_id FROM Person WHERE id  = in_id LIMIT 1;
-        RETURN v_id;
-    END $$
-DELIMITER ;
diff --git a/mysql/person_get_internal_id.sql b/mysql/person_get_internal_id.sql
deleted file mode 100644
index ee673b86..00000000
--- a/mysql/person_get_internal_id.sql
+++ /dev/null
@@ -1,32 +0,0 @@
-
-DROP FUNCTION IF EXISTS person_get_internal_id;
-
-DELIMITER $$
-CREATE FUNCTION person_get_internal_id(  
-        in_addr VARCHAR(254)
-        
-
-    )  RETURNS INT(11) DETERMINISTIC
-    BEGIN
-        
-        DECLARE v_id INT(11);
-        DECLARE v_company_id INT(11);
-        SET v_id = 0;
-        SET v_company_id = 0;
-        
-        SELECT company_get_owner() INTO v_company_id;
-        IF v_company_id < 1 THEN
-            RETURN 0;
-        END IF;
-        
-        SELECT id INTO v_id FROM Person WHERE
-            company_id = v_company_id
-            AND email = in_addr LIMIT 1;
-        
-        RETURN v_id;
-        
-    
-        
-        
-    END $$
-DELIMITER ;
diff --git a/mysql/person_get_name.sql b/mysql/person_get_name.sql
deleted file mode 100644
index f25d4bc2..00000000
--- a/mysql/person_get_name.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-DROP FUNCTION IF EXISTS person_get_name;
-
-DELIMITER $$
-CREATE FUNCTION person_get_name(in_id INT(11))  RETURNS VARCHAR(254) DETERMINISTIC
-    BEGIN
-        
-        DECLARE v_ret VARCHAR(254);
-        SET v_ret= '';
-        SELECT name INTO v_ret  FROM Person WHERE id = in_id  LIMIT 1;
-        RETURN v_ret;
-    END $$
-DELIMITER ;
\ No newline at end of file
diff --git a/mysql/person_get_project_id.sql b/mysql/person_get_project_id.sql
deleted file mode 100644
index 90fab7bb..00000000
--- a/mysql/person_get_project_id.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-DROP FUNCTION IF EXISTS person_get_project_id;
-
-DELIMITER $$
-CREATE FUNCTION person_get_project_id(  
-       in_id INT(11)
-    )  RETURNS INT(11) DETERMINISTIC
-    BEGIN
-        
-        DECLARE v_id INT(11);
-        SET v_id = 0;
-        SELECT project_id INTO v_id FROM Person WHERE id  = in_id LIMIT 1;
-        RETURN v_id;
-    END $$
-
-
-DELIMITER ;
diff --git a/mysql/person_has_perm.sql b/mysql/person_has_perm.sql
deleted file mode 100644
index a0511375..00000000
--- a/mysql/person_has_perm.sql
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-DROP FUNCTION IF EXISTS person_has_perm;
-
-DELIMITER $$
-CREATE FUNCTION person_has_perm(  
-       in_person_id INT(11),
-       in_perm_name VARCHAR(64),
-       in_perm_level VARCHAR(1)
-    )  RETURNS INT(11) DETERMINISTIC
-    BEGIN
-        
-        DECLARE v_id INT(11);
-        SET v_id = 0;
-        SELECT
-                group_members.id INTO v_id 
-            FROM
-                group_rights 
-            LEFT JOIN
-                group_members
-            ON 
-                group_rights.group_id = group_members.group_id  
-            WHERE 
-                group_rights.rightname= in_perm_name AND 
-                accessmask LIKE CONCAT('%', in_perm_level, '%') AND user_id = in_person_id LIMIT 1;
-        
-        RETURN v_id;
-    END $$
-DELIMITER ;
diff --git a/mysql/project_get_type.sql b/mysql/project_get_type.sql
deleted file mode 100644
index f4a757e5..00000000
--- a/mysql/project_get_type.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-
-DROP FUNCTION IF EXISTS project_get_type;
-DELIMITER $$
-CREATE FUNCTION project_get_type(in_id INT(11))  RETURNS VARCHAR(2) DETERMINISTIC
-    BEGIN
-        DECLARE v_ret VARCHAR(2);
-        SET v_ret= '';
-        SELECT type INTO v_ret  FROM Projects WHERE id = in_id LIMIT 1;
-        RETURN v_ret;
-    END $$
-DELIMITER ;
\ No newline at end of file