clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Redo some work

This commit is contained in:
Michael 2017-01-16 22:11:35 +00:00
parent ef31127430
commit 6972faa3a8
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
database.sql
View File

@ -31,10 +31,10 @@ CREATE TABLE IF NOT EXISTS `attach` (
`data` longblob NOT NULL, `data` longblob NOT NULL,
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`allow_cid` text, `allow_cid` mediumtext,
`allow_gid` text, `allow_gid` medium_text,
`deny_cid` text, `deny_cid` medium_text,
`deny_gid` text, `deny_gid` medium_text,
PRIMARY KEY(`id`) PRIMARY KEY(`id`)
) DEFAULT CHARSET=utf8mb4; ) DEFAULT CHARSET=utf8mb4;
@ -235,10 +235,10 @@ CREATE TABLE IF NOT EXISTS `event` (
`nofinish` tinyint(1) NOT NULL DEFAULT 0, `nofinish` tinyint(1) NOT NULL DEFAULT 0,
`adjust` tinyint(1) NOT NULL DEFAULT 1, `adjust` tinyint(1) NOT NULL DEFAULT 1,
`ignore` tinyint(1) unsigned NOT NULL DEFAULT 0, `ignore` tinyint(1) unsigned NOT NULL DEFAULT 0,
`allow_cid` text, `allow_cid` medium_text,
`allow_gid` text, `allow_gid` medium_text,
`deny_cid` text, `deny_cid` medium_text,
`deny_gid` text, `deny_gid` medium_text,
PRIMARY KEY(`id`), PRIMARY KEY(`id`),
INDEX `uid_start` (`uid`,`start`) INDEX `uid_start` (`uid`,`start`)
) DEFAULT CHARSET=utf8mb4; ) DEFAULT CHARSET=utf8mb4;
@ -1073,10 +1073,10 @@ CREATE TABLE IF NOT EXISTS `user` (
`expire_notification_sent` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `expire_notification_sent` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`service_class` varchar(32) NOT NULL DEFAULT '', `service_class` varchar(32) NOT NULL DEFAULT '',
`def_gid` int(11) NOT NULL DEFAULT 0, `def_gid` int(11) NOT NULL DEFAULT 0,
`allow_cid` text, `allow_cid` medium_text,
`allow_gid` text, `allow_gid` medium_text,
`deny_cid` text, `deny_cid` medium_text,
`deny_gid` text, `deny_gid` medium_text,
`openidserver` text, `openidserver` text,
PRIMARY KEY(`uid`), PRIMARY KEY(`uid`),
INDEX `nickname` (`nickname`(32)) INDEX `nickname` (`nickname`(32))

26
include/dbstructure.php
View File

@ -517,10 +517,10 @@ function db_definition($charset) {
"data" => array("type" => "longblob", "not null" => "1"), "data" => array("type" => "longblob", "not null" => "1"),
"created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"edited" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), "edited" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"allow_cid" => array("type" => "text"), "allow_cid" => array("type" => "mediumtext"),
"allow_gid" => array("type" => "text"), "allow_gid" => array("type" => "medium_text"),
"deny_cid" => array("type" => "text"), "deny_cid" => array("type" => "medium_text"),
"deny_gid" => array("type" => "text"), "deny_gid" => array("type" => "medium_text"),
), ),
"indexes" => array( "indexes" => array(
"PRIMARY" => array("id"), "PRIMARY" => array("id"),
@ -721,10 +721,10 @@ function db_definition($charset) {
"nofinish" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "nofinish" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"adjust" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"), "adjust" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"),
"ignore" => array("type" => "tinyint(1) unsigned", "not null" => "1", "default" => "0"), "ignore" => array("type" => "tinyint(1) unsigned", "not null" => "1", "default" => "0"),
"allow_cid" => array("type" => "text"), "allow_cid" => array("type" => "medium_text"),
"allow_gid" => array("type" => "text"), "allow_gid" => array("type" => "medium_text"),
"deny_cid" => array("type" => "text"), "deny_cid" => array("type" => "medium_text"),
"deny_gid" => array("type" => "text"), "deny_gid" => array("type" => "medium_text"),
), ),
"indexes" => array( "indexes" => array(
"PRIMARY" => array("id"), "PRIMARY" => array("id"),
@ -1264,7 +1264,7 @@ function db_definition($charset) {
), ),
"indexes" => array( "indexes" => array(
"PRIMARY" => array("id"), "PRIMARY" => array("id"),
"poll_id" => array("UNIQUE", "poll_id"), "poll_id" => array("poll_id"),
"choice" => array("choice"), "choice" => array("choice"),
) )
); );
@ -1559,10 +1559,10 @@ function db_definition($charset) {
"expire_notification_sent" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), "expire_notification_sent" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"service_class" => array("type" => "varchar(32)", "not null" => "1", "default" => ""), "service_class" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
"def_gid" => array("type" => "int(11)", "not null" => "1", "default" => "0"), "def_gid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"allow_cid" => array("type" => "text"), "allow_cid" => array("type" => "medium_text"),
"allow_gid" => array("type" => "text"), "allow_gid" => array("type" => "medium_text"),
"deny_cid" => array("type" => "text"), "deny_cid" => array("type" => "medium_text"),
"deny_gid" => array("type" => "text"), "deny_gid" => array("type" => "medium_text"),
"openidserver" => array("type" => "text"), "openidserver" => array("type" => "text"),
), ),
"indexes" => array( "indexes" => array(