From 4667122ca30c5d6926175fe69f6986fe8054958a Mon Sep 17 00:00:00 2001 From: bn_user Date: Thu, 13 Nov 2025 16:02:28 +0000 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20dags/upload=5Fdicts.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dags/upload_dicts.py | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/dags/upload_dicts.py b/dags/upload_dicts.py index 4496ed8..985de3c 100644 --- a/dags/upload_dicts.py +++ b/dags/upload_dicts.py @@ -77,16 +77,24 @@ def take_dogovor(**kwargs): index=False, method='multi' ) - conn.execute(f"DELETE FROM public.{table_name}") + # conn.execute(f"DELETE FROM public.{table_name}") conn.execute(f""" - INSERT INTO public.{table_name} (name, nomer, date_begin, date_end, uid_dogovor) - SELECT + INSERT INTO public.{table_name} (id, name, nomer, date_begin, date_end, uid_dogovor) + SELECT + row_number() over (order by uid_dogovor) id, name, nomer, date_begin, date_end, uid_dogovor FROM temp_{table_name} + ON CONFLICT (uid_dogovor) + DO UPDATE SET + id = EXCLUDED.id, + name = EXCLUDED.name, + nomer = EXCLUDED.nomer, + date_begin = EXCLUDED.date_begin, + date_end = EXCLUDED.date_end; """ ) @@ -134,15 +142,22 @@ def take_bank(**kwargs): index=False, method='multi' ) - conn.execute(f"DELETE FROM public.{table_name}") + # conn.execute(f"DELETE FROM public.{table_name}") conn.execute(f""" INSERT INTO public.{table_name} (name, inn, kpp, uid_bank) - SELECT + SELECT + row_number() over (order by uid_bank) id, name, inn, kpp, uid_bank FROM temp_{table_name} + ON CONFLICT (uid_bank) + DO UPDATE SET + id = EXCLUDED.id, + name = EXCLUDED.name, + inn = EXCLUDED.inn, + kpp = EXCLUDED.date_begin; """ ) @@ -189,7 +204,7 @@ def take_organizaciya(**kwargs): index=False, method='multi' ) - conn.execute(f"DELETE FROM public.{table_name}") + # conn.execute(f"DELETE FROM public.{table_name}") conn.execute(f""" INSERT INTO public.{table_name} (name, inn, kpp, uid_organizaciya) SELECT @@ -198,6 +213,12 @@ def take_organizaciya(**kwargs): kpp, uid_organizaciya FROM temp_{table_name} + ON CONFLICT (uid_organizaciya) + DO UPDATE SET + id = EXCLUDED.id, + name = EXCLUDED.name, + inn = EXCLUDED.inn, + kpp = EXCLUDED.date_begin; """ )