diff --git a/ALG/ALGSQL.H b/ALG/ALGSQL.H index db0ad93b..dfb298f8 100644 --- a/ALG/ALGSQL.H +++ b/ALG/ALGSQL.H @@ -36,17 +36,17 @@ dummy1, child_verwijder, child_key, dummy2) \ BEGIN \ IF :new.parent_verwijder IS NOT NULL \ - _THEN \ + THEN \ UPDATE child_table \ SET child_verwijder = :new.parent_verwijder \ WHERE child_table.child_key = :new.parent_key \ AND child_table.ins_alg_ruimte_type = 'W' \ AND child_table.ins_deel_verwijder IS NULL; \ - _ELSIF (:new.parent_verwijder IS NULL AND :old.parent_verwijder IS NOT NULL)\ - _THEN \ + ELSIF (:new.parent_verwijder IS NULL AND :old.parent_verwijder IS NOT NULL)\ + THEN \ UPDATE child_table \ SET child_verwijder = :new.parent_verwijder \ WHERE child_table.child_key = :new.parent_key \ AND ins_alg_ruimte_type = 'W'; \ - _END_IF; \ + END_IF; \ END diff --git a/COMSQL.H b/COMSQL.H index de43bb15..2e0a70b3 100644 --- a/COMSQL.H +++ b/COMSQL.H @@ -54,7 +54,7 @@ BEGIN adm.systrackscriptId(svnid, 0); END;~/ END IF; \ EXCEPTION \ WHEN NO_DATA_FOUND THEN \ - APPLICATION_ERROR(-20000, message); \ + raise_application_error(-20000, message); \ END #define CHECK_KEY_REFERENCE(table, primary_key, ref_key, message) \ @@ -69,9 +69,9 @@ BEGIN adm.systrackscriptId(svnid, 0); END;~/ WHERE primary_key = ref_key; \ EXCEPTION \ WHEN NO_DATA_FOUND \ - THEN APPLICATION_ERROR(-20000, message); \ + THEN raise_application_error(-20000, message); \ WHEN mutating_table \ - _THEN NULL; \ + THEN NULL; \ END @@ -81,20 +81,6 @@ BEGIN adm.systrackscriptId(svnid, 0); END;~/ #define CREATE_TABLE(table_name, level) \ CREATE TABLE table_name -#define _SPOOL(x) \ -SPOOL x - -#define _EQ_OLD(x,y) \ -x = :old.y - -#define PROMPT1(x) \ -PROMPT x -#define PROMPT2(x,y) \ -PROMPT x,y - -#define _INTO_VAR(x) \ -INTO x - #define CREATE_SEQUENCE(sequence_name, minval) \ CREATE SEQUENCE sequence_name MINVALUE minval; @@ -104,122 +90,15 @@ CREATE SEQUENCE sequence_name MINVALUE minval; #define CREATE_TRIGGER(trigger_name) \ CREATE OR REPLACE TRIGGER trigger_name -#define _END_TRIGGER() \ - END;~/ - #define CREATE_PROCEDURE(pack_name, proc_name) \ CREATE OR REPLACE PROCEDURE proc_name -#define MONEY \ -NUMBER - #define VARCHAR \ VARCHAR2 -#define _LONG_RAW \ -LONG RAW - -#define _CONCAT \ -|| - -#define _ALTER_MODIFY_START \ -MODIFY - -#define _ALTER_ADD_START \ -ADD ( - -#define _ALTER_END \ -) - -#define _IDENTITY(x,y) - -#define _TYPE(tab,fld) \ -tab.fld%TYPE - -#define _CREATE_OR_REPLACE \ -CREATE OR REPLACE - -#define _RETURN_LENGTH(x) \ - -#define _DECLARE_VAR(x) \ -x - -#define _SET_VAR(x) \ -x - -#define _VAR(x) \ -x - -#define _ASSIGN \ -:= - -#define _RETURNS \ -RETURN - -#define _AS \ -IS - -#define _GO \ -; - -#define _GO2 \ -;~/ - -#define _NOTFOUND(x) \ -x%NOTFOUND - #define INSTR2(a, b) \ INSTR(a, b) -#define SUBSTR2 \ -SUBSTR - -#define TRUNC_DATE \ -TRUNC - -#define _LOOP \ -loop - -#define _FOR(i,a,b) \ -FOR i in a .. b loop - -#define _END_LOOP \ -end loop - -#define _EXIT \ -exit - -#define _FROM_DUAL \ -FROM DUAL - -#define _EXEC0(p) \ -p - -#define _EXEC1(p,a1) \ -p(a1) - -#define _EXEC2(p,a1,a2) \ -p(a1,a2) - -#define _EXEC3(p,a1,a2,a3) \ -p(a1,a2,a3) - -#define _EXEC4(p,a1,a2,a3, a4) \ -p(a1,a2,a3,a4) - -#define _EXEC5(p,a1,a2,a3,a4,a5) \ -p(a1,a2,a3,a4,a5) - -#define _EXEC6(p,a1,a2,a3,a4,a5,a6) \ -p(a1,a2,a3,a4,a5,a6) - - -#define _INTO1(x) -#define _INTO2(x) \ -INTO x -#define _INTO3(x) \ -,x - #define UPDATE_UPPER(omschrijving, upper_omschrijving,tab) \ :new.upper_omschrijving := UPPER(:new.omschrijving) @@ -231,128 +110,25 @@ INTO x END IF; \ END - -#define _CC \ -|| - -#define _OPLUS \ -(+) - -#define _OSTAR - -#define _DECODE_BEGIN \ -DECODE( - -#define _DECODE_WHEN \ -, - -#define _DECODE_THEN \ -, - -#define _DECODE_ELSE \ -, - -#define _DECODE_END \ -) - -#define _THEN \ -THEN - -#define _FOUND(x) \ -x%FOUND = TRUE - -#define _IN_PACKAGE(pak,fp,fname) \ -fp fname - -#define _INPUT \ -IN - -#define _OUTPUT(x) \ -OUT x - -#define _DATEPART(x,y) \ -TO_CHAR(x,#@y) - #define DATE_TO_CHAR \ TO_CHAR #define NUMBER_TO_CHAR \ TO_CHAR -#define _MOD \ -MOD - -#define _NUM2HM(x) \ -TO_NUMBER(TO_CHAR(x,'HH24.MI')) - #define _TO_CHAR(x) \ TO_CHAR(x) -#define _TO_NUMBER(x) \ -TO_NUMBER(x) - -#define _TO_NUMBER2(x,y) \ -TO_NUMBER(x,y) - -#define _TO_NUMBER3(x,y,z) \ -TO_NUMBER(x,y,z) - -#define _TO_DATE(x) \ -TO_DATE(x) - #define _TO_DATE2(x,y) \ TO_DATE(x,y) -#define _DECLARE_CURSOR(x) \ -CURSOR x - -#define _CURSOR_PARAM(x) \ -(x) - -#define _CURSOR_PARAM2(x,y) \ -(x,y) - -#define _CURSOR_PARAM3(x,y,z) \ -(x,y,z) - -#define _CURSOR_FOR \ -IS - -#define _OPEN_CURSOR1(query, s, rec) \ - FOR rec IN query LOOP - -#define _OPEN_CURSOR2(query, s, rec, key) \ - FOR rec IN query(key) LOOP -// , val s := rec.val; - -#define _CLOSE_CURSOR(query, s) \ - END LOOP; - - -#define _BEGIN_SQLS_PROC \ -AS - -#define _BEGIN_ORA_PROC \ -BEGIN - -#define _END_PROC \ -END;~/ - #define _END_IF \ END IF; -#define _ELSE \ -ELSE - -#define _ELSIF \ -ELSIF - #define _FAC_MODULE(module,omschrijving) \ INSERT INTO fac_module (fac_module_name, fac_module_version, fac_module_date, fac_module_remark, fac_module_extern) \ VALUES (module,_DBV_STRING,TO_CHAR(SYSDATE,'YYYYMMDD'),omschrijving, 1); -#define APPLICATION_ERROR(code,text) raise_application_error(code, text) - #define APPLICATION_ERROR_GOTO(code,text) raise_application_error(code, text) #define UPDATE_PRIMARY_KEY(primary_key, sequence_primary_key) \ @@ -361,63 +137,6 @@ ELSIF FROM DUAL; \ END IF -#define CHECK_UNIQUE_OMSCHRIJVING(tabel, upper_omschrijving, \ - exc_msg_GEEN_OMSCHRIJVING, \ - exc_msg_BESTAANDE_OMSCHRIJVING) \ - DECLARE \ - dummy CHAR := 'N'; \ - BEGIN \ - SELECT 'X' INTO dummy \ - FROM tabel \ - GROUP BY upper_omschrijving \ - HAVING COUNT(*) > 1; \ - APPLICATION_ERROR(-20001, exc_msg_BESTAANDE_OMSCHRIJVING); \ - EXCEPTION \ - WHEN NO_DATA_FOUND \ - THEN NULL; \ - \ - WHEN TOO_MANY_ROWS \ - THEN APPLICATION_ERROR(-20001, exc_msg_BESTAANDE_OMSCHRIJVING); \ - END - -#define CHECK_UNIQUE_KEY_OMSCHRIJVING(tabel, key, upper_omschrijving, \ - exc_msg_GEEN_OMSCHRIJVING, \ - exc_msg_BESTAANDE_OMSCHRIJVING) \ - DECLARE \ - dummy CHAR := 'N'; \ - BEGIN \ - SELECT 'X' INTO dummy \ - FROM tabel \ - GROUP BY key, upper_omschrijving \ - HAVING COUNT(*) > 1; \ - APPLICATION_ERROR(-20001, exc_msg_BESTAANDE_OMSCHRIJVING); \ - EXCEPTION \ - WHEN NO_DATA_FOUND \ - THEN NULL; \ - \ - WHEN TOO_MANY_ROWS \ - THEN APPLICATION_ERROR(-20001, exc_msg_BESTAANDE_OMSCHRIJVING); \ - END - -#define CHECK_UNIQUE_DEEL_KEY_OMSCHRIJVING(tabel, up_key, naast_key, \ -upper_omschrijving, exc_msg_GEEN_OMSCHRIJVING, \ - exc_msg_BESTAANDE_OMSCHRIJVING) \ - DECLARE \ - dummy CHAR := 'N'; \ - BEGIN \ - SELECT 'X' INTO dummy \ - FROM tabel \ - GROUP BY up_key, naast_key, upper_omschrijving \ - HAVING COUNT(*) > 1; \ - APPLICATION_ERROR(-20001, exc_msg_BESTAANDE_OMSCHRIJVING); \ - EXCEPTION \ - WHEN NO_DATA_FOUND \ - THEN NULL; \ - \ - WHEN TOO_MANY_ROWS \ - THEN APPLICATION_ERROR(-20001, exc_msg_BESTAANDE_OMSCHRIJVING); \ - END - #define LAAT_VERDIEPING_VERVALLEN_VOOR_GEBOUW(exc_msg_VERDIEPING_IN_GEBRUIK) \ BEGIN \ IF :new.alg_gebouw_verwijder IS NOT NULL \ @@ -431,10 +150,10 @@ upper_omschrijving, exc_msg_GEEN_OMSCHRIJVING, \ END IF; \ EXCEPTION \ WHEN NO_DATA_FOUND \ - THEN APPLICATION_ERROR(-20000, exc_msg_VERDIEPING_IN_GEBRUIK); \ + THEN raise_application_error(-20000, exc_msg_VERDIEPING_IN_GEBRUIK); \ \ WHEN TOO_MANY_ROWS \ - THEN APPLICATION_ERROR(-20000, exc_msg_VERDIEPING_IN_GEBRUIK); \ + THEN raise_application_error(-20000, exc_msg_VERDIEPING_IN_GEBRUIK); \ END #define LAAT_RUIMTE_VERVALLEN_VOOR_VERDIEPING(exc_msg_RUIMTE_IN_GEBRUIK) \ @@ -450,10 +169,10 @@ upper_omschrijving, exc_msg_GEEN_OMSCHRIJVING, \ END IF; \ EXCEPTION \ WHEN NO_DATA_FOUND \ - THEN APPLICATION_ERROR(-20000, exc_msg_RUIMTE_IN_GEBRUIK); \ + THEN raise_application_error(-20000, exc_msg_RUIMTE_IN_GEBRUIK); \ \ WHEN TOO_MANY_ROWS \ - THEN APPLICATION_ERROR(-20000, exc_msg_RUIMTE_IN_GEBRUIK); \ + THEN raise_application_error(-20000, exc_msg_RUIMTE_IN_GEBRUIK); \ END #define CHECK_NOG_REFERENCES(tabel,tabel_verwijder_veld,reference_view, \ @@ -467,65 +186,13 @@ upper_omschrijving, exc_msg_GEEN_OMSCHRIJVING, \ SELECT 'x' INTO dummy \ FROM reference_view \ WHERE reference_view.key_veld = :old.key_veld; \ - APPLICATION_ERROR(-20000,message); \ + raise_application_error(-20000, message); \ END IF; \ EXCEPTION \ WHEN NO_DATA_FOUND THEN \ NULL; \ WHEN TOO_MANY_ROWS THEN \ - APPLICATION_ERROR(-20000,message); \ - END - -#define CHECK_REFERENCE_INST(key_veld, message) \ - DECLARE \ - dummy CHAR; \ - BEGIN \ - SELECT 'X' INTO dummy \ - FROM ins_v_aanwezigdeel \ - WHERE ins_deel_key = :new.key_veld; \ - EXCEPTION \ - WHEN NO_DATA_FOUND THEN \ - BEGIN \ - SELECT 'X' INTO dummy \ - FROM ins_v_aanwezigonderdeel \ - WHERE ins_onderdeel_key = :new.key_veld; \ - EXCEPTION \ - WHEN NO_DATA_FOUND THEN \ - BEGIN \ - SELECT 'X' INTO dummy \ - FROM ins_v_aanwezigelement \ - WHERE ins_element_key = :new.key_veld; \ - EXCEPTION \ - WHEN NO_DATA_FOUND THEN \ - APPLICATION_ERROR(-20000, message); \ - END; \ - END; \ - END - -#define CHECK_REFERENCE_SRTINST(key_veld, message) \ - DECLARE \ - dummy CHAR; \ - BEGIN \ - SELECT 'X' INTO dummy \ - FROM ins_v_aanwezigsrtdeel \ - WHERE ins_srtdeel_key = :new.key_veld; \ - EXCEPTION \ - WHEN NO_DATA_FOUND THEN \ - BEGIN \ - SELECT 'X' INTO dummy \ - FROM ins_v_aanwezigsrtonderdeel \ - WHERE ins_srtonderdeel_key = :new.key_veld; \ - EXCEPTION \ - WHEN NO_DATA_FOUND THEN \ - BEGIN \ - SELECT 'X' INTO dummy \ - FROM ins_v_aanwezigsrtelement \ - WHERE ins_srtelement_key = :new.key_veld; \ - EXCEPTION \ - WHEN NO_DATA_FOUND THEN \ - APPLICATION_ERROR(-20000, message); \ - END; \ - END; \ + raise_application_error(-20000, message); \ END #define CHECK_REFERENCE_ONROERENDGOED(key_veld, message) \ @@ -555,7 +222,7 @@ upper_omschrijving, exc_msg_GEEN_OMSCHRIJVING, \ WHERE alg_terreinsector_key = :new.key_veld; \ EXCEPTION \ WHEN NO_DATA_FOUND THEN \ - APPLICATION_ERROR(-20000,message); \ + raise_application_error(-20000, message); \ END; \ END; \ END; \ @@ -566,56 +233,12 @@ CEIL #define NULLDATUM NULL -#define CREATE_VOLGNR(volgnr_srt, volgnr_periode) \ - INSERT INTO fac_volgnrs (fac_volgnr_srt, fac_volgnr_periode) \ - VALUES(volgnr_srt, volgnr_periode) - - -#define UPDATE_VOLGNR(key_veld, fac_volgnr_srt) \ - IF :new.key_veld IS NULL \ - THEN \ - :new.key_veld := FAC_P_FAC_VOLGNR.FAC_VOLGNR_NEXTVAL(fac_volgnr_srt); \ - END IF - #define DEFINIEER_VIEW_AANWEZIG(table, verwijder_veld, view_name, level) \ CREATE_VIEW (view_name,level) AS \ SELECT * \ FROM table \ WHERE table.verwijder_veld IS NULLDATUM -#define CHECK_REFERENCE_DEFAULTUITV(key_veld, message) \ - DECLARE \ - dummy CHAR; \ - BEGIN \ - SELECT 'X' INTO dummy \ - FROM mld_v_defaultuitv \ - WHERE bco_defaultuitv_keys = :new.key_veld; \ - EXCEPTION \ - WHEN NO_DATA_FOUND THEN \ - APPLICATION_ERROR(-20000, message); \ - END - -#define UPDATE_WEEKINGAVE(weekingave_veld) \ - BEGIN \ - :new.weekingave_veld := to_number( \ - to_char(:new.mld_opdr_datumbegin, 'YYWW')); \ - END - - -#define SET_VERWIJDER_CHILDREN2(child_table, parent_key, child_key, parent_verwijder, \ - child_verwijder) \ - BEGIN \ - IF :new.parent_verwijder IS NOT NULL OR \ - (:new.parent_verwijder IS NULL AND :old.parent_verwijder IS NOT NULL) \ - THEN \ - UPDATE child_table \ - SET child_verwijder = :new.parent_verwijder \ - WHERE \ - child_table.child_key = :new.parent_key; \ - END IF; \ - END - - #define DELETE_CHILDREN(child_table, parent_key) \ BEGIN \ DELETE FROM child_table \ @@ -737,28 +360,6 @@ BEGIN ~\ END; ~\ / ~\ - -#define BEGIN_MODULE(m) \ - DECLARE ~\ - dummy VARCHAR2(1); ~\ - BEGIN ~\ - SELECT 'x'INTO dummy ~\ - FROM fac_module ~\ - WHERE fac_module_name = UPPER(#@m); - -#define SQL_SPOOL(SQLRegel) \ - dbms_output.put_line(#@SQLRegel); - -#define END_MODULE(m) \ - EXCEPTION ~\ - WHEN NO_DATA_FOUND THEN dbms_output.put_line('--Module ' ||#@m|| ' niet aanwezig'); ~\ - END; ~/ - -#define UPDMOD(m, n) \ - BEGIN_MODULE(m) ~\ - SQL_SPOOL(START n.m) ~\ - END_MODULE(m) - #define START_LOCALEITEMS(dialect_id) \ DECLARE ~ \ v_dialect_id fac_localeitems.fac_localeitems_dialect_id%TYPE; ~ \ diff --git a/FAC/FAC_INI.SRC b/FAC/FAC_INI.SRC index 33b6c140..a2360342 100644 --- a/FAC/FAC_INI.SRC +++ b/FAC/FAC_INI.SRC @@ -25,7 +25,7 @@ INSERT INTO fac_version // Alles als een enorme BEGIN/END is over het netwerk immens sneller BEGIN -DEF_FAC_MESSAGE ('fac_m002', 'Facilitor '_CONCAT _DBV_STRING,'Facilitor '_CONCAT _DBV_STRING); +DEF_FAC_MESSAGE ('fac_m002', 'Facilitor '|| _DBV_STRING,'Facilitor ' || _DBV_STRING); /* FAC */ DEF_FAC_MESSAGE ('fac_m001', 'Printvoorbeeld','Preview'); diff --git a/INS/INSSQL.H b/INS/INSSQL.H index 5c07396c..a052d992 100644 --- a/INS/INSSQL.H +++ b/INS/INSSQL.H @@ -16,13 +16,13 @@ SELECT 'x' INTO dummy \ FROM kindje_tabel \ WHERE kindje_tabel.key_veld = :old.key_veld; \ - APPLICATION_ERROR(-20000,message); \ + raise_application_error(-20000, message); \ END IF; \ EXCEPTION \ WHEN NO_DATA_FOUND THEN \ NULL; \ WHEN TOO_MANY_ROWS THEN \ - APPLICATION_ERROR(-20000,message); \ + raise_application_error(-20000, message); \ END @@ -31,7 +31,7 @@ IF :new.key_ruimte_veld IS NULL \ AND :new.key_terrein_veld IS NULL \ THEN \ - APPLICATION_ERROR(-20000, message); \ + raise_application_error(-20000, message); \ END IF; \ END @@ -69,7 +69,7 @@ ~ \ IF verplicht = 1 AND :new.kolom_naam IS NULL \ THEN \ - APPLICATION_ERROR(-20004, to_char(attribuut_key)|| \ + raise_application_error(-20004, to_char(attribuut_key)|| \ to_char(:new.ins_srtdeel_key)||'att_m008');~ \ ELSIF tiep = 'N' \ THEN \ @@ -80,7 +80,7 @@ IF ware_waarde < min_waarde OR ware_waarde > max_waarde \ THEN \ /* Te klein / te groot */ \ - APPLICATION_ERROR(-20004, to_char(attribuut_key)|| \ + raise_application_error(-20004, to_char(attribuut_key)|| \ to_char(:new.ins_srtdeel_key)||'att_m009');~ \ ELSE \ /* Bepaal het format_mask */ \ @@ -95,14 +95,14 @@ :new.kolom_naam := LTRIM(to_char(ware_waarde, format_mask)); \ IF INSTR(:new.kolom_naam, '#') <> 0 \ THEN \ - APPLICATION_ERROR(-20004, to_char(attribuut_key)|| \ + raise_application_error(-20004, to_char(attribuut_key)|| \ to_char(:new.ins_srtdeel_key)||'att_m010');~ \ END IF;~ \ END IF;~ \ EXCEPTION \ WHEN others \ THEN \ - APPLICATION_ERROR(-20004, to_char(attribuut_key)|| \ + raise_application_error(-20004, to_char(attribuut_key)|| \ to_char(:new.ins_srtdeel_key)||'att_m010');~ \ END;~ \ \ @@ -111,7 +111,7 @@ ware_lengte := LENGTH(:new.kolom_naam); \ IF ware_lengte > max_lengte \ THEN \ - APPLICATION_ERROR(-20004, to_char(attribuut_key)|| \ + raise_application_error(-20004, to_char(attribuut_key)|| \ to_char(:new.ins_srtdeel_key)||'att_m011');~ \ END IF;~ \ END IF; \ @@ -134,12 +134,12 @@ AND INS_SD.ins_srtgroep_key = INS_SG.ins_srtgroep_key \ AND INS_SG.ins_discipline_key = :old.ins_srtinst_keys \ AND INS_D.FacKolom IS NOT NULL; \ - APPLICATION_ERROR(-20003, 'att_m022'); \ + raise_application_error(-20003, 'att_m022'); \ EXCEPTION \ WHEN NO_DATA_FOUND \ THEN NULL; \ WHEN TOO_MANY_ROWS \ - THEN APPLICATION_ERROR(-20003, 'att_m022'); \ + THEN raise_application_error(-20003, 'att_m022'); \ END; \ END IF @@ -155,12 +155,12 @@ WHERE INS_D.ins_srtdeel_key = INS_SD.ins_srtdeel_key \ AND INS_SD.ins_srtgroep_key = :old.ins_srtinst_keys \ AND FacKolom IS NOT NULL; \ - APPLICATION_ERROR(-20003, 'att_m022'); \ + raise_application_error(-20003, 'att_m022'); \ EXCEPTION \ WHEN NO_DATA_FOUND \ THEN NULL; \ WHEN TOO_MANY_ROWS \ - THEN APPLICATION_ERROR(-20003, 'att_m022'); \ + THEN raise_application_error(-20003, 'att_m022'); \ END; \ END IF @@ -175,12 +175,12 @@ FROM ins_v_aanwezigdeel \ WHERE ins_srtdeel_key = :old.ins_srtinst_keys \ AND FacKolom IS NOT NULL; \ - APPLICATION_ERROR(-20003, 'att_m022'); \ + raise_application_error(-20003, 'att_m022'); \ EXCEPTION \ WHEN NO_DATA_FOUND \ THEN NULL; \ WHEN TOO_MANY_ROWS \ - THEN APPLICATION_ERROR(-20003, 'att_m022'); \ + THEN raise_application_error(-20003, 'att_m022'); \ END; \ END IF @@ -195,13 +195,13 @@ FROM reference_view \ WHERE reference_view.key_veld = :old.key_veld \ AND reference_view.reference_verwijder_veld IS NULL; \ - APPLICATION_ERROR(-20000,message); \ + raise_application_error(-20000, message); \ END IF; \ EXCEPTION \ WHEN NO_DATA_FOUND THEN \ NULL; \ WHEN TOO_MANY_ROWS THEN \ - APPLICATION_ERROR(-20000,message); \ + raise_application_error(-20000, message); \ END #endif // _INSSQL_H diff --git a/MLD/MLD_TRI.SRC b/MLD/MLD_TRI.SRC index 441e1219..c3fe897a 100644 --- a/MLD/MLD_TRI.SRC +++ b/MLD/MLD_TRI.SRC @@ -487,7 +487,7 @@ FOR EACH ROW BEGIN UPDATE_PRIMARY_KEY(mld_vrije_dagen_key, mld_s_mld_vrije_dagen_key); /* Haal het tijdgedeelte van de ingevoerde datum af. */ - :new.mld_vrije_dagen_datum := TRUNC_DATE(:new.mld_vrije_dagen_datum); + :new.mld_vrije_dagen_datum := TRUNC(:new.mld_vrije_dagen_datum); END; / diff --git a/MLD/MLD_TYP.SRC b/MLD/MLD_TYP.SRC index 1aba6f5b..b8b6762e 100644 --- a/MLD/MLD_TYP.SRC +++ b/MLD/MLD_TYP.SRC @@ -4,7 +4,7 @@ */ /* uitvoertijd, duur en eenheid in uren (U) of dagen (D) */ -CREATE_TYPE (MLD_T_UITVOERTIJD) +CREATE TYPE MLD_T_UITVOERTIJD AS OBJECT (tijdsduur NUMBER(12,5), eenheid VARCHAR2(1)); / diff --git a/PRJ/PRJ_TAB.SRC b/PRJ/PRJ_TAB.SRC index 8516c7ed..b3e3ec69 100644 --- a/PRJ/PRJ_TAB.SRC +++ b/PRJ/PRJ_TAB.SRC @@ -9,7 +9,7 @@ CREATE_TABLE(prj_scenario, 0) ( prj_scenario_key - NUMBER(10) _IDENTITY(10000000,1) + NUMBER(10) CONSTRAINT prj_k_prj_scenario_key PRIMARY KEY, prj_scenario_omschrijving VARCHAR2(30), @@ -42,7 +42,7 @@ CREATE_TABLE(prj_scenario, 0) CREATE_TABLE(prj_ruimte, 0) ( prj_ruimte_key - NUMBER(10) _IDENTITY(10000000,1) + NUMBER(10) CONSTRAINT prj_k_prj_ruimte_key PRIMARY KEY, prj_scenario_key NUMBER(10) @@ -246,7 +246,7 @@ CREATE_TABLE(prj_deel, 0) CREATE_TABLE(prj_selectie, 0) ( prj_selectie_key - NUMBER(10) _IDENTITY(10000000,1) + NUMBER(10) CONSTRAINT prj_k_prj_selectie_key PRIMARY KEY, prj_scenario_key NUMBER(10) @@ -270,7 +270,7 @@ CREATE_TABLE(prj_selectie, 0) CREATE_TABLE(prj_scenario_note, 0) ( prj_scenario_note_key - NUMBER(10) _IDENTITY(10000000,1) + NUMBER(10) CONSTRAINT prj_k_prj_scenario_reamrk_key PRIMARY KEY, prj_scenario_key NUMBER(10)