From 303e1433ac2fa61f3421de356149402e6b98ed4f Mon Sep 17 00:00:00 2001 From: "michele.artini" Date: Fri, 23 Apr 2021 10:00:51 +0200 Subject: [PATCH] skip empty values importing urls and acronyms --- .../src/main/resources/sql/importDedupEvents.sql | 11 ++++++----- 1 file changed, 6 insertions(+), 5 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 9362e992..48cf32f1 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 @@ -32,12 +32,12 @@ ON CONFLICT DO NOTHING; INSERT INTO acronyms(id, acronym) SELECT 'pending_org_::'||MD5(local_id), oa_acronym FROM tmp_dedup_events -WHERE local_id NOT LIKE 'openorgs\_\_\_\_::%' AND local_id = oa_original_id +WHERE local_id NOT LIKE 'openorgs\_\_\_\_::%' AND local_id = oa_original_id AND oa_acronym IS NOT NULL AND oa_acronym != '' ON CONFLICT DO NOTHING; INSERT INTO urls(id, url) SELECT 'pending_org_::'||MD5(local_id), oa_url FROM tmp_dedup_events -WHERE local_id NOT LIKE 'openorgs\_\_\_\_::%' AND local_id = oa_original_id +WHERE local_id NOT LIKE 'openorgs\_\_\_\_::%' AND local_id = oa_original_id AND oa_url IS NOT NULL AND oa_url != '' ON CONFLICT DO NOTHING; INSERT INTO other_ids(id, otherid, type) @@ -57,14 +57,15 @@ WHERE oa_original_id NOT LIKE 'openorgs\_\_\_\_::%' ON CONFLICT DO NOTHING; INSERT INTO acronyms(id, acronym) -SELECT oa_original_id, oa_acronym FROM tmp_dedup_events -WHERE oa_original_id NOT LIKE 'openorgs\_\_\_\_::%' +SELECT oa_original_id, oa_acronym +FROM tmp_dedup_events +WHERE oa_original_id NOT LIKE 'openorgs\_\_\_\_::%' AND oa_acronym IS NOT NULL AND oa_acronym != '' ON CONFLICT DO NOTHING; INSERT INTO urls(id, url) SELECT oa_original_id, oa_url FROM tmp_dedup_events -WHERE oa_original_id NOT LIKE 'openorgs\_\_\_\_::%' +WHERE oa_original_id NOT LIKE 'openorgs\_\_\_\_::%' AND oa_url IS NOT NULL AND oa_url != '' ON CONFLICT DO NOTHING; INSERT INTO other_ids(id, otherid, type)