Merge pull request #4221 from annando/oembed-no-title

[friendica.git] / database.sql

diff --git a/database.sql b/database.sql
index b41c0bc5459f9490346192d3acd74c811d32d458..48c2e7ecee354d1a6f561e99314cbb585cf20efe 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 3.6-dev (Asparagus)
--- DB_UPDATE_VERSION 1236
+-- DB_UPDATE_VERSION 1239
 -- ------------------------------------------
 
 
@@ -374,13 +374,11 @@ CREATE TABLE IF NOT EXISTS `group` (
 --
 CREATE TABLE IF NOT EXISTS `group_member` (
        `id` int(10) unsigned NOT NULL auto_increment,
-       `uid` int(10) unsigned NOT NULL DEFAULT 0,
        `gid` int(10) unsigned NOT NULL DEFAULT 0,
        `contact-id` int(10) unsigned NOT NULL DEFAULT 0,
         PRIMARY KEY(`id`),
         INDEX `contactid` (`contact-id`),
-        INDEX `gid_contactid` (`gid`,`contact-id`),
-        UNIQUE INDEX `uid_gid_contactid` (`uid`,`gid`,`contact-id`)
+        UNIQUE INDEX `gid_contactid` (`gid`,`contact-id`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
 --
@@ -394,6 +392,7 @@ CREATE TABLE IF NOT EXISTS `gserver` (
        `site_name` varchar(255) NOT NULL DEFAULT '',
        `info` text,
        `register_policy` tinyint(1) NOT NULL DEFAULT 0,
+       `registered-users` int(10) NOT NULL DEFAULT 0,
        `poco` varchar(255) NOT NULL DEFAULT '',
        `noscrape` varchar(255) NOT NULL DEFAULT '',
        `network` varchar(32) NOT NULL DEFAULT '',
@@ -909,23 +908,6 @@ CREATE TABLE IF NOT EXISTS `sign` (
         UNIQUE INDEX `iid` (`iid`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
---
--- TABLE spam
---
-CREATE TABLE IF NOT EXISTS `spam` (
-       `id` int(11) NOT NULL auto_increment,
-       `uid` int(11) NOT NULL DEFAULT 0,
-       `spam` int(11) NOT NULL DEFAULT 0,
-       `ham` int(11) NOT NULL DEFAULT 0,
-       `term` varchar(255) NOT NULL DEFAULT '',
-       `date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-        PRIMARY KEY(`id`),
-        INDEX `uid` (`uid`),
-        INDEX `spam` (`spam`),
-        INDEX `ham` (`ham`),
-        INDEX `term` (`term`(32))
-) DEFAULT COLLATE utf8mb4_general_ci;
-
 --
 -- TABLE term
 --
@@ -990,7 +972,7 @@ CREATE TABLE IF NOT EXISTS `thread` (
         INDEX `uid_created` (`uid`,`created`),
         INDEX `uid_commented` (`uid`,`commented`),
         INDEX `uid_wall_created` (`uid`,`wall`,`created`),
-        INDEX `private_wall_received` (`private`,`wall`,`received`)
+        INDEX `private_wall_commented` (`private`,`wall`,`commented`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
 --