From 5625ebeac528267e74456a5fd393ad01c75d3d33 Mon Sep 17 00:00:00 2001 From: "shibata.r" Date: Fri, 2 Sep 2022 16:14:36 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E3=82=B9=E3=82=AD=E3=83=BC=E3=83=9E?= =?UTF-8?q?=E3=83=95=E3=83=AB=E6=8C=87=E5=AE=9A=E3=81=A7=E5=91=BC=E3=81=B3?= =?UTF-8?q?=E5=87=BA=E3=81=99=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rds_mysql/stored_procedure/crm_data_sync.sql | 2 +- rds_mysql/stored_procedure/crm_history.sql | 2 +- s3/data/crm/settings/CRM_AccountShare_ex.sql | 2 +- s3/data/crm/settings/CRM_Account_ex.sql | 2 +- s3/data/crm/settings/CRM_Child_Account_vod__c_ex.sql | 2 +- s3/data/crm/settings/CRM_Contact_ex.sql | 2 +- s3/data/crm/settings/CRM_Group_ex.sql | 2 +- s3/data/crm/settings/CRM_ObjectTerritory2Association_ex.sql | 2 +- s3/data/crm/settings/CRM_Product_Metrics_vod__c_ex.sql | 2 +- s3/data/crm/settings/CRM_Profile_ex.sql | 2 +- s3/data/crm/settings/CRM_Territory2_ex.sql | 4 ++-- s3/data/crm/settings/CRM_UserTerritory2Association_ex.sql | 4 ++-- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/rds_mysql/stored_procedure/crm_data_sync.sql b/rds_mysql/stored_procedure/crm_data_sync.sql index e9986c0f..b830265f 100644 --- a/rds_mysql/stored_procedure/crm_data_sync.sql +++ b/rds_mysql/stored_procedure/crm_data_sync.sql @@ -1,7 +1,7 @@ -- A5M2で実行時にSQL区切り文字を「;」以外にすること -- $$から始まる文字は後からREPLACEする文字を示す独自ルール -- crm_data_syncストアドプロシージャは、同一セッション内での並列処理を実行することができない -CREATE PROCEDURE crm_data_sync(target_table VARCHAR(255), target_table_all VARCHAR(255), target_column VARCHAR(255)) +CREATE PROCEDURE src02.crm_data_sync(target_table VARCHAR(255), target_table_all VARCHAR(255), target_column VARCHAR(255)) BEGIN -- 例外処理 -- エラーが発生した場合に一時テーブルの削除を実施 diff --git a/rds_mysql/stored_procedure/crm_history.sql b/rds_mysql/stored_procedure/crm_history.sql index 10bb0095..b3247c5f 100644 --- a/rds_mysql/stored_procedure/crm_history.sql +++ b/rds_mysql/stored_procedure/crm_history.sql @@ -1,7 +1,7 @@ -- A5M2で実行時にSQL区切り文字を「;」以外にすること -- $$から始まり$$で終わる文字は後からREPLACEする文字を示す独自ルール -- crm_historyストアドプロシージャは、同一セッション内での並列処理を実行することができない -CREATE PROCEDURE crm_history(target_table VARCHAR(255), target_column VARCHAR(255)) +CREATE PROCEDURE src02.crm_history(target_table VARCHAR(255), target_column VARCHAR(255)) BEGIN -- 例外処理 -- エラーが発生した場合に一時テーブルの削除を実施 diff --git a/s3/data/crm/settings/CRM_AccountShare_ex.sql b/s3/data/crm/settings/CRM_AccountShare_ex.sql index d18e68db..de5e6dac 100644 --- a/s3/data/crm/settings/CRM_AccountShare_ex.sql +++ b/s3/data/crm/settings/CRM_AccountShare_ex.sql @@ -1 +1 @@ -CALL crm_history('src02.crm_account_share', 'last_modified_date'); \ No newline at end of file +CALL src02.crm_history('src02.crm_account_share', 'last_modified_date'); \ No newline at end of file diff --git a/s3/data/crm/settings/CRM_Account_ex.sql b/s3/data/crm/settings/CRM_Account_ex.sql index 792d7a28..1511c5b1 100644 --- a/s3/data/crm/settings/CRM_Account_ex.sql +++ b/s3/data/crm/settings/CRM_Account_ex.sql @@ -1 +1 @@ -CALL crm_history('src02.crm_account', 'system_modstamp'); +CALL src02.crm_history('src02.crm_account', 'system_modstamp'); diff --git a/s3/data/crm/settings/CRM_Child_Account_vod__c_ex.sql b/s3/data/crm/settings/CRM_Child_Account_vod__c_ex.sql index cac33f47..4c2bf134 100644 --- a/s3/data/crm/settings/CRM_Child_Account_vod__c_ex.sql +++ b/s3/data/crm/settings/CRM_Child_Account_vod__c_ex.sql @@ -1 +1 @@ -CALL crm_history('src02.crm_child_account_vod__c', 'system_modstamp'); \ No newline at end of file +CALL src02.crm_history('src02.crm_child_account_vod__c', 'system_modstamp'); \ No newline at end of file diff --git a/s3/data/crm/settings/CRM_Contact_ex.sql b/s3/data/crm/settings/CRM_Contact_ex.sql index 4b916e23..31fc59a6 100644 --- a/s3/data/crm/settings/CRM_Contact_ex.sql +++ b/s3/data/crm/settings/CRM_Contact_ex.sql @@ -1 +1 @@ -CALL crm_history('src02.crm_contact', 'system_modstamp'); +CALL src02.crm_history('src02.crm_contact', 'system_modstamp'); diff --git a/s3/data/crm/settings/CRM_Group_ex.sql b/s3/data/crm/settings/CRM_Group_ex.sql index 5e50dab6..f0667ff9 100644 --- a/s3/data/crm/settings/CRM_Group_ex.sql +++ b/s3/data/crm/settings/CRM_Group_ex.sql @@ -1 +1 @@ -CALL crm_history('src02.crm_group', 'system_modstamp'); \ No newline at end of file +CALL src02.crm_history('src02.crm_group', 'system_modstamp'); \ No newline at end of file diff --git a/s3/data/crm/settings/CRM_ObjectTerritory2Association_ex.sql b/s3/data/crm/settings/CRM_ObjectTerritory2Association_ex.sql index d142c071..2e1a751e 100644 --- a/s3/data/crm/settings/CRM_ObjectTerritory2Association_ex.sql +++ b/s3/data/crm/settings/CRM_ObjectTerritory2Association_ex.sql @@ -1 +1 @@ -CALL crm_history('src02.crm_object_territory2_association', 'system_modstamp'); +CALL src02.crm_history('src02.crm_object_territory2_association', 'system_modstamp'); diff --git a/s3/data/crm/settings/CRM_Product_Metrics_vod__c_ex.sql b/s3/data/crm/settings/CRM_Product_Metrics_vod__c_ex.sql index af2e678e..76134c74 100644 --- a/s3/data/crm/settings/CRM_Product_Metrics_vod__c_ex.sql +++ b/s3/data/crm/settings/CRM_Product_Metrics_vod__c_ex.sql @@ -1 +1 @@ -CALL crm_history('src02.crm_product_metrics_vod__c', 'system_modstamp'); \ No newline at end of file +CALL src02.crm_history('src02.crm_product_metrics_vod__c', 'system_modstamp'); \ No newline at end of file diff --git a/s3/data/crm/settings/CRM_Profile_ex.sql b/s3/data/crm/settings/CRM_Profile_ex.sql index b858ab02..80a780f0 100644 --- a/s3/data/crm/settings/CRM_Profile_ex.sql +++ b/s3/data/crm/settings/CRM_Profile_ex.sql @@ -1 +1 @@ -CALL crm_history('src02.crm_profile', 'system_modstamp'); +CALL src02.crm_history('src02.crm_profile', 'system_modstamp'); diff --git a/s3/data/crm/settings/CRM_Territory2_ex.sql b/s3/data/crm/settings/CRM_Territory2_ex.sql index a30ccd91..ffc2befe 100644 --- a/s3/data/crm/settings/CRM_Territory2_ex.sql +++ b/s3/data/crm/settings/CRM_Territory2_ex.sql @@ -1,2 +1,2 @@ -CALL crm_data_sync('src02.crm_territory2', 'src02.crm_territory2_all', 'system_modstamp'); -CALL crm_history('src02.crm_territory2', 'system_modstamp'); +CALL src02.crm_data_sync('src02.crm_territory2', 'src02.crm_territory2_all', 'system_modstamp'); +CALL src02.crm_history('src02.crm_territory2', 'system_modstamp'); diff --git a/s3/data/crm/settings/CRM_UserTerritory2Association_ex.sql b/s3/data/crm/settings/CRM_UserTerritory2Association_ex.sql index 6a9aaece..41b6531d 100644 --- a/s3/data/crm/settings/CRM_UserTerritory2Association_ex.sql +++ b/s3/data/crm/settings/CRM_UserTerritory2Association_ex.sql @@ -1,2 +1,2 @@ -CALL crm_data_sync('src02.crm_user_territory2_association', 'src02.crm_user_territory2_association_all', 'system_modstamp'); -CALL crm_history('src02.crm_user_territory2_association', 'system_modstamp'); +CALL src02.crm_data_sync('src02.crm_user_territory2_association', 'src02.crm_user_territory2_association_all', 'system_modstamp'); +CALL src02.crm_history('src02.crm_user_territory2_association', 'system_modstamp'); From 107bbc00e759fbe2ef5e1180a9b4989c58cf2449 Mon Sep 17 00:00:00 2001 From: "shibata.r" Date: Fri, 2 Sep 2022 17:42:07 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rds_mysql/stored_procedure/crm_data_sync.sql | 4 ++-- rds_mysql/stored_procedure/crm_history.sql | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rds_mysql/stored_procedure/crm_data_sync.sql b/rds_mysql/stored_procedure/crm_data_sync.sql index b830265f..f04b6f8b 100644 --- a/rds_mysql/stored_procedure/crm_data_sync.sql +++ b/rds_mysql/stored_procedure/crm_data_sync.sql @@ -1,4 +1,4 @@ --- A5M2で実行時にSQL区切り文字を「;」以外にすること +-- A5M2で実行時に[SQL] - [スラッシュ(/)のみの行でSQLを区切る]に変えてから実行する -- $$から始まる文字は後からREPLACEする文字を示す独自ルール -- crm_data_syncストアドプロシージャは、同一セッション内での並列処理を実行することができない CREATE PROCEDURE src02.crm_data_sync(target_table VARCHAR(255), target_table_all VARCHAR(255), target_column VARCHAR(255)) @@ -43,4 +43,4 @@ BEGIN EXECUTE update_end_datetime_stmt; COMMIT; -END \ No newline at end of file +END diff --git a/rds_mysql/stored_procedure/crm_history.sql b/rds_mysql/stored_procedure/crm_history.sql index b3247c5f..1b59cb7a 100644 --- a/rds_mysql/stored_procedure/crm_history.sql +++ b/rds_mysql/stored_procedure/crm_history.sql @@ -1,4 +1,4 @@ --- A5M2で実行時にSQL区切り文字を「;」以外にすること +-- A5M2で実行時に[SQL] - [スラッシュ(/)のみの行でSQLを区切る]に変えてから実行する -- $$から始まり$$で終わる文字は後からREPLACEする文字を示す独自ルール -- crm_historyストアドプロシージャは、同一セッション内での並列処理を実行することができない CREATE PROCEDURE src02.crm_history(target_table VARCHAR(255), target_column VARCHAR(255)) @@ -90,4 +90,4 @@ BEGIN COMMIT; -END \ No newline at end of file +END