From 583a047e83dd4fe353d996308f86f16ca0c884e8 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 25 May 2017 22:50:16 -0700 Subject: looks like a commit was lost someplace, but I'll re-do it later (convert sql schema files to default integers to int values); in any event change all the mysql strings that were 255 maxlength to 191 maxlength in case they get used as indexes down the line --- install/schema_mysql.sql | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'install') diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index 183fcd56d..27ee4dda3 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -35,7 +35,7 @@ CREATE TABLE IF NOT EXISTS `abook` ( `abook_self` tinyint(4) NOT NULL DEFAULT '0', `abook_feed` tinyint(4) NOT NULL DEFAULT '0', `abook_not_here` tinyint(4) NOT NULL DEFAULT '0', - `abook_profile` char(64) NOT NULL DEFAULT '', + `abook_profile` char(191) NOT NULL DEFAULT '', `abook_incl` TEXT NOT NULL DEFAULT '', `abook_excl` TEXT NOT NULL DEFAULT '', `abook_instance` TEXT NOT NULL DEFAULT '', @@ -66,7 +66,7 @@ CREATE TABLE IF NOT EXISTS `account` ( `account_parent` int(10) unsigned NOT NULL DEFAULT '0', `account_default_channel` int(10) unsigned NOT NULL DEFAULT '0', `account_salt` char(32) NOT NULL DEFAULT '', - `account_password` char(255) NOT NULL DEFAULT '', + `account_password` char(191) NOT NULL DEFAULT '', `account_email` char(191) NOT NULL DEFAULT '', `account_external` char(191) NOT NULL DEFAULT '', `account_language` char(16) NOT NULL DEFAULT 'en', @@ -74,7 +74,7 @@ CREATE TABLE IF NOT EXISTS `account` ( `account_lastlog` datetime NOT NULL DEFAULT '0001-01-01 00:00:00', `account_flags` int(10) unsigned NOT NULL DEFAULT '0', `account_roles` int(10) unsigned NOT NULL DEFAULT '0', - `account_reset` char(255) NOT NULL DEFAULT '', + `account_reset` char(191) NOT NULL DEFAULT '', `account_expires` datetime NOT NULL DEFAULT '0001-01-01 00:00:00', `account_expire_notified` datetime NOT NULL DEFAULT '0001-01-01 00:00:00', `account_service_class` char(32) NOT NULL DEFAULT '', @@ -97,7 +97,7 @@ CREATE TABLE IF NOT EXISTS `account` ( CREATE TABLE IF NOT EXISTS `addon` ( `id` int(11) NOT NULL AUTO_INCREMENT, `aname` char(191) NOT NULL DEFAULT '', - `version` char(255) NOT NULL DEFAULT '', + `version` char(191) NOT NULL DEFAULT '', `installed` tinyint(1) NOT NULL DEFAULT '0', `hidden` tinyint(1) NOT NULL DEFAULT '0', `tstamp` bigint(20) NOT NULL DEFAULT '0', @@ -111,18 +111,18 @@ CREATE TABLE IF NOT EXISTS `addon` ( CREATE TABLE IF NOT EXISTS `app` ( `id` int(11) NOT NULL AUTO_INCREMENT, `app_id` char(191) NOT NULL DEFAULT '', - `app_sig` char(255) NOT NULL DEFAULT '', - `app_author` char(255) NOT NULL DEFAULT '', + `app_sig` char(191) NOT NULL DEFAULT '', + `app_author` char(191) NOT NULL DEFAULT '', `app_name` char(191) NOT NULL DEFAULT '', `app_desc` text NOT NULL DEFAULT '', `app_url` char(191) NOT NULL DEFAULT '', `app_photo` char(191) NOT NULL DEFAULT '', `app_version` char(191) NOT NULL DEFAULT '', `app_channel` int(11) NOT NULL DEFAULT '0', - `app_addr` char(255) NOT NULL DEFAULT '', + `app_addr` char(191) NOT NULL DEFAULT '', `app_price` char(191) NOT NULL DEFAULT '', - `app_page` char(255) NOT NULL DEFAULT '', - `app_requires` char(255) NOT NULL DEFAULT '', + `app_page` char(191) NOT NULL DEFAULT '', + `app_requires` char(191) NOT NULL DEFAULT '', `app_deleted` int(11) NOT NULL DEFAULT '0', `app_system` int(11) NOT NULL DEFAULT '0', `app_plugin` char(191) NOT NULL DEFAULT '', @@ -223,11 +223,11 @@ CREATE TABLE IF NOT EXISTS `cal` ( `cal_uid` int(10) unsigned NOT NULL DEFAULT '0', `cal_hash` varchar(191) NOT NULL DEFAULT '', `cal_name` varchar(191) NOT NULL DEFAULT '', - `uri` varchar(255) NOT NULL DEFAULT '', - `logname` varchar(255) NOT NULL DEFAULT '', - `pass` varchar(255) NOT NULL DEFAULT '', - `ctag` varchar(255) NOT NULL DEFAULT '', - `synctoken` varchar(255) NOT NULL DEFAULT '', + `uri` varchar(191) NOT NULL DEFAULT '', + `logname` varchar(191) NOT NULL DEFAULT '', + `pass` varchar(191) NOT NULL DEFAULT '', + `ctag` varchar(191) NOT NULL DEFAULT '', + `synctoken` varchar(191) NOT NULL DEFAULT '', `cal_types` varchar(191) NOT NULL DEFAULT '', PRIMARY KEY (`cal_id`), KEY `cal_aid` (`cal_aid`), @@ -249,7 +249,7 @@ CREATE TABLE IF NOT EXISTS `channel` ( `channel_timezone` char(128) NOT NULL DEFAULT 'UTC', `channel_location` char(191) NOT NULL DEFAULT '', `channel_theme` char(191) NOT NULL DEFAULT '', - `channel_startpage` char(255) NOT NULL DEFAULT '', + `channel_startpage` char(191) NOT NULL DEFAULT '', `channel_pubkey` text NOT NULL, `channel_prvkey` text NOT NULL, `channel_notifyflags` int(10) unsigned NOT NULL DEFAULT '65535', @@ -260,7 +260,7 @@ CREATE TABLE IF NOT EXISTS `channel` ( `channel_max_anon_mail` int(10) unsigned NOT NULL DEFAULT '10', `channel_max_friend_req` int(10) unsigned NOT NULL DEFAULT '10', `channel_expire_days` int(11) NOT NULL DEFAULT '0', - `channel_passwd_reset` char(255) NOT NULL DEFAULT '', + `channel_passwd_reset` char(191) NOT NULL DEFAULT '', `channel_default_group` char(191) NOT NULL DEFAULT '', `channel_allow_cid` mediumtext NOT NULL, `channel_allow_gid` mediumtext NOT NULL, @@ -287,8 +287,8 @@ CREATE TABLE IF NOT EXISTS `channel` ( `channel_removed` tinyint(1) NOT NULL DEFAULT '0', `channel_system` tinyint(1) NOT NULL DEFAULT '0', `channel_moved` char(191) NOT NULL DEFAULT '', - `channel_password` varchar(255) NOT NULL, - `channel_salt` varchar(255) NOT NULL, + `channel_password` varchar(191) NOT NULL, + `channel_salt` varchar(191) NOT NULL, PRIMARY KEY (`channel_id`), KEY `channel_address` (`channel_address`), KEY `channel_account_id` (`channel_account_id`), -- cgit v1.2.3