pt/tps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
Paul Trowbridge 2017-10-18 01:48:22 -04:00
parent c582d5f176
commit 160002404c
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
srce.pgsql
View File

@ -55,11 +55,7 @@ WITH pending_list AS (
(ae.e::text[])[1], --the key name (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 (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, ) json_key,
<<<<<<< HEAD
row_to_json(i)::JSONB rec,
=======
row_to_json(i)::JSONB - 'id' rec, row_to_json(i)::JSONB - 'id' rec,
>>>>>>> c9
srce, srce,
--ae.rn, --ae.rn,
id id
@ -91,10 +87,6 @@ WITH pending_list AS (
t IS NULL t IS NULL
----this conflict is only if an exact duplicate rec json happens, which will be rejected ----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 ----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 * RETURNING *
) )