From 5f127882c183fb2a19dd01c8cf39971ce6657727 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 8 Nov 2017 08:32:06 +0100 Subject: [PATCH] IDEMPIERE-3546 Use specific messages for range process parameters placeholder / peer review, insert default trl from previous messages --- .../oracle/201711061600_IDEMPIERE-3546.sql | 12 ++++++ .../oracle/201711061621_IDEMPIERE-3547.sql | 41 ++++++++----------- .../201711061600_IDEMPIERE-3546.sql | 12 ++++++ 3 files changed, 40 insertions(+), 25 deletions(-) diff --git a/migration/i5.1/oracle/201711061600_IDEMPIERE-3546.sql b/migration/i5.1/oracle/201711061600_IDEMPIERE-3546.sql index 2f2ecea38c..f974c01273 100644 --- a/migration/i5.1/oracle/201711061600_IDEMPIERE-3546.sql +++ b/migration/i5.1/oracle/201711061600_IDEMPIERE-3546.sql @@ -10,5 +10,17 @@ INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created, INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','To',0,0,'Y',TO_DATE('2017-11-06 16:07:42','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2017-11-06 16:07:42','YYYY-MM-DD HH24:MI:SS'),0,200439,'ProcessParameterRangeTo','D','07220887-ecb2-42e9-9665-260041080b52') ; +INSERT INTO ad_message_trl +(ad_message_id, ad_language, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, msgtext, msgtip, istranslated, ad_message_trl_uu) +SELECT 200438, ad_language, ad_client_id, ad_org_id, isactive, SysDate, 100, SysDate, 100, msgtext, msgtip, istranslated, generate_uuid() +FROM ad_message_trl +WHERE ad_message_id=280; + +INSERT INTO ad_message_trl +(ad_message_id, ad_language, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, msgtext, msgtip, istranslated, ad_message_trl_uu) +SELECT 200439, ad_language, ad_client_id, ad_org_id, isactive, SysDate, 100, SysDate, 100, msgtext, msgtip, istranslated, generate_uuid() +FROM ad_message_trl +WHERE ad_message_id=565; + SELECT register_migration_script('201711061600_IDEMPIERE-3546.sql') FROM dual ; diff --git a/migration/i5.1/oracle/201711061621_IDEMPIERE-3547.sql b/migration/i5.1/oracle/201711061621_IDEMPIERE-3547.sql index d948116502..6ecb8d8275 100644 --- a/migration/i5.1/oracle/201711061621_IDEMPIERE-3547.sql +++ b/migration/i5.1/oracle/201711061621_IDEMPIERE-3547.sql @@ -1,31 +1,22 @@ -SET SQLBLANKLINES ON -SET DEFINE OFF - --- IDEMPIERE-3547 Mismatches in oracle foreign keys delete rule --- Nov 6, 2017 4:21:15 PM CET -ALTER TABLE C_OrderLine DROP CONSTRAINT linkorderline_corderline +-- IDEMPIERE-3546 - Use specific messages for range process parameters placeholder +-- Nov 6, 2017 4:07:29 PM CET +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','From',0,0,'Y',TO_DATE('2017-11-06 16:07:28','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2017-11-06 16:07:28','YYYY-MM-DD HH24:MI:SS'),0,200438,'ProcessParameterRangeFrom','D','44852250-153e-462a-b206-897d0c2cd1ab') ; --- Nov 6, 2017 4:21:15 PM CET -ALTER TABLE C_OrderLine ADD CONSTRAINT linkorderline_corderline FOREIGN KEY (Link_OrderLine_ID) REFERENCES c_orderline(c_orderline_id) DEFERRABLE INITIALLY DEFERRED +-- Nov 6, 2017 4:07:42 PM CET +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','To',0,0,'Y',TO_DATE('2017-11-06 16:07:42','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2017-11-06 16:07:42','YYYY-MM-DD HH24:MI:SS'),0,200439,'ProcessParameterRangeTo','D','07220887-ecb2-42e9-9665-260041080b52') ; --- Nov 6, 2017 4:21:26 PM CET -ALTER TABLE A_Asset_Acct DROP CONSTRAINT aasset_aassetacct -; +INSERT INTO ad_message_trl +(ad_message_id, ad_language, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, msgtext, msgtip, istranslated, ad_message_trl_uu) +SELECT 200438, ad_language, ad_client_id, ad_org_id, isactive, SysDate, 100, SysDate, 100, msgtext, msgtip, istranslated, generate_uuid() +FROM ad_message_trl +WHERE ad_message_id=280; --- Nov 6, 2017 4:21:26 PM CET -ALTER TABLE A_Asset_Acct ADD CONSTRAINT aasset_aassetacct FOREIGN KEY (A_Asset_ID) REFERENCES a_asset(a_asset_id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED -; - --- Nov 6, 2017 4:21:36 PM CET -ALTER TABLE A_Asset_Group_Acct DROP CONSTRAINT aassetgroup_aassetgroupacct -; - --- Nov 6, 2017 4:21:36 PM CET -ALTER TABLE A_Asset_Group_Acct ADD CONSTRAINT aassetgroup_aassetgroupacct FOREIGN KEY (A_Asset_Group_ID) REFERENCES a_asset_group(a_asset_group_id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED -; - -SELECT register_migration_script('201711061621_IDEMPIERE-3547.sql') FROM dual -; +INSERT INTO ad_message_trl +(ad_message_id, ad_language, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, msgtext, msgtip, istranslated, ad_message_trl_uu) +SELECT 200439, ad_language, ad_client_id, ad_org_id, isactive, SysDate, 100, SysDate, 100, msgtext, msgtip, istranslated, generate_uuid() +FROM ad_message_trl +WHERE ad_message_id=565; +SELECT register_migration_script('201711061600_IDEMPIERE-3546.sql') FROM dual diff --git a/migration/i5.1/postgresql/201711061600_IDEMPIERE-3546.sql b/migration/i5.1/postgresql/201711061600_IDEMPIERE-3546.sql index cc0f923b9a..21072ab099 100644 --- a/migration/i5.1/postgresql/201711061600_IDEMPIERE-3546.sql +++ b/migration/i5.1/postgresql/201711061600_IDEMPIERE-3546.sql @@ -7,5 +7,17 @@ INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created, INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','To',0,0,'Y',TO_TIMESTAMP('2017-11-06 16:07:42','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2017-11-06 16:07:42','YYYY-MM-DD HH24:MI:SS'),0,200439,'ProcessParameterRangeTo','D','07220887-ecb2-42e9-9665-260041080b52') ; +INSERT INTO ad_message_trl +(ad_message_id, ad_language, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, msgtext, msgtip, istranslated, ad_message_trl_uu) +SELECT 200438, ad_language, ad_client_id, ad_org_id, isactive, statement_timestamp(), 100, statement_timestamp(), 100, msgtext, msgtip, istranslated, generate_uuid() +FROM ad_message_trl +WHERE ad_message_id=280; + +INSERT INTO ad_message_trl +(ad_message_id, ad_language, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, msgtext, msgtip, istranslated, ad_message_trl_uu) +SELECT 200439, ad_language, ad_client_id, ad_org_id, isactive, statement_timestamp(), 100, statement_timestamp(), 100, msgtext, msgtip, istranslated, generate_uuid() +FROM ad_message_trl +WHERE ad_message_id=565; + SELECT register_migration_script('201711061600_IDEMPIERE-3546.sql') FROM dual ;