Page MenuHomeSoftware Heritage

D6991.id25355.diff
No OneTemporary

D6991.id25355.diff

diff --git a/swh/provenance/postgresql/archive.py b/swh/provenance/postgresql/archive.py
--- a/swh/provenance/postgresql/archive.py
+++ b/swh/provenance/postgresql/archive.py
@@ -33,10 +33,10 @@
cursor.execute(
"""
WITH
- dir AS (SELECT id AS dir_id, dir_entries, file_entries
+ dir AS (SELECT dir_entries, file_entries
FROM directory WHERE id=%s),
- ls_d AS (SELECT dir_id, UNNEST(dir_entries) AS entry_id FROM dir),
- ls_f AS (SELECT dir_id, UNNEST(file_entries) AS entry_id FROM dir)
+ ls_d AS (SELECT DISTINCT UNNEST(dir_entries) AS entry_id FROM dir),
+ ls_f AS (SELECT DISTINCT UNNEST(file_entries) AS entry_id FROM dir)
(SELECT 'dir'::directory_entry_type AS type, e.target, e.name
FROM ls_d
LEFT JOIN directory_entry_dir e ON ls_d.entry_id=e.id)
@@ -68,10 +68,10 @@
cursor.execute(
"""
WITH
- dir AS (SELECT id AS dir_id, dir_entries, file_entries
+ dir AS (SELECT dir_entries, file_entries
FROM directory WHERE id=%s),
- ls_d AS (SELECT dir_id, UNNEST(dir_entries) AS entry_id FROM dir),
- ls_f AS (SELECT dir_id, UNNEST(file_entries) AS entry_id FROM dir)
+ ls_d AS (SELECT DISTINCT UNNEST(dir_entries) AS entry_id FROM dir),
+ ls_f AS (SELECT DISTINCT UNNEST(file_entries) AS entry_id FROM dir)
(SELECT 'dir'::directory_entry_type AS type, e.target, e.name
FROM ls_d
LEFT JOIN directory_entry_dir e ON ls_d.entry_id=e.id)

File Metadata

Mime Type
text/plain
Expires
Dec 21 2024, 9:23 AM (11 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3215566

Event Timeline