Feat(SQL, UI): Logic for Get-Many SQL Stored Procedures refactored to use Calc Stored Procedures and Dog Command Links page styling improved.
This commit is contained in:
@@ -1,29 +1,37 @@
|
||||
|
||||
USE parts;
|
||||
|
||||
DROP PROCEDURE IF EXISTS parts.p_DOG_get_many_command;
|
||||
DROP PROCEDURE IF EXISTS parts.p_dog_get_many_command;
|
||||
|
||||
DELIMITER //
|
||||
CREATE PROCEDURE parts.p_DOG_get_many_command (
|
||||
CREATE PROCEDURE parts.p_dog_get_many_command (
|
||||
IN a_id_user INT
|
||||
, IN a_get_all_command_category BIT
|
||||
, IN a_get_inactive_command_category BIT
|
||||
, IN a_ids_command_category TEXT
|
||||
, IN a_names_command_category TEXT
|
||||
, IN a_get_all_command BIT
|
||||
, IN a_get_inactive_command BIT
|
||||
, IN a_ids_command TEXT
|
||||
, IN a_names_command TEXT
|
||||
, IN a_output_command_categories BIT
|
||||
, IN a_output_commands BIT
|
||||
, IN a_debug BIT
|
||||
)
|
||||
BEGIN
|
||||
DECLARE v_can_view BIT;
|
||||
DECLARE v_code_type_error_bad_data VARCHAR(100);
|
||||
DECLARE v_code_type_error_no_permission VARCHAR(100);
|
||||
DECLARE v_id_type_error_bad_data INT;
|
||||
DECLARE v_id_type_error_no_permission INT;
|
||||
DECLARE v_guid BINARY(36);
|
||||
DECLARE v_has_filter_command_id BIT;
|
||||
DECLARE v_has_filter_command_name BIT;
|
||||
DECLARE v_guid BINARY(36);
|
||||
DECLARE v_id_permission_command_view INT;
|
||||
DECLARE v_has_filter_command_category_id BIT;
|
||||
DECLARE v_has_filter_command_category_name BIT;
|
||||
DECLARE v_id_minimum INT;
|
||||
DECLARE v_id_permission_dog_view INT;
|
||||
DECLARE v_id_type_error_bad_data INT;
|
||||
DECLARE v_id_type_error_no_permission INT;
|
||||
DECLARE v_time_start TIMESTAMP(6);
|
||||
DECLARE v_can_view BIT;
|
||||
|
||||
DECLARE exit handler for SQLEXCEPTION
|
||||
BEGIN
|
||||
@@ -78,22 +86,36 @@ BEGIN
|
||||
SET v_code_type_error_no_permission := 'NO_PERMISSION';
|
||||
SET v_id_type_error_bad_data := (SELECT ERROR_TYPE.id_type FROM parts.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_bad_data LIMIT 1);
|
||||
SET v_id_type_error_no_permission := (SELECT ERROR_TYPE.id_type FROM parts.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_no_permission LIMIT 1);
|
||||
SET v_id_permission_command_view := (SELECT PERMISSION.id_permission FROM parts.DOG_Permission PERMISSION WHERE PERMISSION.code = 'DOG_VIEW' LIMIT 1);
|
||||
SET v_id_permission_dog_view := (SELECT PERMISSION.id_permission FROM parts.DOG_Permission PERMISSION WHERE PERMISSION.code = 'DOG_VIEW' LIMIT 1);
|
||||
|
||||
SET a_id_user := IFNULL(a_id_user, 0);
|
||||
/*
|
||||
SET a_get_all_command_category := IFNULL(a_get_all_command_category, 0);
|
||||
SET a_get_inactive_command_category := IFNULL(a_get_inactive_command_category, 0);
|
||||
SET a_ids_command_category := TRIM(IFNULL(a_ids_command_category, ''));
|
||||
SET a_names_command_category := TRIM(IFNULL(a_names_command_category, ''));
|
||||
SET a_get_all_command := IFNULL(a_get_all_command, 0);
|
||||
SET a_get_inactive_command := IFNULL(a_get_inactive_command, 0);
|
||||
SET a_ids_command := TRIM(IFNULL(a_ids_command, ''));
|
||||
SET a_names_command := TRIM(IFNULL(a_names_command, ''));
|
||||
*/
|
||||
SET a_output_command_categories := IFNULL(a_output_command_categories, 0);
|
||||
SET a_output_commands := IFNULL(a_output_commands, 0);
|
||||
SET a_debug := IFNULL(a_debug, 0);
|
||||
|
||||
IF a_debug = 1 THEN
|
||||
SELECT
|
||||
a_id_user
|
||||
, a_get_all_command_category
|
||||
, a_get_inactive_command_category
|
||||
, a_ids_command_category
|
||||
, a_names_command_category
|
||||
, a_get_all_command
|
||||
, a_get_inactive_command
|
||||
, a_ids_command
|
||||
, a_names_command
|
||||
, a_output_command_categories
|
||||
, a_output_commands
|
||||
, a_debug
|
||||
;
|
||||
|
||||
@@ -101,19 +123,30 @@ BEGIN
|
||||
v_id_type_error_bad_data
|
||||
, v_id_type_error_no_permission
|
||||
, v_guid
|
||||
, v_id_permission_command_view
|
||||
, v_id_permission_dog_view
|
||||
, v_time_start
|
||||
;
|
||||
END IF;
|
||||
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp_Split_Name;
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp_Split_Id;
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error;
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp_Command;
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp_Command_Category;
|
||||
|
||||
CREATE TEMPORARY TABLE tmp_Command_Category (
|
||||
id_command_category INT NOT NULL
|
||||
, code VARCHAR(100)
|
||||
, name VARCHAR(250)
|
||||
, active BIT
|
||||
);
|
||||
|
||||
CREATE TEMPORARY TABLE tmp_Command (
|
||||
id_command INT NOT NULL
|
||||
, id_command_category INT NOT NULL
|
||||
, name VARCHAR(250)
|
||||
, hand_signal_default_description TEXT
|
||||
, can_have_button BIT
|
||||
, notes TEXT
|
||||
, active BIT
|
||||
);
|
||||
|
||||
CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
|
||||
@@ -121,147 +154,24 @@ BEGIN
|
||||
, id_type INT NULL
|
||||
, code VARCHAR(100) NOT NULL
|
||||
, msg VARCHAR(4000) NOT NULL
|
||||
);
|
||||
);
|
||||
|
||||
CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Split_Id (
|
||||
substring VARCHAR(4000) NOT NULL
|
||||
, as_int INT NULL
|
||||
);
|
||||
DELETE FROM tmp_Split_Id;
|
||||
|
||||
CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Split_Name (
|
||||
substring VARCHAR(4000) NOT NULL
|
||||
, as_int INT NULL
|
||||
);
|
||||
DELETE FROM tmp_Split_Name;
|
||||
|
||||
CALL parts.p_core_validate_guid ( v_guid );
|
||||
|
||||
SET v_has_filter_command_id = CASE WHEN a_ids_command = '' THEN 0 ELSE 1 END;
|
||||
SET v_has_filter_command_name = CASE WHEN a_names_command = '' THEN 0 ELSE 1 END;
|
||||
|
||||
-- Commands
|
||||
IF v_has_filter_command_id = 1 THEN
|
||||
CALL parts.p_split(v_guid, a_ids_command, ',', a_debug);
|
||||
|
||||
INSERT INTO tmp_Split_Id (
|
||||
substring
|
||||
, as_int
|
||||
)
|
||||
SELECT
|
||||
SPLIT_T.substring
|
||||
, CONVERT(SPLIT_T.substring, DECIMAL(10,0)) AS as_int
|
||||
FROM parts.CORE_Split_Temp SPLIT_T
|
||||
WHERE
|
||||
SPLIT_T.GUID = v_guid
|
||||
AND IFNULL(SPLIT_T.substring, '') <> ''
|
||||
;
|
||||
|
||||
CALL parts.p_clear_split_temp( v_guid );
|
||||
END IF;
|
||||
|
||||
IF v_has_filter_command_name = 1 THEN
|
||||
CALL parts.p_split(v_guid, a_names_command, ',', a_debug);
|
||||
|
||||
INSERT INTO tmp_Split_Name (
|
||||
substring
|
||||
, as_int
|
||||
)
|
||||
SELECT
|
||||
SPLIT_T.substring
|
||||
, CONVERT(SPLIT_T.substring, DECIMAL(10,0)) AS as_int
|
||||
FROM parts.CORE_Split_Temp SPLIT_T
|
||||
WHERE
|
||||
SPLIT_T.GUID = v_guid
|
||||
AND IFNULL(SPLIT_T.substring, '') <> ''
|
||||
;
|
||||
|
||||
CALL parts.p_clear_split_temp( v_guid );
|
||||
END IF;
|
||||
|
||||
IF NOT EXISTS (SELECT * FROM tmp_Msg_Error t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
|
||||
IF EXISTS (
|
||||
SELECT *
|
||||
FROM tmp_Split_Id t_SPLIT_ID
|
||||
LEFT JOIN parts.DOG_Command COMMAND ON t_SPLIT_ID.as_int = COMMAND.id_command
|
||||
WHERE
|
||||
ISNULL(t_SPLIT_ID.as_int)
|
||||
OR ISNULL(COMMAND.id_command)
|
||||
OR (
|
||||
COMMAND.active = 0
|
||||
AND a_get_inactive_command = 0
|
||||
)
|
||||
) THEN
|
||||
INSERT INTO tmp_Msg_Error (
|
||||
id_type
|
||||
, code
|
||||
, msg
|
||||
)
|
||||
SELECT
|
||||
v_id_type_error_bad_data
|
||||
, v_code_type_error_bad_data
|
||||
, CONCAT('Invalid or inactive Command IDs: ', IFNULL(GROUP_CONCAT(t_SPLIT_ID.substring SEPARATOR ', '), 'NULL'))
|
||||
FROM tmp_Split_Id t_SPLIT_ID
|
||||
LEFT JOIN parts.DOG_Command COMMAND ON t_SPLIT_ID.as_int = COMMAND.id_command
|
||||
WHERE
|
||||
ISNULL(t_SPLIT_ID.as_int)
|
||||
OR ISNULL(COMMAND.id_command)
|
||||
OR (
|
||||
COMMAND.active = 0
|
||||
AND a_get_inactive_command = 0
|
||||
)
|
||||
;
|
||||
/* Don't error on codes or names not found
|
||||
ELSEIF EXISTS (
|
||||
SELECT *
|
||||
*/
|
||||
ELSE
|
||||
INSERT INTO tmp_Command (
|
||||
id_command
|
||||
, name
|
||||
)
|
||||
SELECT
|
||||
COMMAND.id_command
|
||||
, COMMAND.name
|
||||
FROM parts.DOG_Command COMMAND
|
||||
LEFT JOIN tmp_Split_Id t_SPLIT_ID ON COMMAND.id_command = t_SPLIT_ID.as_int
|
||||
LEFT JOIN tmp_Split_Name t_SPLIT_NAME ON COMMAND.name = t_SPLIT_NAME.substring
|
||||
WHERE
|
||||
(
|
||||
a_get_all_command = 1
|
||||
OR (
|
||||
v_has_filter_command_id = 1
|
||||
OR v_has_filter_command_name = 1
|
||||
)
|
||||
)
|
||||
AND (
|
||||
a_get_inactive_command = 1
|
||||
OR COMMAND.active = 1
|
||||
)
|
||||
;
|
||||
END IF;
|
||||
END IF;
|
||||
|
||||
DELETE FROM tmp_Split_Id;
|
||||
DELETE FROM tmp_Split_Name;
|
||||
|
||||
|
||||
-- Permissions
|
||||
IF a_debug = 1 THEN
|
||||
SELECT
|
||||
v_guid
|
||||
, a_id_user
|
||||
, FALSE -- a_get_inactive_user
|
||||
, v_id_permission_command_view
|
||||
, v_id_permission_dog_view
|
||||
, 0 -- a_debug
|
||||
;
|
||||
END IF;
|
||||
|
||||
CALL parts.p_DOG_calc_user(
|
||||
CALL parts.p_dog_calc_user(
|
||||
v_guid
|
||||
, a_id_user
|
||||
, FALSE -- a_get_inactive_user
|
||||
, v_id_permission_command_view
|
||||
, v_id_permission_dog_view
|
||||
, 0 -- a_debug
|
||||
);
|
||||
|
||||
@@ -276,6 +186,8 @@ BEGIN
|
||||
|
||||
IF a_debug = 1 THEN
|
||||
SELECT v_can_view;
|
||||
SELECT COUNT(*) AS Count_Errors FROM tmp_Msg_Error t_ERROR;
|
||||
SELECT * FROM tmp_Msg_Error t_ERROR;
|
||||
END IF;
|
||||
|
||||
IF (v_can_view = 0) THEN
|
||||
@@ -296,33 +208,126 @@ BEGIN
|
||||
;
|
||||
END IF;
|
||||
|
||||
CALL parts.p_DOG_clear_calc_user(
|
||||
CALL parts.p_dog_clear_calc_user(
|
||||
v_guid
|
||||
, 0 -- a_debug
|
||||
);
|
||||
|
||||
|
||||
-- Call Command Calc
|
||||
IF NOT EXISTS(SELECT * FROM tmp_Msg_Error t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
|
||||
IF a_debug = 1 THEN
|
||||
SELECT
|
||||
v_guid -- a_guid
|
||||
, a_id_user -- a_id_user
|
||||
, a_get_all_command_category
|
||||
, a_get_inactive_command_category
|
||||
, a_ids_command_category
|
||||
, a_names_command_category
|
||||
, a_get_all_command -- a_get_all_command
|
||||
, a_get_inactive_command -- a_get_inactive_command
|
||||
, a_ids_command -- a_ids_command
|
||||
, a_names_command -- a_names_command
|
||||
, 0 -- a_show_errors
|
||||
, 0 -- a_debug
|
||||
;
|
||||
END IF;
|
||||
|
||||
CALL parts.p_dog_calc_command (
|
||||
v_guid -- a_guid
|
||||
, a_id_user -- a_id_user
|
||||
, a_get_all_command_category
|
||||
, a_get_inactive_command_category
|
||||
, a_ids_command_category
|
||||
, a_names_command_category
|
||||
, a_get_all_command -- a_get_all_command
|
||||
, a_get_inactive_command -- a_get_inactive_command
|
||||
, a_ids_command -- a_ids_command
|
||||
, a_names_command -- a_names_command
|
||||
, 0 -- a_show_errors
|
||||
, 0 -- a_debug
|
||||
);
|
||||
|
||||
INSERT INTO tmp_Command_Category (
|
||||
id_command_category
|
||||
, code
|
||||
, name
|
||||
, active
|
||||
)
|
||||
SELECT
|
||||
COMMAND_CATEGORY_T.id_command_category
|
||||
, COMMAND_CATEGORY_T.code
|
||||
, COMMAND_CATEGORY_T.name
|
||||
, COMMAND_CATEGORY_T.active
|
||||
FROM parts.DOG_Command_Category_Temp COMMAND_CATEGORY_T
|
||||
WHERE COMMAND_CATEGORY_T.GUID = v_guid
|
||||
;
|
||||
|
||||
INSERT INTO tmp_Command (
|
||||
id_command
|
||||
, id_command_category
|
||||
, name
|
||||
, hand_signal_default_description
|
||||
, can_have_button
|
||||
, notes
|
||||
, active
|
||||
)
|
||||
SELECT
|
||||
COMMAND_T.id_command
|
||||
, COMMAND_T.id_command_category
|
||||
, COMMAND_T.name
|
||||
, COMMAND_T.hand_signal_default_description
|
||||
, COMMAND_T.can_have_button
|
||||
, COMMAND_T.notes
|
||||
, COMMAND_T.active
|
||||
FROM parts.DOG_Command_Temp COMMAND_T
|
||||
WHERE COMMAND_T.GUID = v_guid
|
||||
;
|
||||
|
||||
IF a_debug = 1 THEN
|
||||
SELECT * FROM tmp_Command_Category;
|
||||
SELECT * FROM tmp_Command;
|
||||
END IF;
|
||||
END IF;
|
||||
|
||||
-- Filter outputs
|
||||
IF EXISTS(SELECT * FROM tmp_Msg_Error t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
|
||||
IF a_debug = 1 THEN
|
||||
SELECT * FROM tmp_Command_Category;
|
||||
SELECT * FROM tmp_Command;
|
||||
END IF;
|
||||
|
||||
DELETE FROM tmp_Command;
|
||||
DELETE FROM tmp_Command_Category;
|
||||
END IF;
|
||||
|
||||
|
||||
-- Outputs
|
||||
-- Command Categories
|
||||
IF a_output_command_categories = 1 THEN
|
||||
SELECT
|
||||
t_COMMAND_CATEGORY.id_command_category
|
||||
, t_COMMAND_CATEGORY.code
|
||||
, t_COMMAND_CATEGORY.name
|
||||
, t_COMMAND_CATEGORY.active
|
||||
FROM tmp_Command_Category t_COMMAND_CATEGORY
|
||||
;
|
||||
END IF;
|
||||
|
||||
-- Commands
|
||||
SELECT
|
||||
t_COMMAND.id_command
|
||||
, COMMAND.id_command_category
|
||||
, t_COMMAND.name
|
||||
, COMMAND.hand_signal_default_description
|
||||
, COMMAND.can_have_button
|
||||
, COMMAND.notes
|
||||
, COMMAND.active
|
||||
FROM parts.DOG_Command COMMAND
|
||||
INNER JOIN tmp_Command t_COMMAND ON COMMAND.id_command = t_COMMAND.id_command
|
||||
;
|
||||
|
||||
IF a_output_commands = 1 THEN
|
||||
SELECT
|
||||
t_COMMAND.id_command
|
||||
, t_COMMAND.id_command_category
|
||||
, t_COMMAND.name
|
||||
, t_COMMAND.hand_signal_default_description
|
||||
, t_COMMAND.can_have_button
|
||||
, t_COMMAND.notes
|
||||
, t_COMMAND.active
|
||||
FROM tmp_Command t_COMMAND
|
||||
;
|
||||
END IF;
|
||||
|
||||
-- Errors
|
||||
SELECT
|
||||
t_ERROR.id_error
|
||||
@@ -341,11 +346,15 @@ BEGIN
|
||||
IF a_debug = 1 AND v_can_view = 1 THEN
|
||||
SELECT * FROM tmp_Command;
|
||||
END IF;
|
||||
|
||||
CALL parts.p_dog_clear_calc_dog(
|
||||
v_guid -- a_guid
|
||||
, 0 -- a_debug
|
||||
);
|
||||
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp_Split_Name;
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp_Split_Id;
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error;
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp_Command;
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp_Command_Category;
|
||||
|
||||
IF a_debug = 1 THEN
|
||||
CALL parts.p_core_debug_timing_reporting ( v_time_start );
|
||||
@@ -356,12 +365,18 @@ DELIMITER ;
|
||||
|
||||
/*
|
||||
|
||||
CALL parts.p_DOG_get_many_command (
|
||||
CALL parts.p_dog_get_many_command (
|
||||
1 -- 'auth0|6582b95c895d09a70ba10fef', -- a_id_user
|
||||
, 1 -- a_get_all_command_category
|
||||
, 0 -- a_get_inactive_command_category
|
||||
, '' -- a_ids_command_category
|
||||
, '' -- a_names_command_category
|
||||
, 1 -- a_get_all_command
|
||||
, 0 -- a_get_inactive_command
|
||||
, '' -- a_ids_command
|
||||
, '' -- a_names_command
|
||||
, 1 -- a_output_command_categories
|
||||
, 1 -- a_output_commands
|
||||
, 1 -- a_debug
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user