From 69d5fa5a1d6e71faca76efbf041a8958aedfb0d0 Mon Sep 17 00:00:00 2001 From: Paul Water Date: Sat, 21 Sep 2024 12:20:45 +0200 Subject: [PATCH] Align with changes in PhpStratum. --- .gitignore | 9 ------- composer.json | 7 ++---- ...uthority_core_user_has_access_to_page.psql | 24 +++++++++---------- 3 files changed, 14 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 80065db..03e24ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,4 @@ /.idea/ /bin/ /composer.lock -/custom.task.properties -/custom.type.properties -/doc/ -/test/C.php -/test/TestDataLayer.php -/test/coverage.xml -/test/etc/columns.txt -/test/etc/routines.json -/test/report/ /vendor/ diff --git a/composer.json b/composer.json index 6aa9e5c..d7ae4ed 100644 --- a/composer.json +++ b/composer.json @@ -14,13 +14,10 @@ "plaisio/db-page": "^0.9.2", "plaisio/kernel": "^3.2.1", "plaisio/session": "^5.0.0", - "setbased/php-stratum-mysql": "^6.6.0" + "setbased/php-stratum-mysql": "^7.0.0" }, - "minimum-stability": "dev", - "prefer-stable": true, "require-dev": { - "phing/phing": "^3.0.0-RC4", - "phpunit/phpunit": "^9.6.3", + "phing/phing": "^3.0.0", "plaisio/console-kernel": "^1.0.1" }, "autoload": { diff --git a/lib/psql/abc_authority_core/abc_authority_core_user_has_access_to_page.psql b/lib/psql/abc_authority_core/abc_authority_core_user_has_access_to_page.psql index da49be9..2bceeac 100644 --- a/lib/psql/abc_authority_core/abc_authority_core_user_has_access_to_page.psql +++ b/lib/psql/abc_authority_core/abc_authority_core_user_has_access_to_page.psql @@ -5,20 +5,20 @@ * @param p_usr_id The ID of the user. * @param p_pag_id The ID of the page. * - * @type singleton1 - * - * @return bool + * @type singleton1 bool */ -create procedure abc_authority_core_user_has_access_to_page(in p_cmp_id @abc_auth_user.cmp_id%type@, - in p_usr_id @abc_auth_user.usr_id%type@ -, in p_pag_id @abc_auth_pro_pag.pag_id%type@) -reads sql data +create procedure abc_authority_core_user_has_access_to_page +( + in p_cmp_id smallint(5) unsigned, -- type: ABC_AUTH_USER.cmp_id + in p_usr_id int(10) unsigned, -- type: ABC_AUTH_USER.usr_id + in p_pag_id smallint(5) unsigned -- type: ABC_AUTH_PRO_PAG.pag_id +) + reads sql data begin - select count(*) n + select count(*) as n from ABC_AUTH_USER usr - join ABC_AUTH_PRO_PAG app on app.pro_id = usr.pro_id + join ABC_AUTH_PRO_PAG app on app.pro_id = usr.pro_id where usr.cmp_id = p_cmp_id - and usr.usr_id = p_usr_id - and app.pag_id = p_pag_id - ; + and usr.usr_id = p_usr_id + and app.pag_id = p_pag_id; end