From 350905ce6ddca4ced3cadeb4685eed4ee0d491c1 Mon Sep 17 00:00:00 2001 From: Takagi Date: Fri, 15 Sep 2023 16:09:00 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20#22=5F=E5=AE=9F=E7=B8=BE=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=87=A6=E7=90=86=5F=E5=8D=B8=E8=B2=A9=E5=A3=B2?= =?UTF-8?q?=E3=83=87=E3=83=BC=E3=82=BF=EF=BC=88=E6=B4=97=E6=9B=BF=E5=BE=8C?= =?UTF-8?q?=EF=BC=89=E5=87=A6=E7=90=86=E6=97=A5=E5=BD=93=E6=97=A5=E3=81=AE?= =?UTF-8?q?=E5=8F=96=E8=BE=BC=E3=83=87=E3=83=BC=E3=82=BF=E3=81=8C=E5=8F=8D?= =?UTF-8?q?=E6=98=A0=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=20=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stored_procedure/src05/sales_lau_upsert.sql | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/rds_mysql/stored_procedure/src05/sales_lau_upsert.sql b/rds_mysql/stored_procedure/src05/sales_lau_upsert.sql index 56758f18..a49cb199 100644 --- a/rds_mysql/stored_procedure/src05/sales_lau_upsert.sql +++ b/rds_mysql/stored_procedure/src05/sales_lau_upsert.sql @@ -145,7 +145,6 @@ BEGIN ); SET @extract_from_datetime = CAST(extract_from_date AS DATETIME); - SET @extract_to_datetime = ADDTIME(CAST(extract_to_date AS DATETIME), '23:59:59'); SET @upsert_sales_launderning = " INSERT INTO @@ -334,11 +333,10 @@ BEGIN SYSDATE() FROM ( SELECT - ? AS extract_from_datetime, - ? AS extract_to_datetime + ? AS extract_from_datetime ) AS sub INNER JOIN src05.sales AS s - ON s.dwh_upd_dt BETWEEN sub.extract_from_datetime AND sub.extract_to_datetime + ON s.dwh_upd_dt >= sub.extract_from_datetime LEFT OUTER JOIN src05.phm_prd_mst_v AS ppmv ON s.comm_cd = ppmv.prd_cd AND STR_TO_DATE(s.hsdn_ymd,'%Y%m%d') BETWEEN ppmv.start_date AND ppmv.end_date @@ -435,7 +433,7 @@ BEGIN "; SET @upsert_sales_launderning = REPLACE(@upsert_sales_launderning, "$$target_table$$", target_table); PREPARE upsert_sales_launderning_stmt from @upsert_sales_launderning; - EXECUTE upsert_sales_launderning_stmt USING @extract_from_datetime, @extract_to_datetime; + EXECUTE upsert_sales_launderning_stmt USING @extract_from_datetime; CALL medaca_common.put_info_log(schema_name, procedure_name, procedure_args, '卸販売実績テーブル（洗替後）作成⑤ 終了' @@ -448,8 +446,7 @@ BEGIN SET @update_institution_code = " UPDATE ( SELECT - ? AS extract_from_datetime, - ? AS extract_to_datetime + ? AS extract_from_datetime ) AS sub, $$target_table$$ AS tt, src05.sales AS s @@ -465,13 +462,13 @@ BEGIN END ) WHERE - s.dwh_upd_dt BETWEEN sub.extract_from_datetime AND sub.extract_to_datetime + s.dwh_upd_dt >= sub.extract_from_datetime AND tt.slip_mgt_num = s.slip_mgt_num AND tt.row_num = s.row_num "; SET @update_institution_code = REPLACE(@update_institution_code, "$$target_table$$", target_table); PREPARE update_institution_code_stmt from @update_institution_code; - EXECUTE update_institution_code_stmt USING @extract_from_datetime, @extract_to_datetime; + EXECUTE update_institution_code_stmt USING @extract_from_datetime; CALL medaca_common.put_info_log(schema_name, procedure_name, procedure_args, '卸販売実績テーブル（洗替後）作成⑥ 終了' From 8b186e03b5bc20fd1336df8876f99331732dbcae Mon Sep 17 00:00:00 2001 From: Takagi Date: Fri, 15 Sep 2023 17:24:29 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E6=9C=AA=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=BC=95=E6=95=B0=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6=E3=81=AE?= =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/batch/laundering/sales_results_laundering.py | 1 + .../src/batch/laundering/sales_results_laundering.py | 1 + rds_mysql/stored_procedure/src05/sales_lau_upsert.sql | 1 + 3 files changed, 3 insertions(+) diff --git a/ecs/jskult-batch-daily/src/batch/laundering/sales_results_laundering.py b/ecs/jskult-batch-daily/src/batch/laundering/sales_results_laundering.py index 58755f36..a7802c4c 100644 --- a/ecs/jskult-batch-daily/src/batch/laundering/sales_results_laundering.py +++ b/ecs/jskult-batch-daily/src/batch/laundering/sales_results_laundering.py @@ -45,6 +45,7 @@ def _call_sales_lau_delete(db: Database): def _call_sales_lau_upsert(db: Database): # 卸販売実績テーブル（洗替後）作成 + # sales_lau_upsertの第3引数は、NEWDWH2021-1230の対応の結果、未使用の引数となっています logger.info('sales_lau_upsert(プロシージャ―) 開始') db.execute(f""" CALL src05.sales_lau_upsert( diff --git a/ecs/jskult-batch-laundering/src/batch/laundering/sales_results_laundering.py b/ecs/jskult-batch-laundering/src/batch/laundering/sales_results_laundering.py index 1b11fa91..86b3c8e9 100644 --- a/ecs/jskult-batch-laundering/src/batch/laundering/sales_results_laundering.py +++ b/ecs/jskult-batch-laundering/src/batch/laundering/sales_results_laundering.py @@ -31,6 +31,7 @@ def exec(): def _call_sales_lau_upsert(db: Database): # 卸販売実績テーブル（洗替後）作成 + # sales_lau_upsertの第3引数は、NEWDWH2021-1230の対応の結果、未使用の引数となっています logger.info('sales_lau_upsert(プロシージャ―) 開始') db.execute(f""" CALL src05.sales_lau_upsert( diff --git a/rds_mysql/stored_procedure/src05/sales_lau_upsert.sql b/rds_mysql/stored_procedure/src05/sales_lau_upsert.sql index a49cb199..429f8a33 100644 --- a/rds_mysql/stored_procedure/src05/sales_lau_upsert.sql +++ b/rds_mysql/stored_procedure/src05/sales_lau_upsert.sql @@ -1,4 +1,5 @@ -- A5M2で実行時に[SQL] - [スラッシュ(/)のみの行でSQLを区切る]に変えてから実行する +-- extract_to_dateは、NEWDWH2021-1230の対応の結果、未使用の引数となっています CREATE PROCEDURE src05.sales_lau_upsert(target_table VARCHAR(255), extract_from_date DATE, extract_to_date DATE) SQL SECURITY INVOKER