From a77b7793a81080db8903bb581a88d5ba8e9639cd Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 22 May 2020 05:06:55 +0000
Subject: [PATCH] Rearranged table order
---
database.sql | 56 ++++++++++++++++-----------------
static/dbstructure.config.php | 58 +++++++++++++++++------------------
2 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/database.sql b/database.sql
index 4a80335a40..bcd8c9843d 100644
--- a/database.sql
+++ b/database.sql
@@ -4,6 +4,34 @@
-- ------------------------------------------
+--
+-- TABLE gserver
+--
+CREATE TABLE IF NOT EXISTS `gserver` (
+ `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
+ `url` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+ `nurl` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+ `version` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+ `site_name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+ `info` text COMMENT '',
+ `register_policy` tinyint NOT NULL DEFAULT 0 COMMENT '',
+ `registered-users` int unsigned NOT NULL DEFAULT 0 COMMENT 'Number of registered users',
+ `directory-type` tinyint DEFAULT 0 COMMENT 'Type of directory service (Poco, Mastodon)',
+ `poco` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+ `noscrape` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+ `network` char(4) NOT NULL DEFAULT '' COMMENT '',
+ `platform` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+ `relay-subscribe` boolean NOT NULL DEFAULT '0' COMMENT 'Has the server subscribed to the relay system',
+ `relay-scope` varchar(10) NOT NULL DEFAULT '' COMMENT 'The scope of messages that the server wants to get',
+ `detection-method` tinyint unsigned COMMENT 'Method that had been used to detect that server',
+ `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+ `last_poco_query` datetime DEFAULT '0001-01-01 00:00:00' COMMENT '',
+ `last_contact` datetime DEFAULT '0001-01-01 00:00:00' COMMENT '',
+ `last_failure` datetime DEFAULT '0001-01-01 00:00:00' COMMENT '',
+ PRIMARY KEY(`id`),
+ UNIQUE INDEX `nurl` (`nurl`(190))
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Global servers';
+
--
-- TABLE clients
--
@@ -532,34 +560,6 @@ CREATE TABLE IF NOT EXISTS `group_member` (
UNIQUE INDEX `gid_contactid` (`gid`,`contact-id`)
) DEFAULT COLLATE utf8mb4_general_ci COMMENT='privacy groups, member info';
---
--- TABLE gserver
---
-CREATE TABLE IF NOT EXISTS `gserver` (
- `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
- `url` varchar(255) NOT NULL DEFAULT '' COMMENT '',
- `nurl` varchar(255) NOT NULL DEFAULT '' COMMENT '',
- `version` varchar(255) NOT NULL DEFAULT '' COMMENT '',
- `site_name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
- `info` text COMMENT '',
- `register_policy` tinyint NOT NULL DEFAULT 0 COMMENT '',
- `registered-users` int unsigned NOT NULL DEFAULT 0 COMMENT 'Number of registered users',
- `directory-type` tinyint DEFAULT 0 COMMENT 'Type of directory service (Poco, Mastodon)',
- `poco` varchar(255) NOT NULL DEFAULT '' COMMENT '',
- `noscrape` varchar(255) NOT NULL DEFAULT '' COMMENT '',
- `network` char(4) NOT NULL DEFAULT '' COMMENT '',
- `platform` varchar(255) NOT NULL DEFAULT '' COMMENT '',
- `relay-subscribe` boolean NOT NULL DEFAULT '0' COMMENT 'Has the server subscribed to the relay system',
- `relay-scope` varchar(10) NOT NULL DEFAULT '' COMMENT 'The scope of messages that the server wants to get',
- `detection-method` tinyint unsigned COMMENT 'Method that had been used to detect that server',
- `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
- `last_poco_query` datetime DEFAULT '0001-01-01 00:00:00' COMMENT '',
- `last_contact` datetime DEFAULT '0001-01-01 00:00:00' COMMENT '',
- `last_failure` datetime DEFAULT '0001-01-01 00:00:00' COMMENT '',
- PRIMARY KEY(`id`),
- UNIQUE INDEX `nurl` (`nurl`(190))
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Global servers';
-
--
-- TABLE gserver-tag
--
diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index f1f3cde8d8..fc7abded50 100755
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -59,6 +59,35 @@ if (!defined('DB_UPDATE_VERSION')) {
return [
// Side tables
+ "gserver" => [
+ "comment" => "Global servers",
+ "fields" => [
+ "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+ "url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+ "nurl" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+ "version" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+ "site_name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+ "info" => ["type" => "text", "comment" => ""],
+ "register_policy" => ["type" => "tinyint", "not null" => "1", "default" => "0", "comment" => ""],
+ "registered-users" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => "Number of registered users"],
+ "directory-type" => ["type" => "tinyint", "default" => "0", "comment" => "Type of directory service (Poco, Mastodon)"],
+ "poco" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+ "noscrape" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+ "network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""],
+ "platform" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+ "relay-subscribe" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Has the server subscribed to the relay system"],
+ "relay-scope" => ["type" => "varchar(10)", "not null" => "1", "default" => "", "comment" => "The scope of messages that the server wants to get"],
+ "detection-method" => ["type" => "tinyint unsigned", "comment" => "Method that had been used to detect that server"],
+ "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+ "last_poco_query" => ["type" => "datetime", "default" => DBA::NULL_DATETIME, "comment" => ""],
+ "last_contact" => ["type" => "datetime", "default" => DBA::NULL_DATETIME, "comment" => ""],
+ "last_failure" => ["type" => "datetime", "default" => DBA::NULL_DATETIME, "comment" => ""],
+ ],
+ "indexes" => [
+ "PRIMARY" => ["id"],
+ "nurl" => ["UNIQUE", "nurl(190)"],
+ ]
+ ],
"clients" => [
"comment" => "OAuth usage",
"fields" => [
@@ -611,35 +640,6 @@ return [
"gid_contactid" => ["UNIQUE", "gid", "contact-id"],
]
],
- "gserver" => [
- "comment" => "Global servers",
- "fields" => [
- "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
- "url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
- "nurl" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
- "version" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
- "site_name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
- "info" => ["type" => "text", "comment" => ""],
- "register_policy" => ["type" => "tinyint", "not null" => "1", "default" => "0", "comment" => ""],
- "registered-users" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => "Number of registered users"],
- "directory-type" => ["type" => "tinyint", "default" => "0", "comment" => "Type of directory service (Poco, Mastodon)"],
- "poco" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
- "noscrape" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
- "network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""],
- "platform" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
- "relay-subscribe" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Has the server subscribed to the relay system"],
- "relay-scope" => ["type" => "varchar(10)", "not null" => "1", "default" => "", "comment" => "The scope of messages that the server wants to get"],
- "detection-method" => ["type" => "tinyint unsigned", "comment" => "Method that had been used to detect that server"],
- "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
- "last_poco_query" => ["type" => "datetime", "default" => DBA::NULL_DATETIME, "comment" => ""],
- "last_contact" => ["type" => "datetime", "default" => DBA::NULL_DATETIME, "comment" => ""],
- "last_failure" => ["type" => "datetime", "default" => DBA::NULL_DATETIME, "comment" => ""],
- ],
- "indexes" => [
- "PRIMARY" => ["id"],
- "nurl" => ["UNIQUE", "nurl(190)"],
- ]
- ],
"gserver-tag" => [
"comment" => "Tags that the server has subscribed",
"fields" => [