From c81c46d426ecd6f4c33226a9c9c125ffab2dfdfc Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Thu, 23 Jun 2022 14:46:19 +0900 Subject: [PATCH] Move read_env_file.php to deprecated folder --- .../20220622-01.edit_user-table-updates.sql | 81 +++++++++++++++++++ .../deprecated}/read_env_file.php | 2 +- 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 4dev/database/tests/20220622-01.edit_user-table-updates.sql rename {www/configs => 4dev/deprecated}/read_env_file.php (97%) diff --git a/4dev/database/tests/20220622-01.edit_user-table-updates.sql b/4dev/database/tests/20220622-01.edit_user-table-updates.sql new file mode 100644 index 00000000..9a0cbdac --- /dev/null +++ b/4dev/database/tests/20220622-01.edit_user-table-updates.sql @@ -0,0 +1,81 @@ +-- +SELECT +eu.cuid, eu.username, +eu.lock_until, eu.lock_after, +CASE WHEN ( +(eu.lock_until IS NULL +OR (eu.lock_until IS NOT NULL AND NOW() >= eu.lock_until)) +AND (eu.lock_after IS NULL +OR (eu.lock_after IS NOT NULL AND NOW() <= eu.lock_after)) +) THEN 0::INT ELSE 1::INT END locked_period +FROM edit_user eu +WHERE eu.username = 'empty'; + +UPDATE edit_user SET +lock_until = NOW() + '1 day'::interval +WHERE username = 'empty'; +UPDATE edit_user SET +lock_after = NOW() - '1 day'::interval +WHERE username = 'empty'; + + +UPDATE edit_user SET +lock_until = NOW() - '1 day'::interval +WHERE username = 'empty'; +UPDATE edit_user SET +lock_after = NOW() + '1 day'::interval +WHERE username = 'empty'; + +UPDATE edit_user SET lock_until = NULL, lock_after = NULL WHERE username = 'empty'; + +-- +SELECT +eu.cuid, eu.username, +eu.login_user_id, login_user_id_set_date, eu.login_user_id_last_revalidate, +(eu.login_user_id_last_revalidate + eu.login_user_id_revalidate_after)::DATE AS reval_date, NOW()::DATE, +eu.login_user_id_valid_from, eu.login_user_id_valid_until, +eu.login_user_id_revalidate_after, +CASE WHEN ( +(eu.login_user_id_valid_from IS NULL +OR (eu.login_user_id_valid_from IS NOT NULL AND NOW() >= eu.login_user_id_valid_from)) +AND (eu.login_user_id_valid_until IS NULL +OR (eu.login_user_id_valid_until IS NOT NULL AND NOW() <= eu.login_user_id_valid_until)) +) THEN 1::INT ELSE 0::INT END AS login_user_id_valid_date, +CASE WHEN eu.login_user_id_revalidate_after IS NOT NULL +AND eu.login_user_id_revalidate_after > '0 days'::INTERVAL +AND (eu.login_user_id_last_revalidate + eu.login_user_id_revalidate_after)::DATE <= NOW()::DATE +THEN 1::INT ELSE 0::INT END AS login_user_id_revalidate +FROM edit_user eu +WHERE eu.username = 'empty'; + +-- init +UPDATE edit_user SET login_user_id = random_string(5) WHERE username = 'empty'; + +-- outside valid +UPDATE edit_user SET +login_user_id_valid_from = NOW() - '1 day'::interval +WHERE username = 'empty'; +UPDATE edit_user SET +login_user_id_valid_until = NOW() + '1 day'::interval +WHERE username = 'empty'; +-- inside valid +UPDATE edit_user SET +login_user_id_valid_from = NOW() + '1 day'::interval +WHERE username = 'empty'; +UPDATE edit_user SET +login_user_id_valid_until = NOW() - '1 day'::interval +WHERE username = 'empty'; + +-- revalidate must +UPDATE edit_user SET +login_user_id_last_revalidate = NOW() - '1 day'::interval, +login_user_id_revalidate_after = '1 day'::interval +WHERE username = 'empty'; +-- revalidate not yet +UPDATE edit_user SET +login_user_id_last_revalidate = NOW(), +login_user_id_revalidate_after = '6 day'::interval +WHERE username = 'empty'; + + +UPDATE edit_user SET login_user_id_set_date = NULL, login_user_id_last_revalidate = NULL, login_user_id_valid_from = NULL, login_user_id_valid_until = NULL, login_user_id_revalidate_after = NULL WHERE username = 'empty'; diff --git a/www/configs/read_env_file.php b/4dev/deprecated/read_env_file.php similarity index 97% rename from www/configs/read_env_file.php rename to 4dev/deprecated/read_env_file.php index c1f466ca..88ee0d9a 100644 --- a/www/configs/read_env_file.php +++ b/4dev/deprecated/read_env_file.php @@ -25,7 +25,7 @@ declare(strict_types=1); * 1 for file loadable, but no data inside * 2 for file not readable * 3 for file not found - * @deprecated V6 Use \CoreLibs\Get\ReadEnvFile::readEnvFile() + * @deprecated V6 Use \CoreLibs\Get\DotEnv::readEnvFile() */ function readEnvFile(string $path = __DIR__, string $env_file = '.env'): int {