* Use "Longtext" instead of "text" for new installations on blog entry

body and extended body inside database tables. (garvinhicking)
2010-01-14 09:21:07 +00:00 · 2010-01-14 09:21:07 +00:00 · adc738fc9e
commit adc738fc9e
parent 74a5c9f9af
10 changed files with 26 additions and 23 deletions
--- a/docs/NEWS
+++ b/docs/NEWS
@ -3,6 +3,9 @@
 Version 1.6 ()
 ------------------------------------------------------------------------

+    * Use "Longtext" instead of "text" for new installations on blog entry
+      body and extended body inside database tables. (garvinhicking)
+
    * Added ability to mark authorgroups as "hidden", so that members
      of such groups are excluded from common author listings.
      (Ref http://board.s9y.org/viewtopic.php?f=11&t=16237)
--- a/include/db/mysql.inc.php
+++ b/include/db/mysql.inc.php
@ -294,9 +294,9 @@ function serendipity_db_reconnect() {
 */
 function serendipity_db_schema_import($query) {
    static $search  = array('{AUTOINCREMENT}', '{PRIMARY}',
-        '{UNSIGNED}', '{FULLTEXT}', '{FULLTEXT_MYSQL}', '{BOOLEAN}');
+        '{UNSIGNED}', '{FULLTEXT}', '{FULLTEXT_MYSQL}', '{BOOLEAN}', '{TEXT}');
    static $replace = array('int(11) not null auto_increment', 'primary key',
-        'unsigned'  , 'FULLTEXT', 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\'');
+        'unsigned'  , 'FULLTEXT', 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\'', 'LONGTEXT');
    static $is_utf8 = null;
    global $serendipity;

--- a/include/db/mysqli.inc.php
+++ b/include/db/mysqli.inc.php
@ -264,9 +264,9 @@ function serendipity_db_reconnect() {
 */
 function serendipity_db_schema_import($query) {
    static $search  = array('{AUTOINCREMENT}', '{PRIMARY}',
-        '{UNSIGNED}', '{FULLTEXT}', '{FULLTEXT_MYSQL}', '{BOOLEAN}');
+        '{UNSIGNED}', '{FULLTEXT}', '{FULLTEXT_MYSQL}', '{BOOLEAN}', '{TEXT}');
    static $replace = array('int(11) not null auto_increment', 'primary key',
-        'unsigned'  , 'FULLTEXT', 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\'');
+        'unsigned'  , 'FULLTEXT', 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\'', 'LONGTEXT');
    static $is_utf8 = null;
    global $serendipity;

--- a/include/db/pdo-postgres.inc.php
+++ b/include/db/pdo-postgres.inc.php
@ -257,9 +257,9 @@ function &serendipity_db_query($sql, $single = false, $result_type = "both", $re
 */
 function serendipity_db_schema_import($query) {
    static $search  = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}',
-        '{FULLTEXT}', '{BOOLEAN}', 'int(1)', 'int(10)', 'int(11)', 'int(4)', '{UTF_8}');
+        '{FULLTEXT}', '{BOOLEAN}', 'int(1)', 'int(10)', 'int(11)', 'int(4)', '{UTF_8}', '{TEXT}');
    static $replace = array('SERIAL', 'primary key', '', '', 'BOOLEAN NOT NULL', 'int2',
-        'int4', 'int4', 'int4', '');
+        'int4', 'int4', 'int4', '', 'text');

    if (stristr($query, '{FULLTEXT_MYSQL}')) {
        return true;
--- a/include/db/pdo-sqlite.inc.php
+++ b/include/db/pdo-sqlite.inc.php
@ -300,8 +300,8 @@ function &serendipity_db_query($sql, $single = false, $result_type = "both", $re
 * @return ressource    SQL ressource handle of the executed query
 */
 function serendipity_db_schema_import($query) {
-    static $search  = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}', '{UTF_8}');
-    static $replace = array('INTEGER', 'PRIMARY KEY', '', '', 'BOOLEAN NOT NULL', '');
+    static $search  = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}', '{UTF_8}', '{TEXT}');
+    static $replace = array('INTEGER', 'PRIMARY KEY', '', '', 'BOOLEAN NOT NULL', '', 'LONGTEXT');

    if (stristr($query, '{FULLTEXT_MYSQL}')) {
        return true;
--- a/include/db/postgres.inc.php
+++ b/include/db/postgres.inc.php
@ -270,9 +270,9 @@ function &serendipity_db_query($sql, $single = false, $result_type = "both", $re
 */
 function serendipity_db_schema_import($query) {
    static $search  = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}',
-        '{FULLTEXT}', '{BOOLEAN}', 'int(1)', 'int(10)', 'int(11)', 'int(4)', '{UTF_8}');
+        '{FULLTEXT}', '{BOOLEAN}', 'int(1)', 'int(10)', 'int(11)', 'int(4)', '{UTF_8}', '{TEXT}');
    static $replace = array('SERIAL', 'primary key', '', '', 'BOOLEAN NOT NULL', 'int2',
-        'int4', 'int4', 'int4', '');
+        'int4', 'int4', 'int4', '', 'text');

    if (stristr($query, '{FULLTEXT_MYSQL}')) {
        return true;
--- a/include/db/sqlite.inc.php
+++ b/include/db/sqlite.inc.php
@ -335,8 +335,8 @@ function serendipity_db_probe($hash, &$errs)
 */
 function serendipity_db_schema_import($query)
 {
-    static $search  = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}', '{UTF_8}');
-    static $replace = array('INTEGER', 'PRIMARY KEY', '', '', 'BOOLEAN NOT NULL', '');
+    static $search  = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}', '{UTF_8}', '{TEXT}');
+    static $replace = array('INTEGER', 'PRIMARY KEY', '', '', 'BOOLEAN NOT NULL', '', 'LONGTEXT');

    if (stristr($query, '{FULLTEXT_MYSQL}')) {
        return true;
--- a/include/db/sqlite3.inc.php
+++ b/include/db/sqlite3.inc.php
@ -342,8 +342,8 @@ function serendipity_db_probe($hash, &$errs)
 */
 function serendipity_db_schema_import($query)
 {
-    static $search  = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}', '{UTF_8}');
-    static $replace = array('INTEGER', 'PRIMARY KEY', '', '', 'BOOLEAN NOT NULL', '');
+    static $search  = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}', '{UTF_8}', '{TEXT}');
+    static $replace = array('INTEGER', 'PRIMARY KEY', '', '', 'BOOLEAN NOT NULL', '', 'LONGTEXT');

    if (stristr($query, '{FULLTEXT_MYSQL}')) {
        return true;
--- a/include/db/sqlrelay.inc.php
+++ b/include/db/sqlrelay.inc.php
@ -456,9 +456,9 @@ function serendipity_db_schema_import($query) {
    switch($type_of_database) {
        case "mysql":
            static $search  = array('{AUTOINCREMENT}', '{PRIMARY}',
-                '{UNSIGNED}', '{FULLTEXT}', '{FULLTEXT_MYSQL}', '{BOOLEAN}');
+                '{UNSIGNED}', '{FULLTEXT}', '{FULLTEXT_MYSQL}', '{BOOLEAN}', '{TEXT}');
            static $replace = array('int(11) not null auto_increment', 'primary key',
-                'unsigned'  , 'FULLTEXT', 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\'');
+                'unsigned'  , 'FULLTEXT', 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\'', 'LONGTEXT');
            static $is_utf8 = null;
    
            if ($is_utf8 === null) {
@ -476,14 +476,14 @@ function serendipity_db_schema_import($query) {

        case "postgresql":
            static $search  = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}',
-                '{FULLTEXT}', '{FULLTEXT_MYSQL}', '{BOOLEAN}', 'int(1)', 'int(10)', 'int(11)', 'int(4)', '{UTF_8}');
+                '{FULLTEXT}', '{FULLTEXT_MYSQL}', '{BOOLEAN}', 'int(1)', 'int(10)', 'int(11)', 'int(4)', '{UTF_8}', '{TEXT}');
            static $replace = array('SERIAL', 'primary key', '', 
-                '', '', 'BOOLEAN NOT NULL', 'int2', 'int4', 'int4', 'int4', '');
+                '', '', 'BOOLEAN NOT NULL', 'int2', 'int4', 'int4', 'int4', '', 'text');
            break;
    
        case "sqlite":
