From 160002404cabf70ffb9f9cac152945378e66d367 Mon Sep 17 00:00:00 2001 From: Paul Trowbridge Date: Wed, 18 Oct 2017 01:48:22 -0400 Subject: [PATCH] fix conflicts --- srce.pgsql | 8 -------- 1 file changed, 8 deletions(-) diff --git a/srce.pgsql b/srce.pgsql index 69aacf2..70a6ccf 100644 --- a/srce.pgsql +++ b/srce.pgsql @@ -55,11 +55,7 @@ WITH pending_list AS ( (ae.e::text[])[1], --the key name (row_to_json(i)::jsonb) #> ae.e::text[] --get the target value from the key from the csv row that has been converted to json ) json_key, -<<<<<<< HEAD - row_to_json(i)::JSONB rec, -======= row_to_json(i)::JSONB - 'id' rec, ->>>>>>> c9 srce, --ae.rn, id @@ -91,10 +87,6 @@ WITH pending_list AS ( t IS NULL ----this conflict is only if an exact duplicate rec json happens, which will be rejected ----therefore, records may not be inserted due to ay matches with certain json fields, or if the entire json is a duplicate, reason is not specified -<<<<<<< HEAD - ON CONFLICT ON CONSTRAINT uc_rec DO NOTHING -======= ->>>>>>> c9 RETURNING * )