more extra data. just use a json text field for it.

This commit is contained in:
Mike McLean 2015-10-05 23:23:15 -04:00
parent ccd486f534
commit 36e56a72e3
2 changed files with 15 additions and 17 deletions

View file

@ -33,13 +33,6 @@ CREATE TABLE buildroot_tools_info (
PRIMARY KEY (buildroot_id, tool)
) WITHOUT OIDS;
CREATE TABLE buildroot_extra_info (
buildroot_id INTEGER NOT NULL REFERENCES buildroot(id),
key TEXT NOT NULL,
value TEXT NOT NULL,
PRIMARY KEY (buildroot_id, key)
) WITHOUT OIDS;
CREATE TABLE image_archive_listing (
image_id INTEGER NOT NULL REFERENCES image_archives(archive_id),
@ -49,6 +42,14 @@ CREATE TABLE image_archive_listing (
CREATE INDEX image_listing_archives on image_archive_listing(archive_id);
-- new columns --
select now(), 'Adding new columns' as msg;
ALTER TABLE build ADD COLUMN extra TEXT;
ALTER TABLE rpminfo ADD COLUMN extra TEXT;
ALTER TABLE archiveinfo ADD COLUMN extra TEXT;
-- the more complicated stuff
SELECT now(), 'Copying buildroot to standard_buildroot' as msg;
@ -90,6 +91,7 @@ ALTER TABLE buildroot ADD COLUMN cg_version TEXT;
ALTER TABLE buildroot ADD COLUMN container_type TEXT;
ALTER TABLE buildroot ADD COLUMN host_os TEXT;
ALTER TABLE buildroot ADD COLUMN host_arch TEXT;
ALTER TABLE buildroot ADD COLUMN extra TEXT;
SELECT now(), 'Altering buildroot table (altering columns)' as msg;
ALTER TABLE buildroot RENAME arch TO container_arch;

View file

@ -21,7 +21,6 @@ DROP TABLE groups;
DROP TABLE tag_listing;
DROP TABLE tag_packages;
DROP TABLE buildroot_extra_info;
DROP TABLE buildroot_tools_info;
DROP TABLE standard_buildroot;
DROP TABLE buildroot;
@ -295,6 +294,7 @@ CREATE TABLE build (
state INTEGER NOT NULL,
task_id INTEGER REFERENCES task (id),
owner INTEGER NOT NULL REFERENCES users (id),
extra TEXT,
CONSTRAINT build_pkg_ver_rel UNIQUE (pkg_id, version, release),
CONSTRAINT completion_sane CHECK ((state = 0 AND completion_time IS NULL) OR
(state != 0 AND completion_time IS NOT NULL))
@ -525,7 +525,8 @@ CREATE TABLE buildroot (
(container_type IS NULL AND container_arch IS NULL)
OR (container_type IS NOT NULL AND container_arch IS NOT NULL)),
host_os TEXT,
host_arch TEXT
host_arch TEXT,
extra TEXT
) WITHOUT OIDS;
CREATE TABLE standard_buildroot (
@ -545,13 +546,6 @@ CREATE TABLE buildroot_tools_info (
PRIMARY KEY (buildroot_id, tool)
) WITHOUT OIDS;
CREATE TABLE buildroot_extra_info (
buildroot_id INTEGER NOT NULL REFERENCES buildroot(id),
key TEXT NOT NULL,
value TEXT NOT NULL,
PRIMARY KEY (buildroot_id, key)
) WITHOUT OIDS;
-- track spun images (livecds, installation, VMs...)
CREATE TABLE image_builds (
@ -697,6 +691,7 @@ CREATE TABLE rpminfo (
payloadhash TEXT NOT NULL,
size BIGINT NOT NULL,
buildtime BIGINT NOT NULL,
extra TEXT,
CONSTRAINT rpminfo_unique_nvra UNIQUE (name,version,release,arch,external_repo_id)
) WITHOUT OIDS;
CREATE INDEX rpminfo_build ON rpminfo(build_id);
@ -829,7 +824,8 @@ CREATE TABLE archiveinfo (
filename TEXT NOT NULL,
size BIGINT NOT NULL,
checksum TEXT NOT NULL,
checksum_type INTEGER NOT NULL
checksum_type INTEGER NOT NULL,
extra TEXT
) WITHOUT OIDS;
CREATE INDEX archiveinfo_build_idx ON archiveinfo (build_id);
CREATE INDEX archiveinfo_buildroot_idx on archiveinfo (buildroot_id);