-            static $search  = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}', '{FULLTEXT}', '{FULLTEXT_MYSQL}', '{BOOLEAN}', '{UTF_8}');
-            static $replace = array('INTEGER', 'PRIMARY KEY', '', '', '', 'BOOLEAN NOT NULL', '');
+            static $search  = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}', '{FULLTEXT}', '{FULLTEXT_MYSQL}', '{BOOLEAN}', '{UTF_8}', '{TEXT}');
+            static $replace = array('INTEGER', 'PRIMARY KEY', '', '', '', 'BOOLEAN NOT NULL', '', 'LONGTEXT');
            break;

        default:
--- a/sql/db.sql
+++ b/sql/db.sql
@ -73,7 +73,7 @@ create table {PREFIX}comments (
  email varchar(200) default null,
  url varchar(200) default null,
  ip varchar(64) default null,
-  body text,
+  body {TEXT},
  type varchar(100) default 'regular',
  subscribed {BOOLEAN},
  status varchar(50) not null,
@ -93,10 +93,10 @@ create table {PREFIX}entries (
  id {AUTOINCREMENT} {PRIMARY},
  title varchar(200) default null,
  timestamp int(10) {UNSIGNED} default null,
-  body text,
+  body {TEXT},
  comments int(4) {UNSIGNED} default '0',
  trackbacks int(4) {UNSIGNED} default '0',
-  extended text,
+  extended {TEXT},
  exflag int(1) default null,
  author varchar(20) default null,
  authorid int(11) default null,