From 9a840401994e69dfb54d4677263df448e0175b6e Mon Sep 17 00:00:00 2001 From: KammM Date: Wed, 25 Feb 2026 16:54:09 +0100 Subject: [PATCH] FNDD_GET_LICENSE_COUNT: Safty improvements added --- .../[FNDD_GET_LICENSE_COUNT].sql | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/current/[DD_ECM]-Database/[FNDD_GET_LICENSE_COUNT]/[FNDD_GET_LICENSE_COUNT].sql b/current/[DD_ECM]-Database/[FNDD_GET_LICENSE_COUNT]/[FNDD_GET_LICENSE_COUNT].sql index 3ece0f2..0bb8160 100644 --- a/current/[DD_ECM]-Database/[FNDD_GET_LICENSE_COUNT]/[FNDD_GET_LICENSE_COUNT].sql +++ b/current/[DD_ECM]-Database/[FNDD_GET_LICENSE_COUNT]/[FNDD_GET_LICENSE_COUNT].sql @@ -15,12 +15,13 @@ GO -- Tel.: 0641/202360 • E-Mail: info-flow@digitaldata.works -- ================================================================= -- Creation Date / Author: 13.06.2023 / MS --- Version Date / Editor: 15.09.2025 / MK --- Version Number: 2.0.0.0 +-- Version Date / Editor: 26.09.2025 / MK +-- Version Number: 2.0.1.0 -- ================================================================= -- History: -- 13.06.2023 / MS - First Version -- 15.09.2025 / MK - Enhanced functionality and parameters +-- 26.09.2025 / MK - Minor fixes CREATE OR ALTER FUNCTION [dbo].[FNDD_GET_LICENSE_COUNT]( @pCLIENT_ID TINYINT, -- Give the mandator ID from [TBDD_CLIENT] or 0, for all mandators. @@ -44,6 +45,12 @@ BEGIN @MODULE_SHORT_NAME NVARCHAR(50) = NULL, @CATALOG_TITLE_TERM NVARCHAR(50) = '_LICENSE_LOOKBACK_IN_DAYS'; + --===========================================-- Exit because of missing table --===========================================-- + IF NOT (EXISTS (SELECT * FROM [INFORMATION_SCHEMA].[TABLES] (NOLOCK) WHERE [TABLE_NAME] = 'TBDD_USER_LOGIN_OUT')) BEGIN + RETURN ISNULL(@USED_LICENSE_COUNT,0); + END; + ----------------------------------------------------------------------------------------------------------------------------- + --=================================================-- Get module name --===================================================-- SELECT @MODULE_NAME = [NAME], @MODULE_SHORT_NAME = [SHORT_NAME] @@ -60,7 +67,7 @@ BEGIN --===================================-- Determ how long in the past we need to check --===================================-- IF (@LOOKBACK_IN_DAYS = 0) BEGIN - IF (EXISTS (SELECT * FROM [INFORMATION_SCHEMA].[TABLES] WHERE [TABLE_NAME] = 'TBDD_CATALOG')) BEGIN + IF (EXISTS (SELECT * FROM [INFORMATION_SCHEMA].[TABLES] (NOLOCK) WHERE [TABLE_NAME] = 'TBDD_CATALOG')) BEGIN SELECT TOP (1) @LOOKBACK_IN_DAYS = CONVERT(INTEGER,[CAT_STRING]) FROM [TBDD_CATALOG] (NOLOCK) WHERE [CAT_TITLE] IN (CONCAT(@MODULE_NAME,@CATALOG_TITLE_TERM),CONCAT(@MODULE_SHORT_NAME,@CATALOG_TITLE_TERM)); @@ -73,12 +80,6 @@ BEGIN END; ----------------------------------------------------------------------------------------------------------------------------- - --===========================================-- Exit because of missing table --===========================================-- - IF NOT (EXISTS (SELECT * FROM [INFORMATION_SCHEMA].[TABLES] WHERE [TABLE_NAME] = 'TBDD_USER_LOGIN_OUT')) BEGIN - RETURN ISNULL(@USED_LICENSE_COUNT,0); - END; - ----------------------------------------------------------------------------------------------------------------------------- - --=====================================================-- main part --=====================================================-- IF (@CLIENT_ID = 0) BEGIN