db: Update schema for new keys

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/database.sql b/src/database.sql
index 3c6123dc7b9bf45e85ace107ee55e0d70e0823b3..7ae15b3104a403fab7c031e2a65194b118979796 100644 (file)
--- a/src/database.sql
+++ b/src/database.sql
@@ -604,8 +604,17 @@ ALTER SEQUENCE public.jobs_packages_id_seq OWNED BY public.jobs_packages.id;
 CREATE TABLE public.keys (
     id integer NOT NULL,
     fingerprint text NOT NULL,
-    uids text NOT NULL,
-    data text NOT NULL
+    uid text NOT NULL,
+    created_at timestamp without time zone DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    expires_at timestamp without time zone,
+    public_key text NOT NULL,
+    secret_key text NOT NULL,
+    name text NOT NULL,
+    email text NOT NULL,
+    deleted boolean DEFAULT false NOT NULL,
+    algo text NOT NULL,
+    length integer NOT NULL,
+    parent_key_id integer
 );
 
 
@@ -632,43 +641,6 @@ ALTER TABLE public.keys_id_seq OWNER TO pakfire;
 ALTER SEQUENCE public.keys_id_seq OWNED BY public.keys.id;
 
 
---
--- Name: keys_subkeys; Type: TABLE; Schema: public; Owner: pakfire
---
-
-CREATE TABLE public.keys_subkeys (
-    id integer NOT NULL,
-    key_id integer NOT NULL,
-    fingerprint text NOT NULL,
-    time_created timestamp without time zone NOT NULL,
-    time_expires timestamp without time zone,
-    algo text
-);
-
-
-ALTER TABLE public.keys_subkeys OWNER TO pakfire;
-
---
--- Name: keys_subkeys_id_seq; Type: SEQUENCE; Schema: public; Owner: pakfire
---
-
-CREATE SEQUENCE public.keys_subkeys_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
-ALTER TABLE public.keys_subkeys_id_seq OWNER TO pakfire;
-
---
--- Name: keys_subkeys_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: pakfire
---
-
-ALTER SEQUENCE public.keys_subkeys_id_seq OWNED BY public.keys_subkeys.id;
-
-
 --
 -- Name: logfiles; Type: TABLE; Schema: public; Owner: pakfire
 --
@@ -1496,13 +1468,6 @@ ALTER TABLE ONLY public.jobs_packages ALTER COLUMN id SET DEFAULT nextval('publi
 ALTER TABLE ONLY public.keys ALTER COLUMN id SET DEFAULT nextval('public.keys_id_seq'::regclass);
 
 
---
--- Name: keys_subkeys id; Type: DEFAULT; Schema: public; Owner: pakfire
---
-
-ALTER TABLE ONLY public.keys_subkeys ALTER COLUMN id SET DEFAULT nextval('public.keys_subkeys_id_seq'::regclass);
-
-
 --
 -- Name: logfiles id; Type: DEFAULT; Schema: public; Owner: pakfire
 --
@@ -1688,22 +1653,6 @@ ALTER TABLE ONLY public.jobs_packages
     ADD CONSTRAINT idx_2198085_primary PRIMARY KEY (id);
 
 
---
--- Name: keys idx_2198094_primary; Type: CONSTRAINT; Schema: public; Owner: pakfire
---
-
-ALTER TABLE ONLY public.keys
-    ADD CONSTRAINT idx_2198094_primary PRIMARY KEY (id);
-
-
---
--- Name: keys_subkeys idx_2198103_primary; Type: CONSTRAINT; Schema: public; Owner: pakfire
---
-
-ALTER TABLE ONLY public.keys_subkeys
-    ADD CONSTRAINT idx_2198103_primary PRIMARY KEY (id);
-
-
 --
 -- Name: logfiles idx_2198109_primary; Type: CONSTRAINT; Schema: public; Owner: pakfire
 --
@@ -1800,6 +1749,14 @@ ALTER TABLE ONLY public.jobs
     ADD CONSTRAINT jobs_pkey PRIMARY KEY (id);
 
 
+--
+-- Name: keys keys_pkey; Type: CONSTRAINT; Schema: public; Owner: pakfire
+--
+
+ALTER TABLE ONLY public.keys
+    ADD CONSTRAINT keys_pkey PRIMARY KEY (id);
+
+
 --
 -- Name: mirrors_checks mirrors_checks_pkey; Type: CONSTRAINT; Schema: public; Owner: pakfire
 --
@@ -1949,13 +1906,6 @@ CREATE INDEX idx_2198018_user_id ON public.builds_comments USING btree (user_id)
 CREATE INDEX idx_2198080_job_id ON public.jobs_history USING btree (job_id);
 
 
---
--- Name: idx_2198094_fingerprint; Type: INDEX; Schema: public; Owner: pakfire
---
-
-CREATE UNIQUE INDEX idx_2198094_fingerprint ON public.keys USING btree (fingerprint);
-
-
 --
 -- Name: idx_2198147_name; Type: INDEX; Schema: public; Owner: pakfire
 --
@@ -2077,6 +2027,13 @@ CREATE INDEX jobs_running ON public.jobs USING btree (started_at) WHERE ((starte
 CREATE UNIQUE INDEX jobs_uuid ON public.jobs USING btree (uuid) WHERE (deleted IS FALSE);
 
 
+--
+-- Name: keys_fingerprint; Type: INDEX; Schema: public; Owner: pakfire
+--
+
+CREATE UNIQUE INDEX keys_fingerprint ON public.keys USING btree (fingerprint) WHERE (deleted IS FALSE);
+
+
 --
 -- Name: messages_order; Type: INDEX; Schema: public; Owner: pakfire
 --
@@ -2379,11 +2336,11 @@ ALTER TABLE ONLY public.jobs
 
 
 --
--- Name: keys_subkeys keys_subkeys_key_id; Type: FK CONSTRAINT; Schema: public; Owner: pakfire
+-- Name: keys keys_parent_key_id; Type: FK CONSTRAINT; Schema: public; Owner: pakfire
 --
 
-ALTER TABLE ONLY public.keys_subkeys
-    ADD CONSTRAINT keys_subkeys_key_id FOREIGN KEY (key_id) REFERENCES public.keys(id);
+ALTER TABLE ONLY public.keys
+    ADD CONSTRAINT keys_parent_key_id FOREIGN KEY (parent_key_id) REFERENCES public.keys(id);
 
 
 --