From 21c1da3a8d4963ebfddc50a90dc34bc290e3f0bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Malo=C5=A1t=C3=ADk?= <malostik@cesnet.cz>
Date: Mon, 12 Sep 2022 15:19:19 +0200
Subject: [PATCH] Ditch case_insensitive collation
---
warden_server/warden_3.0_postgres.sql | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/warden_server/warden_3.0_postgres.sql b/warden_server/warden_3.0_postgres.sql
index 208acc6..952cad9 100644
--- a/warden_server/warden_3.0_postgres.sql
+++ b/warden_server/warden_3.0_postgres.sql
@@ -1,11 +1,5 @@
SET TimeZone='+00:00';
-CREATE COLLATION IF NOT EXISTS case_insensitive (
- provider = icu,
- locale = 'und-u-ks-level2',
- deterministic = false
-);
-
-- ---------------------------------------------------------
--
@@ -20,9 +14,9 @@ CREATE COLLATION IF NOT EXISTS case_insensitive (
CREATE TABLE IF NOT EXISTS "categories" (
"id" int NOT NULL UNIQUE,
- "category" text NOT NULL COLLATE case_insensitive,
- "subcategory" text DEFAULT NULL COLLATE case_insensitive,
- "cat_subcat" text NOT NULL COLLATE case_insensitive
+ "category" text NOT NULL,
+ "subcategory" text DEFAULT NULL,
+ "cat_subcat" text NOT NULL
);
CREATE INDEX IF NOT EXISTS "cat_sub" ON "categories" ("cat_subcat");
@@ -36,9 +30,9 @@ CREATE INDEX IF NOT EXISTS "cat_sub" ON "categories" ("cat_subcat");
CREATE TABLE IF NOT EXISTS "clients" (
"id" SERIAL PRIMARY KEY,
"registered" timestamp NOT NULL DEFAULT '1970-01-01 00:00:00',
- "requestor" text NOT NULL COLLATE case_insensitive,
- "hostname" text NOT NULL COLLATE case_insensitive,
- "note" text NULL COLLATE case_insensitive,
+ "requestor" text NOT NULL,
+ "hostname" text NOT NULL,
+ "note" text NULL,
"valid" smallint NOT NULL DEFAULT '1' CHECK ("valid" >= 0),
"name" text NOT NULL,
"secret" text NULL,
@@ -104,7 +98,7 @@ CREATE INDEX IF NOT EXISTS "client_id" ON "last_events" ("client_id", "event_id"
CREATE TABLE IF NOT EXISTS "tags" (
"id" int NOT NULL UNIQUE,
- "tag" text NOT NULL COLLATE case_insensitive
+ "tag" text NOT NULL
);
CREATE INDEX IF NOT EXISTS "id_tag_name" ON "tags" ("id", "tag");
--
GitLab