From 6972faa3a8d756590233c67929ae8bee58622f04 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 16 Jan 2017 22:11:35 +0000
Subject: [PATCH] Redo some work
---
database.sql | 24 ++++++++++++------------
include/dbstructure.php | 26 +++++++++++++-------------
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/database.sql b/database.sql
index 1b7e2cb4cc..a12f9d2046 100644
--- a/database.sql
+++ b/database.sql
@@ -31,10 +31,10 @@ CREATE TABLE IF NOT EXISTS `attach` (
`data` longblob NOT NULL,
`created` 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_gid` text,
- `deny_cid` text,
- `deny_gid` text,
+ `allow_cid` mediumtext,
+ `allow_gid` medium_text,
+ `deny_cid` medium_text,
+ `deny_gid` medium_text,
PRIMARY KEY(`id`)
) DEFAULT CHARSET=utf8mb4;
@@ -235,10 +235,10 @@ CREATE TABLE IF NOT EXISTS `event` (
`nofinish` tinyint(1) NOT NULL DEFAULT 0,
`adjust` tinyint(1) NOT NULL DEFAULT 1,
`ignore` tinyint(1) unsigned NOT NULL DEFAULT 0,
- `allow_cid` text,
- `allow_gid` text,
- `deny_cid` text,
- `deny_gid` text,
+ `allow_cid` medium_text,
+ `allow_gid` medium_text,
+ `deny_cid` medium_text,
+ `deny_gid` medium_text,
PRIMARY KEY(`id`),
INDEX `uid_start` (`uid`,`start`)
) 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',
`service_class` varchar(32) NOT NULL DEFAULT '',
`def_gid` int(11) NOT NULL DEFAULT 0,
- `allow_cid` text,
- `allow_gid` text,
- `deny_cid` text,
- `deny_gid` text,
+ `allow_cid` medium_text,
+ `allow_gid` medium_text,
+ `deny_cid` medium_text,
+ `deny_gid` medium_text,
`openidserver` text,
PRIMARY KEY(`uid`),
INDEX `nickname` (`nickname`(32))
diff --git a/include/dbstructure.php b/include/dbstructure.php
index c1dc1ba877..56d2a17033 100644
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -517,10 +517,10 @@ function db_definition($charset) {
"data" => array("type" => "longblob", "not null" => "1"),
"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"),
- "allow_cid" => array("type" => "text"),
- "allow_gid" => array("type" => "text"),
- "deny_cid" => array("type" => "text"),
- "deny_gid" => array("type" => "text"),
+ "allow_cid" => array("type" => "mediumtext"),
+ "allow_gid" => array("type" => "medium_text"),
+ "deny_cid" => array("type" => "medium_text"),
+ "deny_gid" => array("type" => "medium_text"),
),
"indexes" => array(
"PRIMARY" => array("id"),
@@ -721,10 +721,10 @@ function db_definition($charset) {
"nofinish" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"adjust" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"),
"ignore" => array("type" => "tinyint(1) unsigned", "not null" => "1", "default" => "0"),
- "allow_cid" => array("type" => "text"),
- "allow_gid" => array("type" => "text"),
- "deny_cid" => array("type" => "text"),
- "deny_gid" => array("type" => "text"),
+ "allow_cid" => array("type" => "medium_text"),
+ "allow_gid" => array("type" => "medium_text"),
+ "deny_cid" => array("type" => "medium_text"),
+ "deny_gid" => array("type" => "medium_text"),
),
"indexes" => array(
"PRIMARY" => array("id"),
@@ -1264,7 +1264,7 @@ function db_definition($charset) {
),
"indexes" => array(
"PRIMARY" => array("id"),
- "poll_id" => array("UNIQUE", "poll_id"),
+ "poll_id" => array("poll_id"),
"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"),
"service_class" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
"def_gid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
- "allow_cid" => array("type" => "text"),
- "allow_gid" => array("type" => "text"),
- "deny_cid" => array("type" => "text"),
- "deny_gid" => array("type" => "text"),
+ "allow_cid" => array("type" => "medium_text"),
+ "allow_gid" => array("type" => "medium_text"),
+ "deny_cid" => array("type" => "medium_text"),
+ "deny_gid" => array("type" => "medium_text"),
"openidserver" => array("type" => "text"),
),
"indexes" => array(