From 12d77ac3e4558b645cd41f15894a466bbc7a2638 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Sun, 27 Dec 2015 11:50:11 +0100 Subject: [PATCH] varchar to text since there's no reason to limit the fields They caused problems when quitter.se was upgrading because someone was named ryanjjjjjjjjjjjjjjjjjjj[and more than 191 'j's] etc. --- classes/Config.php | 10 +++------- classes/File.php | 8 ++++---- classes/Profile.php | 24 +++++++++--------------- 3 files changed, 16 insertions(+), 26 deletions(-) diff --git a/classes/Config.php b/classes/Config.php index 2e8492849c..c457da1a5a 100644 --- a/classes/Config.php +++ b/classes/Config.php @@ -17,16 +17,12 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { - exit(1); -} +if (!defined('GNUSOCIAL')) { exit(1); } /** * Table Definition for config */ -require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; - class Config extends Managed_DataObject { ###START_AUTOCODE @@ -35,7 +31,7 @@ class Config extends Managed_DataObject public $__table = 'config'; // table name public $section; // varchar(32) primary_key not_null public $setting; // varchar(32) primary_key not_null - public $value; // varchar(191) not 255 because utf8mb4 takes more space + public $value; // text /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE @@ -46,7 +42,7 @@ class Config extends Managed_DataObject 'fields' => array( 'section' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'default' => '', 'description' => 'configuration section'), 'setting' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'default' => '', 'description' => 'configuration setting'), - 'value' => array('type' => 'varchar', 'length' => 191, 'description' => 'configuration value'), + 'value' => array('type' => 'text', 'description' => 'configuration value'), ), 'primary key' => array('section', 'setting'), ); diff --git a/classes/File.php b/classes/File.php index fadbda1f9b..22ff237162 100644 --- a/classes/File.php +++ b/classes/File.php @@ -31,10 +31,10 @@ class File extends Managed_DataObject public $filehash; // varchar(64) indexed public $mimetype; // varchar(50) public $size; // int(4) - public $title; // varchar(191) not 255 because utf8mb4 takes more space + public $title; // text() public $date; // int(4) public $protected; // int(4) - public $filename; // varchar(191) not 255 because utf8mb4 takes more space + public $filename; // text() public $width; // int(4) public $height; // int(4) public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP @@ -52,10 +52,10 @@ class File extends Managed_DataObject 'filehash' => array('type' => 'varchar', 'length' => 64, 'not null' => false, 'description' => 'sha256 of the file contents, only for locally stored files of course'), 'mimetype' => array('type' => 'varchar', 'length' => 50, 'description' => 'mime type of resource'), 'size' => array('type' => 'int', 'description' => 'size of resource when available'), - 'title' => array('type' => 'varchar', 'length' => 191, 'description' => 'title of resource when available'), + 'title' => array('type' => 'text', 'description' => 'title of resource when available'), 'date' => array('type' => 'int', 'description' => 'date of resource according to http query'), 'protected' => array('type' => 'int', 'description' => 'true when URL is private (needs login)'), - 'filename' => array('type' => 'varchar', 'length' => 191, 'description' => 'if a local file, name of the file'), + 'filename' => array('type' => 'text', 'description' => 'if a local file, name of the file'), 'width' => array('type' => 'int', 'description' => 'width in pixels, if it can be described as such and data is available'), 'height' => array('type' => 'int', 'description' => 'height in pixels, if it can be described as such and data is available'), diff --git a/classes/Profile.php b/classes/Profile.php index 547ed485e8..a45511fe54 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -17,24 +17,21 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } +if (!defined('GNUSOCIAL')) { exit(1); } /** * Table Definition for profile */ class Profile extends Managed_DataObject { - ###START_AUTOCODE - /* the code below is auto generated do not remove the above tag */ - public $__table = 'profile'; // table name public $id; // int(4) primary_key not_null public $nickname; // varchar(64) multiple_key not_null - public $fullname; // varchar(191) multiple_key not 255 because utf8mb4 takes more space - public $profileurl; // varchar(191) not 255 because utf8mb4 takes more space - public $homepage; // varchar(191) multiple_key not 255 because utf8mb4 takes more space + public $fullname; // text() + public $profileurl; // text() + public $homepage; // text() public $bio; // text() multiple_key - public $location; // varchar(191) multiple_key not 255 because utf8mb4 takes more space + public $location; // text() public $lat; // decimal(10,7) public $lon; // decimal(10,7) public $location_id; // int(4) @@ -49,11 +46,11 @@ class Profile extends Managed_DataObject 'fields' => array( 'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'), 'nickname' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'nickname or username', 'collate' => 'utf8mb4_general_ci'), - 'fullname' => array('type' => 'varchar', 'length' => 191, 'description' => 'display name', 'collate' => 'utf8mb4_general_ci'), - 'profileurl' => array('type' => 'varchar', 'length' => 191, 'description' => 'URL, cached so we dont regenerate'), - 'homepage' => array('type' => 'varchar', 'length' => 191, 'description' => 'identifying URL', 'collate' => 'utf8mb4_general_ci'), + 'fullname' => array('type' => 'text', 'description' => 'display name', 'collate' => 'utf8mb4_general_ci'), + 'profileurl' => array('type' => 'text', 'description' => 'URL, cached so we dont regenerate'), + 'homepage' => array('type' => 'text', 'description' => 'identifying URL', 'collate' => 'utf8mb4_general_ci'), 'bio' => array('type' => 'text', 'description' => 'descriptive biography', 'collate' => 'utf8mb4_general_ci'), - 'location' => array('type' => 'varchar', 'length' => 191, 'description' => 'physical location', 'collate' => 'utf8mb4_general_ci'), + 'location' => array('type' => 'text', 'description' => 'physical location', 'collate' => 'utf8mb4_general_ci'), 'lat' => array('type' => 'numeric', 'precision' => 10, 'scale' => 7, 'description' => 'latitude'), 'lon' => array('type' => 'numeric', 'precision' => 10, 'scale' => 7, 'description' => 'longitude'), 'location_id' => array('type' => 'int', 'description' => 'location id if possible'), @@ -76,9 +73,6 @@ class Profile extends Managed_DataObject return $def; } - - /* the code above is auto generated do not remove the tag below */ - ###END_AUTOCODE public static function getByEmail($email) { -- 2.39.5