Skip to content

Commit 7d18fe0

Browse files
authored
Merge pull request #1136 from kellnerd/entity-import-bbid
Give pending entities BBIDs and treat them the same way as regular entities
2 parents e8d7098 + 7f74f8a commit 7d18fe0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+2092
-2579
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"@fortawesome/free-brands-svg-icons": "^6.4.2",
4141
"@fortawesome/free-solid-svg-icons": "^6.4.2",
4242
"@fortawesome/react-fontawesome": "^0.1.11",
43-
"bookbrainz-data": "5.1.1",
43+
"bookbrainz-data": "^5.3.0",
4444
"chart.js": "^2.9.4",
4545
"chartjs-adapter-date-fns": "^1.0.0",
4646
"classnames": "^2.3.2",

sql/migrations/import/down.sql

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,21 @@ DROP VIEW IF EXISTS bookbrainz.publisher_import;
77
DROP VIEW IF EXISTS bookbrainz.series_import;
88
DROP VIEW IF EXISTS bookbrainz.work_import;
99

10+
-- Only drop these tables if the database contains no pending imports!
1011
DROP TABLE IF EXISTS bookbrainz.author_import_header;
1112
DROP TABLE IF EXISTS bookbrainz.edition_import_header;
1213
DROP TABLE IF EXISTS bookbrainz.edition_group_import_header;
1314
DROP TABLE IF EXISTS bookbrainz.publisher_import_header;
1415
DROP TABLE IF EXISTS bookbrainz.series_import_header;
1516
DROP TABLE IF EXISTS bookbrainz.work_import_header;
1617
DROP TABLE IF EXISTS bookbrainz.discard_votes;
18+
DROP TABLE IF EXISTS bookbrainz.import_metadata;
19+
DROP TABLE IF EXISTS bookbrainz.external_source;
20+
21+
-- Only drop this column if the database contains no pending imports!
22+
ALTER TABLE entity DROP COLUMN IF EXISTS is_import;
23+
24+
-- Legacy tables from an earlier version of the import schema.
1725
DROP TABLE IF EXISTS bookbrainz.link_import;
1826
DROP TABLE IF EXISTS bookbrainz.origin_source;
1927
DROP TABLE IF EXISTS bookbrainz.import;

sql/migrations/import/up.sql

Lines changed: 251 additions & 78 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)