[PATCH 10/12] [db] Prefer column names derived from table name, and drop _name suffix
Instead of using a column "name" in every table, use a name derived from
the table name, eg. "source" in sources and "arch" in architectures. Also,
when creating references, don't name such columns with a "_name" suffix;
instead, just use the name of the referenced column if possible. (It is not
possible, for example, in binaries, where there are two version numbers.)
With this, it is possible to create queries more easily, and natural joins
are possible.
Incidentally, this commits removes the long listing of package section,
which is unnecessary given that they will be auto-inserted via a trigger
when populating the sources and binaries table.
---
db/db.sql | 334 ++++++++++++++++++++++++++++---------------------------------
1 files changed, 152 insertions(+), 182 deletions(-)
diff --git a/db/db.sql b/db/db.sql
index 15cc63c..a237542 100644
--- a/db/db.sql
+++ b/db/db.sql
@@ -26,29 +26,29 @@ COMMENT ON DATABASE "sbuild-packages" IS 'Debian source builder package state ma
CREATE LANGUAGE plpgsql;
CREATE TABLE architectures (
- name text
+ arch text
CONSTRAINT arch_pkey PRIMARY KEY
);
COMMENT ON TABLE architectures IS 'Architectures supported by this wanna-build instance';
-COMMENT ON COLUMN architectures.name IS 'Architecture name';
-
-INSERT INTO architectures (name) VALUES ('alpha');
-INSERT INTO architectures (name) VALUES ('amd64');
-INSERT INTO architectures (name) VALUES ('arm');
-INSERT INTO architectures (name) VALUES ('armel');
-INSERT INTO architectures (name) VALUES ('hppa');
-INSERT INTO architectures (name) VALUES ('i386');
-INSERT INTO architectures (name) VALUES ('ia64');
-INSERT INTO architectures (name) VALUES ('m68k');
-INSERT INTO architectures (name) VALUES ('mips');
-INSERT INTO architectures (name) VALUES ('mipsel');
-INSERT INTO architectures (name) VALUES ('powerpc');
-INSERT INTO architectures (name) VALUES ('s390');
-INSERT INTO architectures (name) VALUES ('sparc');
+COMMENT ON COLUMN architectures.arch IS 'Architecture name';
+
+INSERT INTO architectures (arch) VALUES ('alpha');
+INSERT INTO architectures (arch) VALUES ('amd64');
+INSERT INTO architectures (arch) VALUES ('arm');
+INSERT INTO architectures (arch) VALUES ('armel');
+INSERT INTO architectures (arch) VALUES ('hppa');
+INSERT INTO architectures (arch) VALUES ('i386');
+INSERT INTO architectures (arch) VALUES ('ia64');
+INSERT INTO architectures (arch) VALUES ('m68k');
+INSERT INTO architectures (arch) VALUES ('mips');
+INSERT INTO architectures (arch) VALUES ('mipsel');
+INSERT INTO architectures (arch) VALUES ('powerpc');
+INSERT INTO architectures (arch) VALUES ('s390');
+INSERT INTO architectures (arch) VALUES ('sparc');
CREATE TABLE suites (
- name text
+ suite text
CONSTRAINT suite_pkey PRIMARY KEY,
priority integer,
depwait boolean
@@ -58,124 +58,90 @@ CREATE TABLE suites (
);
COMMENT ON TABLE suites IS 'Valid suites';
-COMMENT ON COLUMN suites.name IS 'Suite name';
+COMMENT ON COLUMN suites.suite IS 'Suite name';
COMMENT ON COLUMN suites.priority IS 'Sorting order (lower is higher priority)';
COMMENT ON COLUMN suites.depwait IS 'Automatically wait on dependencies?';
COMMENT ON COLUMN suites.hidden IS 'Hide suite from public view (e.g. for -security)?';
-INSERT INTO suites (name, priority) VALUES ('experimental', 4);
-INSERT INTO suites (name, priority) VALUES ('unstable', 3);
-INSERT INTO suites (name, priority) VALUES ('testing', 2);
-INSERT INTO suites (name, priority, depwait, hidden)
+INSERT INTO suites (suite, priority) VALUES ('experimental', 4);
+INSERT INTO suites (suite, priority) VALUES ('unstable', 3);
+INSERT INTO suites (suite, priority) VALUES ('testing', 2);
+INSERT INTO suites (suite, priority, depwait, hidden)
VALUES ('testing-security', 2, 'f', 't');
-INSERT INTO suites (name, priority) VALUES ('stable', 1);
-INSERT INTO suites (name, priority, depwait, hidden)
+INSERT INTO suites (suite, priority) VALUES ('stable', 1);
+INSERT INTO suites (suite, priority, depwait, hidden)
VALUES ('stable-security', 1, 'f', 't');
CREATE TABLE components (
- name text
+ component text
CONSTRAINT component_pkey PRIMARY KEY
);
COMMENT ON TABLE components IS 'Valid archive components';
-COMMENT ON COLUMN components.name IS 'Component name';
+COMMENT ON COLUMN components.component IS 'Component name';
-INSERT INTO components (name) VALUES ('main');
-INSERT INTO components (name) VALUES ('contrib');
-INSERT INTO components (name) VALUES ('non-free');
+INSERT INTO components (component) VALUES ('main');
+INSERT INTO components (component) VALUES ('contrib');
+INSERT INTO components (component) VALUES ('non-free');
CREATE TABLE package_architectures (
- name text
+ arch text
CONSTRAINT pkg_arch_pkey PRIMARY KEY
);
COMMENT ON TABLE package_architectures IS 'Possible values for the Architecture field';
-COMMENT ON COLUMN package_architectures.name IS 'Architecture name';
+COMMENT ON COLUMN package_architectures.arch IS 'Architecture name';
CREATE TABLE package_priorities (
- name text
+ pkg_prio text
CONSTRAINT pkg_pri_pkey PRIMARY KEY,
- value integer
+ prio_val integer
DEFAULT 0
);
COMMENT ON TABLE package_priorities IS 'Valid package priorities';
-COMMENT ON COLUMN package_priorities.name IS 'Priority name';
-COMMENT ON COLUMN package_priorities.value IS 'Integer value for sorting priorities';
+COMMENT ON COLUMN package_priorities.pkg_prio IS 'Priority name';
+COMMENT ON COLUMN package_priorities.prio_val IS 'Integer value for sorting priorities';
-INSERT INTO package_priorities (name, value) VALUES ('required', 1);
-INSERT INTO package_priorities (name, value) VALUES ('standard', 2);
-INSERT INTO package_priorities (name, value) VALUES ('important', 3);
-INSERT INTO package_priorities (name, value) VALUES ('optional', 4);
-INSERT INTO package_priorities (name, value) VALUES ('extra', 5);
+INSERT INTO package_priorities (pkg_prio, prio_val) VALUES ('required', 1);
+INSERT INTO package_priorities (pkg_prio, prio_val) VALUES ('standard', 2);
+INSERT INTO package_priorities (pkg_prio, prio_val) VALUES ('important', 3);
+INSERT INTO package_priorities (pkg_prio, prio_val) VALUES ('optional', 4);
+INSERT INTO package_priorities (pkg_prio, prio_val) VALUES ('extra', 5);
CREATE TABLE package_sections (
- name text
+ section text
CONSTRAINT pkg_sect_pkey PRIMARY KEY
);
COMMENT ON TABLE package_sections IS 'Valid package sections';
-COMMENT ON COLUMN package_sections.name IS 'Section name';
-
-INSERT INTO package_sections (name) VALUES ('admin');
-INSERT INTO package_sections (name) VALUES ('comm');
-INSERT INTO package_sections (name) VALUES ('debian-installer');
-INSERT INTO package_sections (name) VALUES ('devel');
-INSERT INTO package_sections (name) VALUES ('doc');
-INSERT INTO package_sections (name) VALUES ('editors');
-INSERT INTO package_sections (name) VALUES ('electronics');
-INSERT INTO package_sections (name) VALUES ('embedded');
-INSERT INTO package_sections (name) VALUES ('games');
-INSERT INTO package_sections (name) VALUES ('gnome');
-INSERT INTO package_sections (name) VALUES ('graphics');
-INSERT INTO package_sections (name) VALUES ('hamradio');
-INSERT INTO package_sections (name) VALUES ('interpreters');
-INSERT INTO package_sections (name) VALUES ('kde');
-INSERT INTO package_sections (name) VALUES ('libdevel');
-INSERT INTO package_sections (name) VALUES ('libs');
-INSERT INTO package_sections (name) VALUES ('mail');
-INSERT INTO package_sections (name) VALUES ('math');
-INSERT INTO package_sections (name) VALUES ('misc');
-INSERT INTO package_sections (name) VALUES ('net');
-INSERT INTO package_sections (name) VALUES ('news');
-INSERT INTO package_sections (name) VALUES ('oldlibs');
-INSERT INTO package_sections (name) VALUES ('otherosfs');
-INSERT INTO package_sections (name) VALUES ('perl');
-INSERT INTO package_sections (name) VALUES ('python');
-INSERT INTO package_sections (name) VALUES ('science');
-INSERT INTO package_sections (name) VALUES ('shells');
-INSERT INTO package_sections (name) VALUES ('sound');
-INSERT INTO package_sections (name) VALUES ('tex');
-INSERT INTO package_sections (name) VALUES ('text');
-INSERT INTO package_sections (name) VALUES ('utils');
-INSERT INTO package_sections (name) VALUES ('web');
-INSERT INTO package_sections (name) VALUES ('x11');
-
+COMMENT ON COLUMN package_sections.section IS 'Section name';
CREATE TABLE builders (
- name text
+ builder text
CONSTRAINT builder_pkey PRIMARY KEY,
address text
NOT NULL
);
COMMENT ON TABLE builders IS 'buildd usernames (database users from _userinfo in old MLDBM db format)';
-COMMENT ON COLUMN builders.name IS 'Username';
+COMMENT ON COLUMN builders.builder IS 'Username';
COMMENT ON COLUMN builders.address IS 'Remote e-mail address of the buildd user';
CREATE TABLE sources (
- name text
+ source text
NOT NULL,
- version debversion NOT NULL,
- component_name text
- CONSTRAINT source_comp_fkey REFERENCES components(name)
+ version debversion
+ NOT NULL,
+ component text
+ CONSTRAINT source_comp_fkey REFERENCES components(component)
ON DELETE CASCADE
NOT NULL,
- pkg_section_name text
- CONSTRAINT source_pkg_sect_fkey REFERENCES package_sections(name)
+ section text
+ CONSTRAINT source_section_fkey REFERENCES package_sections(section)
NOT NULL,
- pkg_priority_name text
- CONSTRAINT source_pkg_pri_fkey REFERENCES package_priorities(name)
+ pkg_prio text
+ CONSTRAINT source_pkg_prio_fkey REFERENCES package_priorities(pkg_prio)
NOT NULL,
maintainer text NOT NULL,
build_dep text,
@@ -183,17 +149,17 @@ CREATE TABLE sources (
build_confl text,
build_confl_indep text,
stdver text,
- CONSTRAINT sources_pkey PRIMARY KEY (name, version)
+ CONSTRAINT sources_pkey PRIMARY KEY (source, version)
);
-CREATE INDEX sources_pkg_idx ON sources (name);
+CREATE INDEX sources_pkg_idx ON sources (source);
COMMENT ON TABLE sources IS 'Source packages common to all architectures (from Sources)';
-COMMENT ON COLUMN sources.name IS 'Package name';
+COMMENT ON COLUMN sources.source IS 'Package name';
COMMENT ON COLUMN sources.version IS 'Package version number';
-COMMENT ON COLUMN sources.component_name IS 'Archive component';
-COMMENT ON COLUMN sources.pkg_section_name IS 'Package section';
-COMMENT ON COLUMN sources.pkg_priority_name IS 'Package priority';
+COMMENT ON COLUMN sources.component IS 'Archive component';
+COMMENT ON COLUMN sources.section IS 'Package section';
+COMMENT ON COLUMN sources.pkg_prio IS 'Package priority';
COMMENT ON COLUMN sources.maintainer IS 'Package maintainer name';
COMMENT ON COLUMN sources.build_dep IS 'Package build dependencies (architecture dependent)';
COMMENT ON COLUMN sources.build_dep_indep IS 'Package build dependencies (architecture independent)';
@@ -202,73 +168,76 @@ COMMENT ON COLUMN sources.build_confl_indep IS 'Package build conflicts (archite
COMMENT ON COLUMN sources.stdver IS 'Debian Standards (policy) version number';
CREATE TABLE source_architectures (
- source_name text
+ source text
+ NOT NULL,
+ version debversion
NOT NULL,
- source_version debversion NOT NULL,
- arch_name text
+ arch text
CONSTRAINT source_arch_arch_fkey
- REFERENCES package_architectures(name)
+ REFERENCES package_architectures(arch)
ON DELETE CASCADE
NOT NULL,
- UNIQUE (source_name,source_version,arch_name),
- CONSTRAINT source_arch_source_fkey FOREIGN KEY (source_name, source_version)
- REFERENCES sources (name, version)
+ UNIQUE (source, version, arch),
+ CONSTRAINT source_arch_source_fkey FOREIGN KEY (source, version)
+ REFERENCES sources (source, version)
ON DELETE CASCADE
);
COMMENT ON TABLE source_architectures IS 'Source package architectures (from Sources)';
-COMMENT ON COLUMN source_architectures.source_name IS 'Package name';
-COMMENT ON COLUMN source_architectures.source_version IS 'Package version number';
-COMMENT ON COLUMN source_architectures.arch_name IS 'Architecture name';
+COMMENT ON COLUMN source_architectures.source IS 'Package name';
+COMMENT ON COLUMN source_architectures.version IS 'Package version number';
+COMMENT ON COLUMN source_architectures.arch IS 'Architecture name';
CREATE TABLE uploaders (
- source_name text
+ source text
NOT NULL,
- source_version debversion
+ version debversion
NOT NULL,
uploader text
NOT NULL,
- UNIQUE (source_name, source_version, uploader),
- CONSTRAINT uploader_source_fkey FOREIGN KEY (source_name, source_version)
- REFERENCES sources (name, version)
+ UNIQUE (source, version, uploader),
+ CONSTRAINT uploader_source_fkey FOREIGN KEY (source, version)
+ REFERENCES sources (source, version)
ON DELETE CASCADE
);
COMMENT ON TABLE uploaders IS 'Uploader names for source packages';
-COMMENT ON COLUMN uploaders.source_name IS 'Package name';
-COMMENT ON COLUMN uploaders.source_version IS 'Package version number';
+COMMENT ON COLUMN uploaders.source IS 'Package name';
+COMMENT ON COLUMN uploaders.version IS 'Package version number';
COMMENT ON COLUMN uploaders.uploader IS 'Uploader name and address';
CREATE TABLE binaries (
- name text NOT NULL,
+ -- PostgreSQL won't allow "binary" as column name
+ package text NOT NULL,
version debversion NOT NULL,
- arch_name text
- CONSTRAINT bin_arch_fkey REFERENCES package_architectures(name)
+ arch text
+ CONSTRAINT bin_arch_fkey REFERENCES package_architectures(arch)
ON DELETE CASCADE
NOT NULL,
- source_name text
+ source text
+ NOT NULL,
+ source_version debversion
NOT NULL,
- source_version debversion NOT NULL,
- pkg_section_name text
- CONSTRAINT bin_sect_fkey REFERENCES package_sections(name)
+ section text
+ CONSTRAINT bin_section_fkey REFERENCES package_sections(section)
NOT NULL,
- pkg_priority_name text
- CONSTRAINT bin_pri_fkey REFERENCES package_priorities(name)
+ pkg_prio text
+ CONSTRAINT bin_pkg_prio_fkey REFERENCES package_priorities(pkg_prio)
NOT NULL,
- CONSTRAINT bin_pkey PRIMARY KEY (name, version, arch_name),
- CONSTRAINT bin_src_fkey FOREIGN KEY (source_name, source_version)
- REFERENCES sources (name, version)
+ CONSTRAINT bin_pkey PRIMARY KEY (package, version, arch),
+ CONSTRAINT bin_src_fkey FOREIGN KEY (source, source_version)
+ REFERENCES sources (source, version)
ON DELETE CASCADE
);
COMMENT ON TABLE binaries IS 'Binary packages specific to single architectures (from Packages)';
-COMMENT ON COLUMN binaries.name IS 'Binary package name';
+COMMENT ON COLUMN binaries.package IS 'Binary package name';
COMMENT ON COLUMN binaries.version IS 'Binary package version number';
-COMMENT ON COLUMN binaries.arch_name IS 'Architecture name';
-COMMENT ON COLUMN binaries.source_name IS 'Source package name';
+COMMENT ON COLUMN binaries.arch IS 'Architecture name';
+COMMENT ON COLUMN binaries.source IS 'Source package name';
COMMENT ON COLUMN binaries.source_version IS 'Source package version number';
-COMMENT ON COLUMN binaries.pkg_section_name IS 'Package section';
-COMMENT ON COLUMN binaries.pkg_priority_name IS 'Package priority';
+COMMENT ON COLUMN binaries.section IS 'Package section';
+COMMENT ON COLUMN binaries.pkg_prio IS 'Package priority';
CREATE TABLE job_states (
name text
@@ -295,93 +264,94 @@ INSERT INTO job_states (name) VALUES ('state');
INSERT INTO job_states (name) VALUES ('uploaded');
CREATE TABLE suite_sources (
- source_name text
+ source text
NOT NULL,
- source_version debversion NOT NULL,
- suite_name text
- CONSTRAINT suite_sources_suite_fkey REFERENCES suites(name)
+ version debversion
+ NOT NULL,
+ suite text
+ CONSTRAINT suite_sources_suite_fkey REFERENCES suites(suite)
ON DELETE CASCADE
NOT NULL,
- CONSTRAINT suite_sources_pkey PRIMARY KEY (source_name, suite_name),
- CONSTRAINT suite_sources_src_fkey FOREIGN KEY (source_name, source_version)
- REFERENCES sources (name, version)
+ CONSTRAINT suite_sources_pkey PRIMARY KEY (source, suite),
+ CONSTRAINT suite_sources_src_fkey FOREIGN KEY (source, version)
+ REFERENCES sources (source, version)
ON DELETE CASCADE
);
COMMENT ON TABLE suite_sources IS 'Source packages contained within a suite';
-COMMENT ON COLUMN suite_sources.source_name IS 'Source package name';
-COMMENT ON COLUMN suite_sources.source_version IS 'Source package version number';
-COMMENT ON COLUMN suite_sources.suite_name IS 'Suite name';
+COMMENT ON COLUMN suite_sources.source IS 'Source package name';
+COMMENT ON COLUMN suite_sources.version IS 'Source package version number';
+COMMENT ON COLUMN suite_sources.suite IS 'Suite name';
CREATE TABLE suite_binaries (
- binary_name text
+ package text
NOT NULL,
- binary_version debversion NOT NULL,
- arch_name text
- CONSTRAINT suite_bin_arch_fkey REFERENCES package_architectures(name)
+ version debversion
+ NOT NULL,
+ arch text
+ CONSTRAINT suite_bin_arch_fkey REFERENCES package_architectures(arch)
ON DELETE CASCADE
NOT NULL,
- suite_name text
- CONSTRAINT suite_bin_suite_fkey REFERENCES suites(name)
+ suite text
+ CONSTRAINT suite_bin_suite_fkey REFERENCES suites(suite)
ON DELETE CASCADE
NOT NULL,
- CONSTRAINT suite_bin_pkey PRIMARY KEY (binary_name, suite_name),
- CONSTRAINT suite_bin_bin_fkey FOREIGN KEY (binary_name, binary_version, arch_name)
- REFERENCES binaries (name, version, arch_name)
+ CONSTRAINT suite_bin_pkey PRIMARY KEY (package, suite),
+ CONSTRAINT suite_bin_bin_fkey FOREIGN KEY (package, version, arch)
+ REFERENCES binaries (package, version, arch)
ON DELETE CASCADE,
- CONSTRAINT suite_bin_unique UNIQUE (binary_name, binary_version, arch_name, suite_name)
+ CONSTRAINT suite_bin_unique UNIQUE (package, version, arch, suite)
);
COMMENT ON TABLE suite_binaries IS 'Binary packages contained within a suite';
-COMMENT ON COLUMN suite_binaries.binary_name IS 'Binary package name';
-COMMENT ON COLUMN suite_binaries.binary_version IS 'Binary package version number';
-COMMENT ON COLUMN suite_binaries.arch_name IS 'Architecture name';
-COMMENT ON COLUMN suite_binaries.suite_name IS 'Suite name';
+COMMENT ON COLUMN suite_binaries.package IS 'Binary package name';
+COMMENT ON COLUMN suite_binaries.version IS 'Binary package version number';
+COMMENT ON COLUMN suite_binaries.arch IS 'Architecture name';
+COMMENT ON COLUMN suite_binaries.suite IS 'Suite name';
CREATE TABLE build_jobs (
id serial
CONSTRAINT build_jobs_pkey PRIMARY KEY,
- source_name text
+ source text
NOT NULL,
- source_version debversion
+ version debversion
NOT NULL,
- arch_name text
- CONSTRAINT build_jobs_arch_fkey REFERENCES architectures(name)
+ arch text
+ CONSTRAINT build_jobs_arch_fkey REFERENCES architectures(arch)
ON DELETE CASCADE
NOT NULL,
- suite_name text
- CONSTRAINT build_jobs_suite_fkey REFERENCES suites(name)
+ suite text
+ CONSTRAINT build_jobs_suite_fkey REFERENCES suites(suite)
ON DELETE CASCADE
NOT NULL,
user_name text NOT NULL DEFAULT CURRENT_USER,
- builder_name text
- CONSTRAINT build_jobs_builder_fkey REFERENCES builders(name)
+ builder text
+ CONSTRAINT build_jobs_builder_fkey REFERENCES builders(builder)
NOT NULL,
- state_name text
+ state text
CONSTRAINT build_jobs_state_fkey REFERENCES job_states(name)
NOT NULL,
ctime timestamp with time zone
NOT NULL DEFAULT CURRENT_TIMESTAMP,
- CONSTRAINT build_jobs_unique UNIQUE(source_name, source_version,
- arch_name),
- CONSTRAINT build_jobs_src_fkey FOREIGN KEY(source_name, source_version)
- REFERENCES sources(name, version)
+ CONSTRAINT build_jobs_unique UNIQUE(source, version, arch),
+ CONSTRAINT build_jobs_src_fkey FOREIGN KEY(source, version)
+ REFERENCES sources(source, version)
ON DELETE CASCADE
);
-CREATE INDEX build_jobs_name ON build_jobs (source_name);
+CREATE INDEX build_jobs_source ON build_jobs (source);
CREATE INDEX build_jobs_ctime ON build_jobs (ctime);
COMMENT ON SEQUENCE build_jobs_id_seq IS 'Build job ticket number sequence';
COMMENT ON TABLE build_jobs IS 'Build job tickets (state changes) specific for single architecture';
COMMENT ON COLUMN build_jobs.id IS 'Job number';
-COMMENT ON COLUMN build_jobs.source_name IS 'Source package name';
-COMMENT ON COLUMN build_jobs.source_version IS 'Source package version number';
-COMMENT ON COLUMN build_jobs.arch_name IS 'Architecture name';
-COMMENT ON COLUMN build_jobs.suite_name IS 'Suite name';
+COMMENT ON COLUMN build_jobs.source IS 'Source package name';
+COMMENT ON COLUMN build_jobs.version IS 'Source package version number';
+COMMENT ON COLUMN build_jobs.arch IS 'Architecture name';
+COMMENT ON COLUMN build_jobs.suite IS 'Suite name';
COMMENT ON COLUMN build_jobs.user_name IS 'User making this change (username)';
-COMMENT ON COLUMN build_jobs.builder_name IS 'Build dæmon making this change (username)';
-COMMENT ON COLUMN build_jobs.state_name IS 'State name';
+COMMENT ON COLUMN build_jobs.builder IS 'Build daemon making this change (username)';
+COMMENT ON COLUMN build_jobs.state IS 'State name';
COMMENT ON COLUMN build_jobs.ctime IS 'Stage change time';
CREATE TABLE build_job_properties (
@@ -420,10 +390,10 @@ CREATE TABLE build_logs (
version debversion
NOT NULL,
arch text
- CONSTRAINT build_logs_arch_fkey REFERENCES architectures(name)
+ CONSTRAINT build_logs_arch_fkey REFERENCES architectures(arch)
NOT NULL,
suite text
- CONSTRAINT build_logs_suite_fkey REFERENCES suites(name)
+ CONSTRAINT build_logs_suite_fkey REFERENCES suites(suite)
NOT NULL,
date timestamp with time zone
NOT NULL,
@@ -464,13 +434,13 @@ COMMENT ON COLUMN log.message IS 'Log entry message';
CREATE OR REPLACE FUNCTION package_checkrel() RETURNS trigger AS $package_checkrel$
BEGIN
- PERFORM name FROM package_sections WHERE (name = NEW.pkg_section_name);
+ PERFORM section FROM package_sections WHERE (section = NEW.section);
IF FOUND = 'f' THEN
- INSERT INTO package_sections (name) VALUES (NEW.pkg_section_name);
+ INSERT INTO package_sections (section) VALUES (NEW.section);
END IF;
- PERFORM name FROM package_priorities WHERE (name = NEW.pkg_priority_name);
+ PERFORM pkg_prio FROM package_priorities WHERE (pkg_prio = NEW.pkg_prio);
IF FOUND = 'f' THEN
- INSERT INTO package_priorities (name) VALUES (NEW.pkg_priority_name);
+ INSERT INTO package_priorities (pkg_prio) VALUES (NEW.pkg_prio);
END IF;
RETURN NEW;
END;
@@ -491,23 +461,23 @@ COMMENT ON TRIGGER checkrel ON binaries
CREATE OR REPLACE FUNCTION package_check_arch() RETURNS trigger AS $package_check_arch$
BEGIN
- PERFORM name FROM package_architectures WHERE (name = NEW.arch_name);
+ PERFORM arch FROM package_architectures WHERE (arch = NEW.arch);
IF FOUND = 'f' THEN
- INSERT INTO package_architectures (name) VALUES (NEW.arch_name);
+ INSERT INTO package_architectures (arch) VALUES (NEW.arch);
END IF;
RETURN NEW;
END;
$package_check_arch$ LANGUAGE plpgsql;
COMMENT ON FUNCTION package_check_arch ()
- IS 'Insert missing values into package_architectures (from NEW.arch_name)';
+ IS 'Insert missing values into package_architectures (from NEW.arch)';
CREATE TRIGGER check_arch BEFORE INSERT OR UPDATE ON source_architectures
FOR EACH ROW EXECUTE PROCEDURE package_check_arch();
COMMENT ON TRIGGER check_arch ON source_architectures
- IS 'Ensure foreign key references (arch_name) exist';
+ IS 'Ensure foreign key references (arch) exist';
CREATE TRIGGER check_arch BEFORE INSERT OR UPDATE ON binaries
FOR EACH ROW EXECUTE PROCEDURE package_check_arch();
COMMENT ON TRIGGER check_arch ON binaries
- IS 'Ensure foreign key references (arch_name) exist';
+ IS 'Ensure foreign key references (arch) exist';
--
1.6.1.1.352.g2c729
Reply to: