FCLT#73169 RAISE_APPLICATION_ERROR met volledige tekst moet ORA-20001 zijn, niet 20000

svn path=/Database/trunk/; revision=56410
This commit is contained in:
Erik Groener
2022-06-28 13:06:31 +00:00
parent be9f74ea05
commit 27955c14d0
16 changed files with 168 additions and 170 deletions

View File

@@ -28,12 +28,12 @@ BEGIN
FROM mld_opdr MLD_O
WHERE MLD_O.mld_statusopdr_key IN (5, 8)
AND MLD_O.mld_uitvoerende_keys = :new.prs_srtperslid_key;
APPLICATION_ERROR(-20000, 'prs_m084');
raise_application_error(-20000, 'prs_m084');
EXCEPTION
WHEN NO_DATA_FOUND
THEN NULL;
WHEN TOO_MANY_ROWS
THEN APPLICATION_ERROR(-20000, 'prs_m084');
THEN raise_application_error(-20000, 'prs_m084');
END;
END IF;
//</MLD>
@@ -62,10 +62,10 @@ BEGIN
WHERE (cnt_v_aanwezigcontract.cnt_prs_afdeling_key = :old.prs_afdeling_key
OR cnt_v_aanwezigcontract.prs_afdeling_key_eig = :old.prs_afdeling_key)
AND cnt_v_aanwezigcontract.cnt_contract_looptijd_tot > SYSDATE;
APPLICATION_ERROR_GOTO(-20000,'cnt_m022');
raise_application_error(-20000, 'cnt_m022');
EXCEPTION
WHEN NO_DATA_FOUND THEN NULL;
WHEN TOO_MANY_ROWS THEN APPLICATION_ERROR_GOTO(-20000,'cnt_m022');
WHEN TOO_MANY_ROWS THEN raise_application_error(-20000, 'cnt_m022');
END;
END IF;
--
@@ -82,10 +82,10 @@ BEGIN
WHERE ins_deel_verwijder IS NULL
AND ins_alg_ruimte_type = 'A'
AND ins_alg_ruimte_key = :old.prs_afdeling_key;
APPLICATION_ERROR_GOTO(-20000,'prs_m173');
raise_application_error(-20000, 'prs_m173');
EXCEPTION
WHEN NO_DATA_FOUND THEN NULL;
WHEN TOO_MANY_ROWS THEN APPLICATION_ERROR_GOTO(-20000,'prs_m173');
WHEN TOO_MANY_ROWS THEN raise_application_error(-20000, 'prs_m173');
END;
END IF;
END;
@@ -158,7 +158,7 @@ BEGIN
)
THEN
-- Persoon mag niet verwijderd worden omdat flagbit=32 aan staat.
raise_application_error(-20000, 'Delete not allowed');
raise_application_error(-20001, 'Delete not allowed');
ELSE
DECLARE
dummy VARCHAR2(1);
@@ -170,10 +170,10 @@ BEGIN
FROM mld_opdr MLD_O
WHERE MLD_O.mld_statusopdr_key IN (5, 8)
AND MLD_O.mld_uitvoerende_keys = :new.prs_perslid_key;
APPLICATION_ERROR_GOTO(-20000, 'prs_m085');
raise_application_error(-20000, 'prs_m085');
EXCEPTION
WHEN NO_DATA_FOUND THEN NULL;
WHEN TOO_MANY_ROWS THEN APPLICATION_ERROR_GOTO(-20000, 'prs_m085');
WHEN TOO_MANY_ROWS THEN raise_application_error(-20000, 'prs_m085');
END;
DECLARE
@@ -189,10 +189,10 @@ BEGIN
AND ins_alg_ruimte_key = :old.prs_perslid_key
AND DI.ins_discipline_key = D.ins_discipline_key
AND DI.ins_discipline_min_level <> 3;
APPLICATION_ERROR_GOTO(-20000,'prs_m175');
raise_application_error(-20000, 'prs_m175');
EXCEPTION
WHEN NO_DATA_FOUND THEN NULL;
WHEN TOO_MANY_ROWS THEN APPLICATION_ERROR_GOTO(-20000,'prs_m175');
WHEN TOO_MANY_ROWS THEN raise_application_error(-20000, 'prs_m175');
END;
-- Hierna kan het verwijderen niet meer falen
@@ -320,7 +320,7 @@ FOR EACH ROW
BEGIN
IF (BITAND(:old.prs_perslid_flags,32) = 32 OR BITAND(:new.prs_perslid_flags,32) = 32)
THEN
raise_application_error(-20000, 'Delete not allowed');
raise_application_error(-20001, 'Delete not allowed');
END IF;
DELETE FROM prs_kenmerklink KL WHERE KL.prs_link_key=:old.prs_perslid_key AND KL.prs_kenmerklink_niveau='P';
END;
@@ -397,12 +397,12 @@ BEGIN
FROM mld_opdr MLD_O
WHERE MLD_O.mld_statusopdr_key IN (5, 8)
AND MLD_O.mld_uitvoerende_keys = :new.prs_bedrijf_key;
APPLICATION_ERROR_GOTO(-20000, 'prs_m086');
raise_application_error(-20000, 'prs_m086');
EXCEPTION
WHEN NO_DATA_FOUND
THEN NULL;
WHEN TOO_MANY_ROWS
THEN APPLICATION_ERROR_GOTO(-20000, 'prs_m086');
THEN raise_application_error(-20000, 'prs_m086');
END;
END IF;
@@ -415,10 +415,10 @@ BEGIN
FROM cnt_v_aanwezigcontract
WHERE cnt_v_aanwezigcontract.cnt_prs_bedrijf_key = :old.prs_bedrijf_key
AND cnt_v_aanwezigcontract.cnt_contract_looptijd_tot > sysdate;
APPLICATION_ERROR_GOTO(-20000,'cnt_m023');
raise_application_error(-20000, 'cnt_m023');
EXCEPTION
WHEN NO_DATA_FOUND THEN NULL;
WHEN TOO_MANY_ROWS THEN APPLICATION_ERROR_GOTO(-20000,'cnt_m023');
WHEN TOO_MANY_ROWS THEN raise_application_error(-20000, 'cnt_m023');
END;
END IF;
-- Ruim de afhankelijheden op:
@@ -469,12 +469,12 @@ BEGIN
IF (:new.prs_kenmerk_verwijder IS NOT NULL AND :old.prs_kenmerk_verwijder IS NULL AND
:new.prs_kenmerk_systeem = 1)
THEN
APPLICATION_ERROR(-20003, 'ALG_M238');
raise_application_error(-20000, 'ALG_M238');
END IF;
IF :new.prs_kenmerk_kenmerktype IN ('C', 'N', 'B') AND :new.prs_kenmerk_lengte IS NULL
THEN
APPLICATION_ERROR(-20000, 'ALG_C_ALG_KENMERK_LENGTE');
raise_application_error(-20000, 'ALG_C_ALG_KENMERK_LENGTE');
END IF;
IF :new.prs_kenmerk_kenmerktype IN ('N', 'B') AND :new.prs_kenmerk_lengte > 20
THEN
@@ -603,7 +603,7 @@ BEGIN
END IF;
EXCEPTION
WHEN NO_DATA_FOUND
THEN APPLICATION_ERROR_GOTO(-20000, 'ALG_M015');
THEN raise_application_error(-20000, 'ALG_M015');
END;
SELECT prs_kenmerk_omschrijving
, prs_kenmerk_kenmerktype
@@ -621,7 +621,7 @@ BEGIN
WHERE prs_kenmerk_key = :new.prs_kenmerk_key;
EXCEPTION
WHEN NO_DATA_FOUND
THEN APPLICATION_ERROR_GOTO(-20000,'INS_R_INS_KENMERK_KEY1');
THEN raise_application_error(-20000, 'INS_R_INS_KENMERK_KEY1');
END;
/* Kijk welk KenmerkType gebruikt wordt.
@@ -665,7 +665,7 @@ BEGIN
THEN FormatMask := REPLACE(FormatMask, '9', '#');
FormatMask := REPLACE(FormatMask, '0', '#');
FormatMask := REPLACE(FormatMask, 'D', '.');
RAISE_APPLICATION_ERROR(-20004,'ALG_M233,'|| KenmerkOmschr ||','
APPLICATION_ERROR_GOTO(-20004, 'ALG_M233,'|| KenmerkOmschr ||','
|| FormatMask);
END;
/*