Revert "lists: Export domains with a global, unique ID for each domain"

This reverts commit 42a14f468c41a64c4ebdabaf49021c9f92e6626d.

This query seems to be very broken as it isn't returning the right data
any more and also is taking a very long time.

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

diff --git a/src/database.sql b/src/database.sql
index da8a6b743e74be55287ecdb5ab2b63d89324a8dd..05e79ce94592070464ac7a4c2f816af38f927910 100644 (file)
--- a/src/database.sql
+++ b/src/database.sql
@@ -2,7 +2,7 @@
 -- PostgreSQL database dump
 --
 
-\restrict PmCqBzadGBjf7X81pOnYPHbo4fs9Y3SWPwRhwMTKuXKIZtccpmryrLaLv9R92bW
+\restrict jGGNPqbE1Kefwc4K0XaP8dH0RVN0MDuO5uFb1iLUfv4FFw5hpjZgrK0wYsIH7r2
 
 -- Dumped from database version 17.6 (Debian 17.6-0+deb13u1)
 -- Dumped by pg_dump version 17.6 (Debian 17.6-0+deb13u1)
@@ -69,35 +69,6 @@ CREATE TABLE public.checker_domains (
 );
 
 
---
--- Name: domain_unique_ids; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.domain_unique_ids (
-    id bigint NOT NULL,
-    name text NOT NULL
-);
-
-
---
--- Name: domain_unique_ids_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.domain_unique_ids_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: domain_unique_ids_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.domain_unique_ids_id_seq OWNED BY public.domain_unique_ids.id;
-
-
 --
 -- Name: domains; Type: TABLE; Schema: public; Owner: -
 --
@@ -341,13 +312,6 @@ ALTER SEQUENCE public.sources_id_seq OWNED BY public.sources.id;
 ALTER TABLE ONLY public.api_keys ALTER COLUMN id SET DEFAULT nextval('public.api_keys_id_seq'::regclass);
 
 
---
--- Name: domain_unique_ids id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.domain_unique_ids ALTER COLUMN id SET DEFAULT nextval('public.domain_unique_ids_id_seq'::regclass);
-
-
 --
 -- Name: domains id; Type: DEFAULT; Schema: public; Owner: -
 --
@@ -406,14 +370,6 @@ ALTER TABLE ONLY public.checker_domains
     ADD CONSTRAINT checker_domains_pkey PRIMARY KEY (name);
 
 
---
--- Name: domain_unique_ids domain_unique_ids_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.domain_unique_ids
-    ADD CONSTRAINT domain_unique_ids_pkey PRIMARY KEY (id);
-
-
 --
 -- Name: domains domains_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
@@ -477,13 +433,6 @@ ALTER TABLE ONLY public.sources
 CREATE INDEX api_keys_prefix ON public.api_keys USING btree (prefix) WHERE (deleted_at IS NULL);
 
 
---
--- Name: domain_unique_ids_unique; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE UNIQUE INDEX domain_unique_ids_unique ON public.domain_unique_ids USING btree (name);
-
-
 --
 -- Name: domains_list_id; Type: INDEX; Schema: public; Owner: -
 --
@@ -636,5 +585,5 @@ ALTER TABLE ONLY public.sources
 -- PostgreSQL database dump complete
 --
 
-\unrestrict PmCqBzadGBjf7X81pOnYPHbo4fs9Y3SWPwRhwMTKuXKIZtccpmryrLaLv9R92bW
+\unrestrict jGGNPqbE1Kefwc4K0XaP8dH0RVN0MDuO5uFb1iLUfv4FFw5hpjZgrK0wYsIH7r2
 

diff --git a/src/dnsbl/domains.py b/src/dnsbl/domains.py
index 94e98128215b8d83fc54bf791b7c4ca195a1a48e..0b939addd57207bdac0ecae2b0416a641ef98d77 100644 (file)
--- a/src/dnsbl/domains.py
+++ b/src/dnsbl/domains.py
@@ -104,16 +104,3 @@ class Domain(sqlmodel.SQLModel, database.BackendMixin, table=True):
 
                # Log action
                log.info("%s (block = %s) has been removed from %s" % (self.name, self.block, self.list))
-
-
-class DomainUniqueID(sqlmodel.SQLModel, table=True):
-       __tablename__ = "domain_unique_ids"
-
-       def __str__(self):
-               return self.name
-
-       # ID
-       id: int = sqlmodel.Field(primary_key=True)
-
-       # Name
-       name: str

diff --git a/src/dnsbl/lists.py b/src/dnsbl/lists.py
index 76b80faa2eeed20e9350f18f6596e61d84731402..e67caa231647446ed84f6ed889735dd533078a65 100644 (file)
--- a/src/dnsbl/lists.py
+++ b/src/dnsbl/lists.py
@@ -256,16 +256,10 @@ class List(sqlmodel.SQLModel, database.BackendMixin, table=True):
                        sqlmodel
                        .select(
                                blocked_domains.c.name,
-                               domains.DomainUniqueID.id.label("unique_id"),
                        )
                        .distinct(
                                blocked_domains.c.name,
                        )
-                       .join(
-                               domains.DomainUniqueID,
-                               domains.DomainUniqueID.name == blocked_domains.c.name,
-                               isouter=True,
-                       )
                        .where(
                                ~sqlmodel.exists(
                                        sqlmodel
@@ -281,48 +275,7 @@ class List(sqlmodel.SQLModel, database.BackendMixin, table=True):
                        .cte("listed_domains")
                )
 
-               # Create and assign a unique ID to each domain
-               new_domains_with_unique_ids = (
-                       sqlalchemy.dialects.postgresql
-                       .insert(
-                               domains.DomainUniqueID,
-                       )
-                       .from_select(
-                               ["name"],
-                               sqlmodel.select(
-                                       listed_domains.c.name,
-                               )
-                               .where(
-                                       listed_domains.c.unique_id == None,
-                               ),
-                       )
-                       .on_conflict_do_nothing(
-                               index_elements=["name"],
-                       )
-                       .returning(
-                               domains.DomainUniqueID.name,
-                               domains.DomainUniqueID.id,
-                       )
-                       .cte("new_domains_with_unique_ids")
-               )
-
-               all_domains = (
-                       sqlmodel
-                       .select(
-                               listed_domains.c.name,
-                               sqlmodel.func.coalesce(
-                                       listed_domains.c.unique_id,
-                                       new_domains_with_unique_ids.c.id,
-                               ).label("unique_id"),
-                       )
-                       .join(
-                               new_domains_with_unique_ids,
-                               new_domains_with_unique_ids.c.name == listed_domains.c.name,
-                               isouter=True,
-                       )
-               )
-
-               return all_domains
+               return listed_domains
 
        @property
        def domains(self):
@@ -332,14 +285,7 @@ class List(sqlmodel.SQLModel, database.BackendMixin, table=True):
                stmt = (
                        sqlmodel
                        .select(
-                               domains.DomainUniqueID,
-                       )
-                       .select_from(
-                               self.__domains,
-                       )
-                       .join(
-                               domains.DomainUniqueID,
-                               domains.DomainUniqueID.name == self.__domains.c.name,
+                               self.__domains.c.name,
                        )
                )