Changeset 815 in code

Timestamp:

Apr 28, 2023, 10:23:47 PM (2 years ago)

Author:

yakumo.izuru

Message:

Support existing Postgres database schemas (if switching from SQLite)
and other minor changes.

Signed-off-by: Izuru Yakumo <yakumo.izuru@…>

Location:

trunk

Files:

• README.md (modified) (1 diff)
• contrib/casemap-logs.sh (modified) (1 diff)
• db_postgres.go (modified) (6 diffs)

trunk/README.md

@@ -30 +30 @@
 
 * Copyright (C) 2020 The soju Contributors
-* Copyright (C) 2023-present Aoi K.
+* Copyright (C) 2023-present Izuru Yakumo
 
 The code for `version.go` is stolen verbatim from one of [@prologic](https://git.mills.io/prologic)'s projects. It's probably under MIT

trunk/contrib/casemap-logs.sh

@@ -3 +3 @@
 # Converts a log dir to its case-mapped form.
 #
-# soju needs to be stopped for this script to work properly. The script may
+# suika needs to be stopped for this script to work properly. The script may
 # re-order messages that happened within the same second interval if merging
 # two daily log files is necessary.

trunk/db_postgres.go

@@ -26 +26 @@
 
 const postgresSchema = `
-CREATE TABLE "User" (
+CREATE TABLE IF NOT EXISTS "User" (
         id SERIAL PRIMARY KEY,
         username VARCHAR(255) NOT NULL UNIQUE,
@@ -36 +36 @@
 CREATE TYPE sasl_mechanism AS ENUM ('PLAIN', 'EXTERNAL');
 
-CREATE TABLE "Network" (
+CREATE TABLE IF NOT EXISTS "Network" (
         id SERIAL PRIMARY KEY,
         name VARCHAR(255),
@@ -56 +56 @@
 );
 
-CREATE TABLE "Channel" (
+CREATE TABLE IF NOT EXISTS "Channel" (
         id SERIAL PRIMARY KEY,
         network INTEGER NOT NULL REFERENCES "Network"(id) ON DELETE CASCADE,
@@ -70 +70 @@
 );
 
-CREATE TABLE "DeliveryReceipt" (
+CREATE TABLE IF NOT EXISTS "DeliveryReceipt" (
         id SERIAL PRIMARY KEY,
         network INTEGER NOT NULL REFERENCES "Network"(id) ON DELETE CASCADE,
@@ -79 +79 @@
 );
 
-CREATE TABLE "ReadReceipt" (
+CREATE TABLE IF NOT EXISTS"ReadReceipt" (
         id SERIAL PRIMARY KEY,
         network INTEGER NOT NULL REFERENCES "Network"(id) ON DELETE CASCADE,
@@ -99 +99 @@
         `,
         `
-                CREATE TABLE "ReadReceipt" (
+                CREATE TABLE IF NOT EXISTS "ReadReceipt" (
                         id SERIAL PRIMARY KEY,
                         network INTEGER NOT NULL REFERENCES "Network"(id) ON DELETE CASCADE,