From 0f7b4c687fe5270a4ded8d7e292cd36d638e7ffe Mon Sep 17 00:00:00 2001 From: "michele.artini" Date: Wed, 7 Apr 2021 14:19:45 +0200 Subject: [PATCH] import of ec flags --- .../src/main/resources/sql/importDedupEvents.sql | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/apps/dnet-orgs-database-application/src/main/resources/sql/importDedupEvents.sql b/apps/dnet-orgs-database-application/src/main/resources/sql/importDedupEvents.sql index ac0b637d..146050e3 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/sql/importDedupEvents.sql +++ b/apps/dnet-orgs-database-application/src/main/resources/sql/importDedupEvents.sql @@ -8,14 +8,14 @@ DELETE FROM organizations WHERE created_by = 'dedupWf' and modified_by = 'dedupW UPDATE tmp_dedup_events SET oa_country = 'UNKNOWN' WHERE oa_country = '' OR oa_country IS NULL; -- NEW ORGANIZATIONS -INSERT INTO organizations(id, name, country, status, created_by, modified_by) -SELECT oa_original_id, oa_name, oa_country, 'suggested', 'dedupWf', 'dedupWf' +INSERT INTO organizations(id, name, country, status, ec_legalbody, ec_legalperson, ec_nonprofit, ec_researchorganization, ec_highereducation, ec_internationalorganizationeurinterests, ec_internationalorganization, ec_enterprise, ec_smevalidated, ec_nutscode, created_by, modified_by) +SELECT oa_original_id, oa_name, oa_country, 'suggested', ec_legalbody, ec_legalperson, ec_nonprofit, ec_researchorganization, ec_highereducation, ec_internationalorganizationeurinterests, ec_internationalorganization, ec_enterprise, ec_smevalidated, ec_nutscode, 'dedupWf', 'dedupWf' FROM tmp_dedup_events WHERE oa_original_id NOT LIKE 'openorgs\_\_\_\_::%' AND (oa_original_id = local_id OR local_id = '' OR local_id IS NULL) ON CONFLICT DO NOTHING; -INSERT INTO organizations(id, name, country, status, created_by, modified_by) -SELECT oa_original_id, oa_name, oa_country, 'duplicate', 'dedupWf', 'dedupWf' +INSERT INTO organizations(id, name, country, status, ec_legalbody, ec_legalperson, ec_nonprofit, ec_researchorganization, ec_highereducation, ec_internationalorganizationeurinterests, ec_internationalorganization, ec_enterprise, ec_smevalidated, ec_nutscode, created_by, modified_by) +SELECT oa_original_id, oa_name, oa_country, 'duplicate', ec_legalbody, ec_legalperson, ec_nonprofit, ec_researchorganization, ec_highereducation, ec_internationalorganizationeurinterests, ec_internationalorganization, ec_enterprise, ec_smevalidated, ec_nutscode, 'dedupWf', 'dedupWf' FROM tmp_dedup_events WHERE oa_original_id NOT LIKE 'openorgs\_\_\_\_::%' AND local_id is NOT NULL AND local_id != '' AND local_id != oa_original_id ON CONFLICT DO NOTHING; @@ -50,8 +50,4 @@ WHERE c1.oid != c2.oid ON CONFLICT DO NOTHING; - - - - COMMIT;