diff --git a/docs/schema-upgrade-1.7-1.8.sql b/docs/schema-upgrade-1.7-1.8.sql index a6cd1788..78684330 100644 --- a/docs/schema-upgrade-1.7-1.8.sql +++ b/docs/schema-upgrade-1.7-1.8.sql @@ -15,18 +15,17 @@ CREATE TABLE image_builds ( build_id INTEGER NOT NULL PRIMARY KEY REFERENCES build(id) ) WITHOUT OIDS; -CREATE TABLE image_listing ( - image_id INTEGER NOT NULL REFERENCES archiveinfo(id), - rpm_id INTEGER NOT NULL REFERENCES rpminfo(id), - UNIQUE (image_id, rpm_id) -) WITHOUT OIDS; -CREATE INDEX image_listing_rpms on image_listing(rpm_id); - CREATE TABLE image_archives ( archive_id INTEGER NOT NULL PRIMARY KEY REFERENCES archiveinfo(id), arch VARCHAR(16) NOT NULL ) WITHOUT OIDS; +CREATE TABLE image_listing ( + image_id INTEGER NOT NULL REFERENCES image_archives(archive_id), + rpm_id INTEGER NOT NULL REFERENCES rpminfo(id), + UNIQUE (image_id, rpm_id) +) WITHOUT OIDS; +CREATE INDEX image_listing_rpms on image_listing(rpm_id); -- alter archiveinfo ALTER TABLE archiveinfo ALTER COLUMN size TYPE BIGINT; diff --git a/docs/schema.sql b/docs/schema.sql index 39567200..144a2248 100644 --- a/docs/schema.sql +++ b/docs/schema.sql @@ -734,14 +734,6 @@ CREATE INDEX archiveinfo_buildroot_idx on archiveinfo (buildroot_id); CREATE INDEX archiveinfo_type_idx on archiveinfo (type_id); CREATE INDEX archiveinfo_filename_idx on archiveinfo(filename); --- tracks the contents of an image -CREATE TABLE image_listing ( - image_id INTEGER NOT NULL REFERENCES image_archives(archive_id), - rpm_id INTEGER NOT NULL REFERENCES rpminfo(id), - UNIQUE (image_id, rpm_id) -) WITHOUT OIDS; -CREATE INDEX image_listing_rpms on image_listing(rpm_id); - CREATE TABLE maven_archives ( archive_id INTEGER NOT NULL PRIMARY KEY REFERENCES archiveinfo(id), group_id TEXT NOT NULL, @@ -754,6 +746,14 @@ CREATE TABLE image_archives ( arch VARCHAR(16) NOT NULL ) WITHOUT OIDS; +-- tracks the contents of an image +CREATE TABLE image_listing ( + image_id INTEGER NOT NULL REFERENCES image_archives(archive_id), + rpm_id INTEGER NOT NULL REFERENCES rpminfo(id), + UNIQUE (image_id, rpm_id) +) WITHOUT OIDS; +CREATE INDEX image_listing_rpms on image_listing(rpm_id); + CREATE TABLE buildroot_archives ( buildroot_id INTEGER NOT NULL REFERENCES buildroot (id), archive_id INTEGER NOT NULL REFERENCES archiveinfo (id),