Merge pull request #248 from jspricke/fix_merge_sql

Fix merge.sql

Author: kpcyrd

contrib/scripts/merge.sql

@@ -8,8 +8,8 @@ ATTACH DATABASE :OTHER_DB AS other;
 BEGIN TRANSACTION;
 
 -- source packages
-INSERT INTO source_packages (name, version, distribution, "release", component, last_seen, seen_in_last_sync)
-SELECT name, version, distribution, "release", component, last_seen, seen_in_last_sync
+INSERT INTO source_packages (name, version, distribution, "release", last_seen, seen_in_last_sync)
+SELECT name, version, distribution, "release", last_seen, seen_in_last_sync
 FROM other.source_packages
 WHERE TRUE
 ON CONFLICT DO NOTHING;
@@ -18,8 +18,8 @@ ON CONFLICT DO NOTHING;
 INSERT INTO build_inputs (source_package_id, url, backend, architecture, retries, next_retry)
 SELECT (SELECT id
         FROM source_packages
-        WHERE (name, version, distribution, "release", component) IS
-              (SELECT name, version, distribution, "release", component
+        WHERE (name, version, distribution, "release") IS
+              (SELECT name, version, distribution, "release"
                FROM other.source_packages
                WHERE id = other.build_inputs.source_package_id)),
        url,
@@ -32,23 +32,26 @@ WHERE TRUE
 ON CONFLICT DO NOTHING;
 
 -- binary packages, mapped to source packages and build inputs
-INSERT INTO binary_packages (source_package_id, build_input_id, name, version, architecture, artifact_url)
+INSERT INTO binary_packages (source_package_id, build_input_id, name, version, component, architecture, artifact_url)
 SELECT (SELECT id
         FROM source_packages
-        WHERE (name, version, distribution, "release", component) IS
-              (SELECT name, version, distribution, "release", component
+        WHERE (name, version, distribution, "release") IS
+              (SELECT name, version, distribution, "release"
                FROM other.source_packages
                WHERE id = other.binary_packages.source_package_id)),
        (SELECT id
         FROM build_inputs
         WHERE source_package_id IS (SELECT id
                                     FROM source_packages
-                                    WHERE (name, version, distribution, "release", component) IS
-                                          (SELECT name, version, distribution, "release", component
+                                    WHERE (name, version, distribution, "release") IS
+                                          (SELECT name, version, distribution, "release"
                                            FROM other.source_packages
-                                           WHERE id = other.binary_packages.source_package_id))),
+                                           WHERE id = other.binary_packages.source_package_id))
+        AND architecture IS other.binary_packages.architecture
+       ),
        name,
        version,
+       component,
        architecture,
        artifact_url
 FROM other.binary_packages
@@ -61,15 +64,17 @@ CREATE TEMPORARY TABLE _build_log_map
     id     INTEGER PRIMARY KEY AUTOINCREMENT,
     old_id INTEGER NOT NULL,
     new_id INTEGER
-)
+);
 
 INSERT INTO _build_log_map(old_id, new_id)
 SELECT id, (SELECT seq FROM main.sqlite_sequence WHERE name IS 'build_logs') + rowid
 FROM other.build_logs
 ORDER BY id;
 
-INSERT INTO build_logs(build_log)
-SELECT build_log
+INSERT INTO build_logs(id, build_log)
+SELECT
+(SELECT new_id FROM _build_log_map WHERE old_id IS other.build_logs.id),
+build_log
 FROM other.build_logs
 ORDER BY id;
 
@@ -88,8 +93,10 @@ SELECT id, (SELECT seq FROM main.sqlite_sequence WHERE name IS 'attestation_logs
 FROM other.attestation_logs
 ORDER BY id;
 
-INSERT INTO attestation_logs(attestation_log)
-SELECT attestation_log
+INSERT INTO attestation_logs(id, attestation_log)
+SELECT
+(SELECT new_id FROM _attestation_log_map WHERE old_id IS other.attestation_logs.id),
+attestation_log
 FROM other.attestation_logs
 ORDER BY id;
 
@@ -108,8 +115,10 @@ SELECT id, (SELECT seq FROM main.sqlite_sequence WHERE name IS 'diffoscope_logs'
 FROM other.diffoscope_logs
 ORDER BY id;
 
-INSERT INTO diffoscope_logs(diffoscope_log)
-SELECT diffoscope_log
+INSERT INTO diffoscope_logs(id, diffoscope_log)
+SELECT
+(SELECT new_id FROM _diffoscope_log_map WHERE old_id IS other.diffoscope_logs.id),
+diffoscope_log
 FROM other.diffoscope_logs
 ORDER BY id;
 
@@ -127,13 +136,15 @@ SELECT id, (SELECT seq FROM main.sqlite_sequence WHERE name IS 'rebuilds') + row
 FROM other.rebuilds
 ORDER BY id;
 
-INSERT INTO rebuilds (build_input_id, started_at, built_at, build_log_id, status)
-SELECT ( -- build_input_id in the merged db
+INSERT INTO rebuilds (id, build_input_id, started_at, built_at, build_log_id, status)
+SELECT
+       (SELECT new_id FROM _rebuilds_map WHERE old_id IS other.rebuilds.id),
+       ( -- build_input_id in the merged db
            SELECT build_inputs.id
            FROM build_inputs
                     INNER JOIN source_packages ON build_inputs.source_package_id = source_packages.id
-           WHERE (name, version, distribution, "release", component) IS
-                 (SELECT name, version, distribution, "release", component
+           WHERE (name, version, distribution, "release", architecture) IS
+                 (SELECT name, version, distribution, "release", architecture
                   FROM other.source_packages
                            INNER JOIN other.build_inputs
                                       ON other.source_packages.id IS other.build_inputs.source_package_id