Add a fqn field to blogs and users (#457)

Fixes #319
2019-03-06 18:28:10 +01:00
parent eff2698664
commit fe6e69d7c4
39 changed files with 258 additions and 141 deletions
@@ -0,0 +1,77 @@
+-- This file should undo anything in `up.sql`
+CREATE TABLE blogs_no_fqn (
+    id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    actor_id VARCHAR NOT NULL,
+    title VARCHAR NOT NULL,
+    summary TEXT NOT NULL DEFAULT '',
+    outbox_url VARCHAR NOT NULL UNIQUE,
+    inbox_url VARCHAR NOT NULL UNIQUE,
+    instance_id INTEGER REFERENCES instances(id) ON DELETE CASCADE NOT NULL,
+    creation_date DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    ap_url text not null default '' UNIQUE,
+    private_key TEXT,
+    public_key TEXT NOT NULL DEFAULT '',
+    CONSTRAINT blog_unique UNIQUE (actor_id, instance_id)
+);
+
+INSERT INTO blogs_no_fqn SELECT
+    id,
+    actor_id,
+    title,
+    summary,
+    outbox_url,
+    inbox_url,
+    instance_id,
+    creation_date,
+    ap_url,
+    private_key,
+    public_key
+FROM blogs;
+DROP TABLE blogs;
+ALTER TABLE blogs_no_fqn RENAME TO blogs;
+
+
+CREATE TABLE users_no_fqn (
+    id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    username VARCHAR NOT NULL,
+    display_name VARCHAR NOT NULL DEFAULT '',
+    outbox_url VARCHAR NOT NULL UNIQUE,
+    inbox_url VARCHAR NOT NULL UNIQUE,
+    is_admin BOOLEAN NOT NULL DEFAULT 'f',
+    summary TEXT NOT NULL DEFAULT '',
+    email TEXT,
+    hashed_password TEXT,
+    instance_id INTEGER REFERENCES instances(id) ON DELETE CASCADE NOT NULL,
+    creation_date DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    ap_url TEXT NOT NULL default '' UNIQUE,
+    private_key TEXT,
+    public_key TEXT NOT NULL DEFAULT '',
+    shared_inbox_url VARCHAR,
+    followers_endpoint VARCHAR NOT NULL DEFAULT '' UNIQUE,
+    avatar_id INTEGER REFERENCES medias(id) ON DELETE SET NULL,
+    last_fetched_date TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    CONSTRAINT blog_authors_unique UNIQUE (username, instance_id)
+);
+
+INSERT INTO users_no_fqn SELECT
+    id,
+    username,
+    display_name,
+    outbox_url,
+    inbox_url,
+    is_admin,
+    summary,
+    email,
+    hashed_password,
+    instance_id,
+    creation_date,
+    ap_url,
+    private_key,
+    public_key,
+    shared_inbox_url,
+    followers_endpoint,
+    avatar_id,
+    last_fetched_date
+FROM users;
+DROP TABLE users;
+ALTER TABLE users_no_fqn RENAME TO users;
@@ -0,0 +1,18 @@
+-- Your SQL goes here
+ALTER TABLE blogs ADD COLUMN fqn TEXT NOT NULL DEFAULT '';
+UPDATE blogs SET fqn =
+	(CASE WHEN (SELECT local FROM instances WHERE id = instance_id) THEN
+		actor_id
+	ELSE
+		(actor_id || '@' || (SELECT public_domain FROM instances WHERE id = instance_id LIMIT 1))
+	END)
+WHERE fqn = '';
+
+ALTER TABLE users ADD COLUMN fqn TEXT NOT NULL DEFAULT '';
+UPDATE users SET fqn =
+	(CASE WHEN (SELECT local FROM instances WHERE id = instance_id) THEN
+		username
+	ELSE
+		(username || '@' || (SELECT public_domain FROM instances WHERE id = instance_id LIMIT 1))
+	END)
+WHERE fqn = '';