diff -urpN drupal-6.x-dev-200707241101/includes/cache.inc drupal-6.x-dev-clob-1.3/includes/cache.inc --- drupal-6.x-dev-200707241101/includes/cache.inc 2007-05-26 05:01:30.000000000 +0800 +++ drupal-6.x-dev-clob-1.3/includes/cache.inc 2007-07-24 11:02:24.000000000 +0800 @@ -105,10 +105,11 @@ function cache_set($cid, $data, $table = $serialized = 1; } $created = time(); - db_query("UPDATE {". $table ."} SET data = %b, created = %d, expire = %d, headers = '%s', serialized = %d WHERE cid = '%s'", $data, $created, $expire, $headers, $serialized, $cid); + db_query("UPDATE {". $table ."} SET data = %b, created = %d, expire = %d, headers = '%s', serialized = %d WHERE cid = '%s'", NULL, $created, $expire, $headers, $serialized, $cid); if (!db_affected_rows()) { - @db_query("INSERT INTO {". $table ."} (cid, data, created, expire, headers, serialized) VALUES ('%s', %b, %d, %d, '%s', %d)", $cid, $data, $created, $expire, $headers, $serialized); + @db_query("INSERT INTO {". $table ."} (cid, data, created, expire, headers, serialized) VALUES ('%s', %b, %d, %d, '%s', %d)", $cid, NULL, $created, $expire, $headers, $serialized); } + db_update_blob("cid = '%s'", $cid, db_prefix_tables('{' . $table . '}'), 'data', $data); } /** diff -urpN drupal-6.x-dev-200707241101/includes/database.inc drupal-6.x-dev-clob-1.3/includes/database.inc --- drupal-6.x-dev-200707241101/includes/database.inc 2007-07-12 17:21:30.000000000 +0800 +++ drupal-6.x-dev-clob-1.3/includes/database.inc 2007-07-24 20:37:10.000000000 +0800 @@ -175,15 +175,17 @@ function _db_query_callback($match, $ini return '%'; case '%f': return (float) array_shift($args); - case '%b': // binary data - return db_encode_blob(array_shift($args)); + case '%b': // Binary Large OBject. + return db_encode_blob(array_shift($args)); + case '%c': // Character Large OBject. + return db_encode_clob(array_shift($args)); } } /** * Indicates the place holders that should be replaced in _db_query_callback(). */ -define('DB_QUERY_REGEXP', '/(%d|%s|%%|%f|%b)/'); +define('DB_QUERY_REGEXP', '/(%d|%s|%%|%f|%b|%c)/'); /** * Helper function for db_rewrite_sql. diff -urpN drupal-6.x-dev-200707241101/includes/database.mysql-common.inc drupal-6.x-dev-clob-1.3/includes/database.mysql-common.inc --- drupal-6.x-dev-200707241101/includes/database.mysql-common.inc 2007-06-27 04:24:19.000000000 +0800 +++ drupal-6.x-dev-clob-1.3/includes/database.mysql-common.inc 2007-07-24 23:36:04.000000000 +0800 @@ -27,7 +27,11 @@ * you may also pass a single array containing the query arguments. * * Valid %-modifiers are: %s, %d, %f, %b (binary data, do not enclose - * in '') and %%. + * in ''), %c (character large object, do not enclose in '') and %%. + * + * NOTE: use NULL as arguments substitution for %b and %c. This will be + * replaced as corresponding empty LOB value placeholder, based on the + * database specific representation. * * NOTE: using this syntax will cast NULL and FALSE values to decimal 0, * and TRUE values to decimal 1. @@ -217,6 +221,9 @@ function db_type_map() { 'blob:big' => 'LONGBLOB', 'blob:normal' => 'BLOB', + 'clob:big' => 'LONGTEXT', + 'clob:normal' => 'TEXT', + 'datetime:normal' => 'DATETIME', ); return $map; @@ -462,7 +469,95 @@ function db_last_insert_id($table, $fiel } /** + * Update the Binary Large Object value, based on the database specific + * implementation. + * + * @param $query + * A string containing an update condition query (where clause). + * @param ... + * A variable number of arguments which are substituted into the query + * WHERE condition, using printf() syntax. Instead of a variable number + * of query arguments, you may also pass a single array containing the + * query arguments. + * + * Valid %-modifiers are: %s, %d, %f, %b (binary data, do not enclose + * in ''), %c (character large object, do not enclose in '') and %%. + * + * NOTE: using this syntax will cast NULL and FALSE values to decimal 0, + * and TRUE values to decimal 1. + * + * @param $table + * Table to update. + * @param $column + * Column to update. + * @param $value + * Values to update. + * @return + * A database query result resource, or FALSE if the query was not + * executed correctly. + */ +function db_update_blob($query) { + $args = func_get_args(); + $value = array_pop($args); + $column = array_pop($args); + $table = array_pop($args); + array_shift($args); + + if (isset($args[0]) and is_array($args[0])) { // 'All arguments in one array' syntax + $args = $args[0]; + } + _db_query_callback($args, TRUE); + $query = preg_replace_callback(DB_QUERY_REGEXP, '_db_query_callback', $query); + $query = 'UPDATE ' . $table . ' SET ' . $column . ' = ' . db_encode_blob($value) . ' WHERE ' . $query; + return _db_query($query); +} + +/** + * Update the Character Large Object value, based on the database specific + * implementation. + * + * @param $query + * A string containing an update condition query (where clause). + * @param ... + * A variable number of arguments which are substituted into the query + * WHERE condition, using printf() syntax. Instead of a variable number + * of query arguments, you may also pass a single array containing the + * query arguments. + * + * Valid %-modifiers are: %s, %d, %f, %b (binary data, do not enclose + * in ''), %c (character large object, do not enclose in '') and %%. + * + * NOTE: using this syntax will cast NULL and FALSE values to decimal 0, + * and TRUE values to decimal 1. + * + * @param $table + * Table to update. + * @param $column + * Column to update. + * @param $value + * Values to update. + * @return + * A database query result resource, or FALSE if the query was not + * executed correctly. + */ +function db_update_clob($query) { + $args = func_get_args(); + $value = array_pop($args); + $column = array_pop($args); + $table = array_pop($args); + array_shift($args); + + if (isset($args[0]) and is_array($args[0])) { // 'All arguments in one array' syntax + $args = $args[0]; + } + _db_query_callback($args, TRUE); + $query = preg_replace_callback(DB_QUERY_REGEXP, '_db_query_callback', $query); + $query = 'UPDATE ' . $table . ' SET ' . $column . ' = ' . db_encode_clob($value) . ' WHERE ' . $query; + return _db_query($query); +} + +/** * @} End of "ingroup schemaapi". */ -?> \ No newline at end of file +?> diff -urpN drupal-6.x-dev-200707241101/includes/database.mysqli.inc drupal-6.x-dev-clob-1.3/includes/database.mysqli.inc --- drupal-6.x-dev-200707241101/includes/database.mysqli.inc 2007-07-23 16:05:14.000000000 +0800 +++ drupal-6.x-dev-clob-1.3/includes/database.mysqli.inc 2007-07-24 23:22:22.000000000 +0800 @@ -255,7 +255,11 @@ function db_affected_rows() { * using printf() syntax. The query arguments can be enclosed in one * array instead. * Valid %-modifiers are: %s, %d, %f, %b (binary data, do not enclose - * in '') and %%. + * in ''), %c (character large object, do not enclose in '') and %%. + * + * NOTE: use NULL as arguments substitution for %b and %c. This will be + * replaced as corresponding empty LOB value placeholder, based on the + * database specific representation. * * NOTE: using this syntax will cast NULL and FALSE values to decimal 0, * and TRUE values to decimal 1. @@ -305,7 +309,11 @@ function db_query_range($query) { * using printf() syntax. The query arguments can be enclosed in one * array instead. * Valid %-modifiers are: %s, %d, %f, %b (binary data, do not enclose - * in '') and %%. + * in ''), %c (character large object, do not enclose in '') and %%. + * + * NOTE: use NULL as arguments substitution for %b and %c. This will be + * replaced as corresponding empty LOB value placeholder, based on the + * database specific representation. * * NOTE: using this syntax will cast NULL and FALSE values to decimal 0, * and TRUE values to decimal 1. @@ -337,11 +345,11 @@ function db_query_temporary($query) { * @param $data * Data to encode. * @return - * Encoded data. + * Encoded data, or empty LOB value placeholder for NULL $data. */ function db_encode_blob($data) { global $active_db; - return "'". mysqli_real_escape_string($active_db, $data) ."'"; + return !is_null($data) ? "'". mysqli_real_escape_string($active_db, $data) ."'" : "''"; } /** @@ -357,6 +365,31 @@ function db_decode_blob($data) { } /** + * Returns a properly formatted Character Large OBject value. + * + * @param $data + * Data to encode. + * @return + * Encoded data, or empty LOB value placeholder for NULL $data. + */ +function db_encode_clob($data) { + global $active_db; + return !is_null($data) ? "'". mysqli_real_escape_string($active_db, $data) ."'" : "''"; +} + +/** + * Returns text from a Character Large OBject value. + * + * @param $data + * Data to decode. + * @return + * Decoded data. + */ +function db_decode_clob($data) { + return $data; +} + +/** * Prepare user input for use in a database query, preventing SQL injection attacks. */ function db_escape_string($text) { diff -urpN drupal-6.x-dev-200707241101/includes/database.mysql.inc drupal-6.x-dev-clob-1.3/includes/database.mysql.inc --- drupal-6.x-dev-200707241101/includes/database.mysql.inc 2007-07-23 16:05:14.000000000 +0800 +++ drupal-6.x-dev-clob-1.3/includes/database.mysql.inc 2007-07-24 23:21:50.000000000 +0800 @@ -255,7 +255,11 @@ function db_affected_rows() { * using printf() syntax. The query arguments can be enclosed in one * array instead. * Valid %-modifiers are: %s, %d, %f, %b (binary data, do not enclose - * in '') and %%. + * in ''), %c (character large object, do not enclose in '') and %%. + * + * NOTE: use NULL as arguments substitution for %b and %c. This will be + * replaced as corresponding empty LOB value placeholder, based on the + * database specific representation. * * NOTE: using this syntax will cast NULL and FALSE values to decimal 0, * and TRUE values to decimal 1. @@ -305,7 +309,11 @@ function db_query_range($query) { * using printf() syntax. The query arguments can be enclosed in one * array instead. * Valid %-modifiers are: %s, %d, %f, %b (binary data, do not enclose - * in '') and %%. + * in ''), %c (character large object, do not enclose in '') and %%. + * + * NOTE: use NULL as arguments substitution for %b and %c. This will be + * replaced as corresponding empty LOB value placeholder, based on the + * database specific representation. * * NOTE: using this syntax will cast NULL and FALSE values to decimal 0, * and TRUE values to decimal 1. @@ -337,11 +345,11 @@ function db_query_temporary($query) { * @param $data * Data to encode. * @return - * Encoded data. + * Encoded data, or empty LOB value placeholder for NULL $data. */ function db_encode_blob($data) { global $active_db; - return "'". mysql_real_escape_string($data, $active_db) ."'"; + return !is_null($data) ? "'". mysql_real_escape_string($data, $active_db) ."'" : "''"; } /** @@ -357,6 +365,31 @@ function db_decode_blob($data) { } /** + * Returns a properly formatted Character Large OBject value. + * + * @param $data + * Data to encode. + * @return + * Encoded data, or empty LOB value placeholder for NULL $data. + */ +function db_encode_clob($data) { + global $active_db; + return !is_null($data) ? "'". mysql_real_escape_string($data, $active_db) ."'" : "''"; +} + +/** + * Returns text from a Character Large Object value. + * + * @param $data + * Data to decode. + * @return + * Decoded data. + */ +function db_decode_clob($data) { + return $data; +} + +/** * Prepare user input for use in a database query, preventing SQL injection attacks. */ function db_escape_string($text) { diff -urpN drupal-6.x-dev-200707241101/includes/database.pgsql.inc drupal-6.x-dev-clob-1.3/includes/database.pgsql.inc --- drupal-6.x-dev-200707241101/includes/database.pgsql.inc 2007-07-23 16:05:14.000000000 +0800 +++ drupal-6.x-dev-clob-1.3/includes/database.pgsql.inc 2007-07-24 23:36:36.000000000 +0800 @@ -120,7 +120,11 @@ function db_connect($url) { * you may also pass a single array containing the query arguments. * * Valid %-modifiers are: %s, %d, %f, %b (binary data, do not enclose - * in '') and %%. + * in ''), %c (character large object, do not enclose in '') and %%. + * + * NOTE: use NULL as arguments substitution for %b and %c. This will be + * replaced as corresponding empty LOB value placeholder, based on the + * database specific representation. * * NOTE: using this syntax will cast NULL and FALSE values to decimal 0, * and TRUE values to decimal 1. @@ -287,7 +291,11 @@ function db_affected_rows() { * using printf() syntax. Instead of a variable number of query arguments, * you may also pass a single array containing the query arguments. * Valid %-modifiers are: %s, %d, %f, %b (binary data, do not enclose - * in '') and %%. + * in ''), %c (character large object, do not enclose in '') and %%. + * + * NOTE: use NULL as arguments substitution for %b and %c. This will be + * replaced as corresponding empty LOB value placeholder, based on the + * database specific representation. * * NOTE: using this syntax will cast NULL and FALSE values to decimal 0, * and TRUE values to decimal 1. @@ -337,7 +345,11 @@ function db_query_range($query) { * using printf() syntax. The query arguments can be enclosed in one * array instead. * Valid %-modifiers are: %s, %d, %f, %b (binary data, do not enclose - * in '') and %%. + * in ''), %c (character large object, do not enclose in '') and %%. + * + * NOTE: use NULL as arguments substitution for %b and %c. This will be + * replaced as corresponding empty LOB value placeholder, based on the + * database specific representation. * * NOTE: using this syntax will cast NULL and FALSE values to decimal 0, * and TRUE values to decimal 1. @@ -365,15 +377,15 @@ function db_query_temporary($query) { /** * Returns a properly formatted Binary Large OBject value. - * In case of PostgreSQL encodes data for insert into bytea field. + * In case of PostgreSQL encodes data for insert or update into bytea field. * * @param $data * Data to encode. * @return - * Encoded data. + * Encoded data, or empty LOB value placeholder for NULL $data. */ function db_encode_blob($data) { - return "'". pg_escape_bytea($data) ."'"; + return !is_null($data) ? "'". pg_escape_bytea($data) ."'" : "''"; } /** @@ -390,6 +402,33 @@ function db_decode_blob($data) { } /** + * Returns a properly formatted Character Large OBject value. + * In case of PostgreSQL encodes data for insert or update into text field. + * + * @param $data + * Data to encode. + * @return + * Encoded data, or empty LOB value placeholder for NULL $data. + */ +function db_encode_clob($data) { + return !is_null($data) ? "'". pg_escape_string($data) ."'" : "''"; + +} + +/** + * Returns text from a Character Large OBject value. + * In case of PostgreSQL decodes data after select from bytea field. + * + * @param $data + * Data to decode. + * @return + * Decoded data. + */ +function db_decode_clob($data) { + return $data; +} + +/** * Prepare user input for use in a database query, preventing SQL injection attacks. * Note: This function requires PostgreSQL 7.2 or later. */ @@ -398,6 +437,94 @@ function db_escape_string($text) { } /** + * Update the Binary Large Object value, based on the database specific + * implementation. + * + * @param $query + * A string containing an update condition query (where clause). + * @param ... + * A variable number of arguments which are substituted into the query + * WHERE condition, using printf() syntax. Instead of a variable number + * of query arguments, you may also pass a single array containing the + * query arguments. + * + * Valid %-modifiers are: %s, %d, %f, %b (binary data, do not enclose + * in ''), %c (character large object, do not enclose in '') and %%. + * + * NOTE: using this syntax will cast NULL and FALSE values to decimal 0, + * and TRUE values to decimal 1. + * + * @param $table + * Table to update. + * @param $column + * Column to update. + * @param $value + * Values to update. + * @return + * A database query result resource, or FALSE if the query was not + * executed correctly. + */ +function db_update_blob($query) { + $args = func_get_args(); + $value = array_pop($args); + $column = array_pop($args); + $table = array_pop($args); + array_shift($args); + + if (isset($args[0]) and is_array($args[0])) { // 'All arguments in one array' syntax + $args = $args[0]; + } + _db_query_callback($args, TRUE); + $query = preg_replace_callback(DB_QUERY_REGEXP, '_db_query_callback', $query); + $query = 'UPDATE ' . $table . ' SET ' . $column . ' = ' . db_encode_blob($value) . ' WHERE ' . $query; + return _db_query($query); +} + +/** + * Update the Character Large Object value, based on the database specific + * implementation. + * + * @param $query + * A string containing an update condition query (where clause). + * @param ... + * A variable number of arguments which are substituted into the query + * WHERE condition, using printf() syntax. Instead of a variable number + * of query arguments, you may also pass a single array containing the + * query arguments. + * + * Valid %-modifiers are: %s, %d, %f, %b (binary data, do not enclose + * in ''), %c (character large object, do not enclose in '') and %%. + * + * NOTE: using this syntax will cast NULL and FALSE values to decimal 0, + * and TRUE values to decimal 1. + * + * @param $table + * Table to update. + * @param $column + * Column to update. + * @param $value + * Values to update. + * @return + * A database query result resource, or FALSE if the query was not + * executed correctly. + */ +function db_update_clob($query) { + $args = func_get_args(); + $value = array_pop($args); + $column = array_pop($args); + $table = array_pop($args); + array_shift($args); + + if (isset($args[0]) and is_array($args[0])) { // 'All arguments in one array' syntax + $args = $args[0]; + } + _db_query_callback($args, TRUE); + $query = preg_replace_callback(DB_QUERY_REGEXP, '_db_query_callback', $query); + $query = 'UPDATE ' . $table . ' SET ' . $column . ' = ' . db_encode_clob($value) . ' WHERE ' . $query; + return _db_query($query); +} + +/** * Lock a table. * This function automatically starts a transaction. */ @@ -501,6 +628,9 @@ function db_type_map() { 'blob:big' => 'bytea', 'blob:normal' => 'bytea', + 'clob:big' => 'text', + 'clob:normal' => 'text', + 'datetime:normal' => 'timestamp', 'serial:tiny' => 'serial', diff -urpN drupal-6.x-dev-200707241101/modules/aggregator/aggregator.module drupal-6.x-dev-clob-1.3/modules/aggregator/aggregator.module --- drupal-6.x-dev-200707241101/modules/aggregator/aggregator.module 2007-07-16 20:43:04.000000000 +0800 +++ drupal-6.x-dev-clob-1.3/modules/aggregator/aggregator.module 2007-07-24 11:02:24.000000000 +0800 @@ -977,15 +977,17 @@ function aggregator_parse_feed(&$data, $ function aggregator_save_item($edit) { if ($edit['iid'] && $edit['title']) { - db_query("UPDATE {aggregator_item} SET title = '%s', link = '%s', author = '%s', description = '%s', guid = '%s', timestamp = %d WHERE iid = %d", $edit['title'], $edit['link'], $edit['author'], $edit['description'], $edit['guid'], $edit['timestamp'], $edit['iid']); + db_query("UPDATE {aggregator_item} SET title = '%s', link = '%s', author = '%s', description = %c, guid = '%s', timestamp = %d WHERE iid = %d", $edit['title'], $edit['link'], $edit['author'], NULL, $edit['guid'], $edit['timestamp'], $edit['iid']); + db_update_clob('iid = %d', $edit['iid'], db_prefix_tables('{aggregator_item}'), 'description', $edit['description']); } else if ($edit['iid']) { db_query('DELETE FROM {aggregator_item} WHERE iid = %d', $edit['iid']); db_query('DELETE FROM {aggregator_category_item} WHERE iid = %d', $edit['iid']); } else if ($edit['title'] && $edit['link']) { - db_query("INSERT INTO {aggregator_item} (fid, title, link, author, description, timestamp, guid) VALUES (%d, '%s', '%s', '%s', '%s', %d, '%s')", $edit['fid'], $edit['title'], $edit['link'], $edit['author'], $edit['description'], $edit['timestamp'], $edit['guid']); + db_query("INSERT INTO {aggregator_item} (fid, title, link, author, description, timestamp, guid) VALUES (%d, '%s', '%s', '%s', %c, %d, '%s')", $edit['fid'], $edit['title'], $edit['link'], $edit['author'], NULL, $edit['timestamp'], $edit['guid']); $edit['iid'] = db_last_insert_id('aggregator_item', 'iid'); + db_update_clob('iid = %d', $edit['iid'], db_prefix_tables('{aggregator_item}'), 'description', $edit['description']); // file the items in the categories indicated by the feed $categories = db_query('SELECT cid FROM {aggregator_category_feed} WHERE fid = %d', $edit['fid']); while ($category = db_fetch_object($categories)) { @@ -1232,6 +1234,7 @@ function aggregator_page_rss() { } while ($item = db_fetch_object($result)) { + $item->description = db_decode_clob($item->description); switch (variable_get('feed_item_length', 'teaser')) { case 'teaser': $teaser = node_teaser($item->description); @@ -1407,7 +1410,7 @@ function theme_aggregator_page_item($ite $output .= "
$source $source_date
\n"; if ($item->description) { - $output .= '
'. aggregator_filter_xss($item->description) ."
\n"; + $output .= '
'. aggregator_filter_xss(db_decode_clob($item->description)) ."
\n"; } $result = db_query('SELECT c.title, c.cid FROM {aggregator_category_item} ci LEFT JOIN {aggregator_category} c ON ci.cid = c.cid WHERE ci.iid = %d ORDER BY c.title', $item->iid); diff -urpN drupal-6.x-dev-200707241101/modules/aggregator/aggregator.schema drupal-6.x-dev-clob-1.3/modules/aggregator/aggregator.schema --- drupal-6.x-dev-200707241101/modules/aggregator/aggregator.schema 2007-07-15 18:09:21.000000000 +0800 +++ drupal-6.x-dev-clob-1.3/modules/aggregator/aggregator.schema 2007-07-24 11:02:24.000000000 +0800 @@ -57,7 +57,7 @@ function aggregator_schema() { 'title' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''), 'link' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''), 'author' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''), - 'description' => array('type' => 'text', 'not null' => TRUE, 'size' => 'big'), + 'description' => array('type' => 'clob', 'not null' => TRUE, 'size' => 'big'), 'timestamp' => array('type' => 'int', 'not null' => FALSE), 'guid' => array('type' => 'varchar', 'length' => 255, 'not null' => FALSE) ), diff -urpN drupal-6.x-dev-200707241101/modules/block/block.admin.inc drupal-6.x-dev-clob-1.3/modules/block/block.admin.inc --- drupal-6.x-dev-200707241101/modules/block/block.admin.inc 2007-07-22 14:48:25.000000000 +0800 +++ drupal-6.x-dev-clob-1.3/modules/block/block.admin.inc 2007-07-24 11:02:24.000000000 +0800 @@ -257,8 +257,9 @@ function block_add_block_form_validate($ * Save the new custom block. */ function block_add_block_form_submit($form, &$form_state) { - db_query("INSERT INTO {boxes} (body, info, format) VALUES ('%s', '%s', %d)", $form_state['values']['body'], $form_state['values']['info'], $form_state['values']['format']); + db_query("INSERT INTO {boxes} (body, info, format) VALUES (%c, '%s', %d)", NULL, $form_state['values']['info'], $form_state['values']['format']); $delta = db_last_insert_id('boxes', 'bid'); + db_update_clob('bid = %d', $delta, db_prefix_tables('{boxes}'), 'body', $form_state['values']['body']); foreach (list_themes() as $key => $theme) { if ($theme->status) { diff -urpN drupal-6.x-dev-200707241101/modules/block/block.module drupal-6.x-dev-clob-1.3/modules/block/block.module --- drupal-6.x-dev-200707241101/modules/block/block.module 2007-07-18 22:08:08.000000000 +0800 +++ drupal-6.x-dev-clob-1.3/modules/block/block.module 2007-07-24 11:02:24.000000000 +0800 @@ -147,7 +147,7 @@ function block_block($op = 'list', $delt case 'view': $block = db_fetch_object(db_query('SELECT body, format FROM {boxes} WHERE bid = %d', $delta)); - $data['content'] = check_markup($block->body, $block->format, FALSE); + $data['content'] = check_markup(db_decode_clob($block->body), $block->format, FALSE); return $data; } } @@ -262,7 +262,8 @@ function block_box_save($edit, $delta) { $edit['format'] = FILTER_FORMAT_DEFAULT; } - db_query("UPDATE {boxes} SET body = '%s', info = '%s', format = %d WHERE bid = %d", $edit['body'], $edit['info'], $edit['format'], $delta); + db_query("UPDATE {boxes} SET body = %c, info = '%s', format = %d WHERE bid = %d", NULL, $edit['info'], $edit['format'], $delta); + db_update_clob('bid = %d', $delta, db_prefix_tables('{boxes}'), 'body', $edit['body']); return TRUE; } diff -urpN drupal-6.x-dev-200707241101/modules/block/block.schema drupal-6.x-dev-clob-1.3/modules/block/block.schema --- drupal-6.x-dev-200707241101/modules/block/block.schema 2007-05-25 20:46:43.000000000 +0800 +++ drupal-6.x-dev-clob-1.3/modules/block/block.schema 2007-07-24 11:02:24.000000000 +0800 @@ -36,7 +36,7 @@ function block_schema() { $schema['boxes'] = array( 'fields' => array( 'bid' => array('type' => 'serial', 'not null' => TRUE), - 'body' => array('type' => 'text', 'not null' => FALSE, 'size' => 'big'), + 'body' => array('type' => 'clob', 'not null' => FALSE, 'size' => 'big'), 'info' => array('type' => 'varchar', 'length' => 128, 'not null' => TRUE, 'default' => ''), 'format' => array('type' => 'int', 'size' => 'small', 'not null' => TRUE, 'default' => 0) ), diff -urpN drupal-6.x-dev-200707241101/modules/comment/comment.module drupal-6.x-dev-clob-1.3/modules/comment/comment.module --- drupal-6.x-dev-200707241101/modules/comment/comment.module 2007-07-20 16:51:13.000000000 +0800 +++ drupal-6.x-dev-clob-1.3/modules/comment/comment.module 2007-07-24 11:02:24.000000000 +0800 @@ -474,7 +474,7 @@ function comment_nodeapi(&$node, $op, $a $text = ''; $comments = db_query('SELECT subject, comment, format FROM {comments} WHERE nid = %d AND status = %d', $node->nid, COMMENT_PUBLISHED); while ($comment = db_fetch_object($comments)) { - $text .= '

'. check_plain($comment->subject) .'

'. check_markup($comment->comment, $comment->format, FALSE); + $text .= '

'. check_plain($comment->subject) .'

'. check_markup(db_decode_clob($comment->comment), $comment->format, FALSE); } return $text; @@ -731,7 +731,8 @@ function comment_save($edit) { if (!form_get_errors()) { if ($edit['cid']) { // Update the comment in the database. - db_query("UPDATE {comments} SET status = %d, timestamp = %d, subject = '%s', comment = '%s', format = %d, uid = %d, name = '%s', mail = '%s', homepage = '%s' WHERE cid = %d", $edit['status'], $edit['timestamp'], $edit['subject'], $edit['comment'], $edit['format'], $edit['uid'], $edit['name'], $edit['mail'], $edit['homepage'], $edit['cid']); + db_query("UPDATE {comments} SET status = %d, timestamp = %d, subject = '%s', comment = %c, format = %d, uid = %d, name = '%s', mail = '%s', homepage = '%s' WHERE cid = %d", $edit['status'], $edit['timestamp'], $edit['subject'], NULL, $edit['format'], $edit['uid'], $edit['name'], $edit['mail'], $edit['homepage'], $edit['cid']); + db_update_clob('cid = %d', $edit['cid'], db_prefix_tables('{comments}'), 'comment', $edit['comment']); _comment_update_node_statistics($edit['nid']); @@ -804,8 +805,9 @@ function comment_save($edit) { } $edit += array('mail' => '', 'homepage' => ''); - db_query("INSERT INTO {comments} (nid, pid, uid, subject, comment, format, hostname, timestamp, status, score, users, thread, name, mail, homepage) VALUES (%d, %d, %d, '%s', '%s', %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s')", $edit['nid'], $edit['pid'], $edit['uid'], $edit['subject'], $edit['comment'], $edit['format'], ip_address(), $edit['timestamp'], $status, $score, $users, $thread, $edit['name'], $edit['mail'], $edit['homepage']); + db_query("INSERT INTO {comments} (nid, pid, uid, subject, comment, format, hostname, timestamp, status, score, users, thread, name, mail, homepage) VALUES (%d, %d, %d, '%s', %c, %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s')", $edit['nid'], $edit['pid'], $edit['uid'], $edit['subject'], NULL, $edit['format'], ip_address(), $edit['timestamp'], $status, $score, $users, $thread, $edit['name'], $edit['mail'], $edit['homepage']); $edit['cid'] = db_last_insert_id('comments', 'cid'); + db_update_clob('cid = %d', $edit['cid'], db_prefix_tables('{comments}'), 'comment', $edit['comment']); _comment_update_node_statistics($edit['nid']); @@ -1204,7 +1206,7 @@ function comment_admin_overview($type = while ($comment = db_fetch_object($result)) { $comments[$comment->cid] = ''; $comment->name = $comment->uid ? $comment->registered_name : $comment->name; - $form['subject'][$comment->cid] = array('#value' => l($comment->subject, 'node/'. $comment->nid, array('title' => truncate_utf8($comment->comment, 128), 'fragment' => 'comment-'. $comment->cid))); + $form['subject'][$comment->cid] = array('#value' => l($comment->subject, 'node/'. $comment->nid, array('title' => truncate_utf8(db_decode_clob($comment->comment), 128), 'fragment' => 'comment-'. $comment->cid))); $form['username'][$comment->cid] = array('#value' => theme('username', $comment)); $form['timestamp'][$comment->cid] = array('#value' => format_date($comment->timestamp, 'small')); $form['operations'][$comment->cid] = array('#value' => l(t('edit'), 'comment/edit/'. $comment->cid, array('query' => $destination))); @@ -1734,7 +1736,7 @@ function theme_comment_view($comment, $n // Switch to folded/unfolded view of the comment if ($visible) { - $comment->comment = check_markup($comment->comment, $comment->format, FALSE); + $comment->comment = check_markup(db_decode_clob($comment->comment), $comment->format, FALSE); // Comment API hook comment_invoke_comment($comment, 'view'); @@ -2186,7 +2188,7 @@ function comment_unpublish_by_keyword_ac */ function comment_unpublish_by_keyword_action($comment, $context) { foreach ($context['keywords'] as $keyword) { - if (strstr($comment->comment, $keyword) || strstr($comment->subject, $keyword)) { + if (strstr(db_decode_clob($comment->comment), $keyword) || strstr($comment->subject, $keyword)) { db_query('UPDATE {comments} SET status = %d WHERE cid = %d', COMMENT_NOT_PUBLISHED, $comment->cid); watchdog('action', 'Unpublished comment %subject.', array('%subject' => $comment->subject)); break; diff -urpN drupal-6.x-dev-200707241101/modules/comment/comment.schema drupal-6.x-dev-clob-1.3/modules/comment/comment.schema --- drupal-6.x-dev-200707241101/modules/comment/comment.schema 2007-07-15 18:09:21.000000000 +0800 +++ drupal-6.x-dev-clob-1.3/modules/comment/comment.schema 2007-07-24 11:02:24.000000000 +0800 @@ -9,7 +9,7 @@ function comment_schema() { 'nid' => array('type' => 'int', 'not null' => TRUE, 'default' => 0), 'uid' => array('type' => 'int', 'not null' => TRUE, 'default' => 0), 'subject' => array('type' => 'varchar', 'length' => 64, 'not null' => TRUE, 'default' => ''), - 'comment' => array('type' => 'text', 'not null' => TRUE, 'size' => 'big'), + 'comment' => array('type' => 'clob', 'not null' => TRUE, 'size' => 'big'), 'hostname' => array('type' => 'varchar', 'length' => 128, 'not null' => TRUE, 'default' => ''), 'timestamp' => array('type' => 'int', 'not null' => TRUE, 'default' => 0), 'score' => array('type' => 'int', 'not null' => TRUE, 'default' => 0, 'size' => 'medium'), diff -urpN drupal-6.x-dev-200707241101/modules/contact/contact.admin.inc drupal-6.x-dev-clob-1.3/modules/contact/contact.admin.inc --- drupal-6.x-dev-200707241101/modules/contact/contact.admin.inc 2007-07-16 20:43:05.000000000 +0800 +++ drupal-6.x-dev-clob-1.3/modules/contact/contact.admin.inc 2007-07-24 11:02:24.000000000 +0800 @@ -110,13 +110,16 @@ function contact_admin_edit_submit($form } $form_state['values']['recipients'] = implode(',', $recipients); if (empty($form_state['values']['cid']) || $form_state['values']['contact_op'] == 'add') { - db_query("INSERT INTO {contact} (category, recipients, reply, weight, selected) VALUES ('%s', '%s', '%s', %d, %d)", $form_state['values']['category'], $form_state['values']['recipients'], $form_state['values']['reply'], $form_state['values']['weight'], $form_state['values']['selected']); + db_query("INSERT INTO {contact} (category, recipients, reply, weight, selected) VALUES ('%s', '%s', %c, %d, %d)", $form_state['values']['category'], $form_state['values']['recipients'], NULL, $form_state['values']['weight'], $form_state['values']['selected']); + $cid = db_last_insert_id('contact', 'cid'); + db_update_clob('cid = %d', $cid, db_prefix_tables('{contact}'), 'reply', $form_state['values']['reply']); drupal_set_message(t('Category %category has been added.', array('%category' => $form_state['values']['category']))); watchdog('mail', 'Contact form: category %category added.', array('%category' => $form_state['values']['category']), WATCHDOG_NOTICE, l(t('view'), 'admin/build/contact')); } else { - db_query("UPDATE {contact} SET category = '%s', recipients = '%s', reply = '%s', weight = %d, selected = %d WHERE cid = %d", $form_state['values']['category'], $form_state['values']['recipients'], $form_state['values']['reply'], $form_state['values']['weight'], $form_state['values']['selected'], $form_state['values']['cid']); + db_query("UPDATE {contact} SET category = '%s', recipients = '%s', reply = %c, weight = %d, selected = %d WHERE cid = %d", $form_state['values']['category'], $form_state['values']['recipients'], NULL, $form_state['values']['weight'], $form_state['values']['selected'], $form_state['values']['cid']); + db_update_clob('cid = %d', $form_state['values']['cid'], db_prefix_tables('{contact}'), 'reply', $form_state['values']['reply']); drupal_set_message(t('Category %category has been updated.', array('%category' => $form_state['values']['category']))); watchdog('mail', 'Contact form: category %category updated.', array('%category' => $form_state['values']['category']), WATCHDOG_NOTICE, l(t('view'), 'admin/build/contact')); } diff -urpN drupal-6.x-dev-200707241101/modules/contact/contact.module drupal-6.x-dev-clob-1.3/modules/contact/contact.module --- drupal-6.x-dev-200707241101/modules/contact/contact.module 2007-07-16 14:37:49.000000000 +0800 +++ drupal-6.x-dev-clob-1.3/modules/contact/contact.module 2007-07-24 11:02:24.000000000 +0800 @@ -171,7 +171,7 @@ function contact_mail($key, &$message, $ case 'page_autoreply': $contact = $params['contact']; $message['subject'] .= t('[!category] !subject', array('!category' => $contact['category'], '!subject' => $params['subject']), $language->language); - $message['body'][] = $contact['reply']; + $message['body'][] = db_decode_clob($contact['reply']); break; case 'user_mail': case 'user_copy': diff -urpN drupal-6.x-dev-200707241101/modules/contact/contact.pages.inc drupal-6.x-dev-clob-1.3/modules/contact/contact.pages.inc --- drupal-6.x-dev-200707241101/modules/contact/contact.pages.inc 2007-07-16 14:37:49.000000000 +0800 +++ drupal-6.x-dev-clob-1.3/modules/contact/contact.pages.inc 2007-07-24 11:02:24.000000000 +0800 @@ -132,7 +132,7 @@ function contact_mail_page_submit($form, } // Send an auto-reply if necessary using the current language. - if ($contact['reply']) { + if (db_decode_clob($contact['reply'])) { drupal_mail('contact', 'page_autoreply', $from, $language, $values, $contact['recipients']); } diff -urpN drupal-6.x-dev-200707241101/modules/contact/contact.schema drupal-6.x-dev-clob-1.3/modules/contact/contact.schema --- drupal-6.x-dev-200707241101/modules/contact/contact.schema 2007-07-15 18:09:21.000000000 +0800 +++ drupal-6.x-dev-clob-1.3/modules/contact/contact.schema 2007-07-24 11:02:24.000000000 +0800 @@ -7,7 +7,7 @@ function contact_schema() { 'cid' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE), 'category' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''), 'recipients' => array('type' => 'text', 'not null' => TRUE, 'size' => 'big'), - 'reply' => array('type' => 'text', 'not null' => TRUE, 'size' => 'big'), + 'reply' => array('type' => 'clob', 'not null' => TRUE, 'size' => 'big'), 'weight' => array('type' => 'int', 'not null' => TRUE, 'default' => 0, 'size' => 'tiny'), 'selected' => array('type' => 'int', 'not null' => TRUE, 'default' => 0, 'size' => 'tiny') ), diff -urpN drupal-6.x-dev-200707241101/modules/node/node.module drupal-6.x-dev-clob-1.3/modules/node/node.module --- drupal-6.x-dev-200707241101/modules/node/node.module 2007-07-21 17:55:18.000000000 +0800 +++ drupal-6.x-dev-clob-1.3/modules/node/node.module 2007-07-24 11:02:24.000000000 +0800 @@ -630,6 +630,8 @@ function node_load($param = array(), $re else { $node = db_fetch_object(db_query('SELECT n.nid, n.vid, n.type, n.status, n.language, n.created, n.changed, n.comment, n.promote, n.sticky, n.tnid, n.translate, r.timestamp AS revision_timestamp, r.title, r.body, r.teaser, r.log, r.format, u.uid, u.name, u.picture, u.data FROM {node} n INNER JOIN {users} u ON u.uid = n.uid INNER JOIN {node_revisions} r ON r.vid = n.vid WHERE '. $cond, $arguments)); } + $node->body = db_decode_clob($node->body); + $node->teaser = db_decode_clob($node->teaser); if ($node && $node->nid) { // Call the node specific callback (if any) and piggy-back the @@ -690,12 +692,12 @@ function node_save(&$node) { // Split off revisions data to another structure $revisions_table_values = array('nid' => &$node->nid, - 'title' => $node->title, 'body' => $node->body, - 'teaser' => $node->teaser, 'timestamp' => $node->changed, + 'title' => $node->title, 'body' => NULL, + 'teaser' => NULL, 'timestamp' => $node->changed, 'uid' => $user->uid, 'format' => $node->format); $revisions_table_types = array('nid' => '%d', - 'title' => "'%s'", 'body' => "'%s'", - 'teaser' => "'%s'", 'timestamp' => '%d', + 'title' => "'%s'", 'body' => "%c", + 'teaser' => "%c", 'timestamp' => '%d', 'uid' => '%d', 'format' => '%d'); if (!empty($node->log) || $node->is_new || (isset($node->revision) && $node->revision)) { // Only store the log message if there's something to store; this prevents @@ -724,6 +726,8 @@ function node_save(&$node) { $revisions_query = 'INSERT INTO {node_revisions} ('. implode(', ', array_keys($revisions_table_types)) .') VALUES ('. implode(', ', $revisions_table_types) .')'; db_query($revisions_query, $revisions_table_values); $node->vid = db_last_insert_id('node_revisions', 'vid'); + db_update_clob('vid = %d', $node->vid, db_prefix_tables('{node_revisions}'), 'body', $node->body); + db_update_clob('vid = %d', $node->vid, db_prefix_tables('{node_revisions}'), 'teaser', $node->teaser); $op = 'insert'; } else { @@ -738,6 +742,8 @@ function node_save(&$node) { $revisions_query = 'INSERT INTO {node_revisions} ('. implode(', ', array_keys($revisions_table_types)) .') VALUES ('. implode(', ', $revisions_table_types) .')'; db_query($revisions_query, $revisions_table_values); $node->vid = db_last_insert_id('node_revisions', 'vid'); + db_update_clob('vid = %d', $node->vid, db_prefix_tables('{node_revisions}'), 'body', $node->body); + db_update_clob('vid = %d', $node->vid, db_prefix_tables('{node_revisions}'), 'teaser', $node->teaser); } else { $arr = array(); @@ -747,6 +753,8 @@ function node_save(&$node) { $revisions_table_values[] = $node->vid; $revisions_query = 'UPDATE {node_revisions} SET '. implode(', ', $arr) .' WHERE vid = %d'; db_query($revisions_query, $revisions_table_values); + db_update_clob('vid = %d', $node->vid, db_prefix_tables('{node_revisions}'), 'body', $node->body); + db_update_clob('vid = %d', $node->vid, db_prefix_tables('{node_revisions}'), 'teaser', $node->teaser); $update_node = FALSE; } $op = 'update'; diff -urpN drupal-6.x-dev-200707241101/modules/node/node.schema drupal-6.x-dev-clob-1.3/modules/node/node.schema --- drupal-6.x-dev-200707241101/modules/node/node.schema 2007-07-04 03:42:14.000000000 +0800 +++ drupal-6.x-dev-clob-1.3/modules/node/node.schema 2007-07-24 11:02:24.000000000 +0800 @@ -73,8 +73,8 @@ function node_schema() { 'vid' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE), 'uid' => array('type' => 'int', 'not null' => TRUE, 'default' => 0), 'title' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''), - 'body' => array('type' => 'text', 'not null' => TRUE, 'size' => 'big'), - 'teaser' => array('type' => 'text', 'not null' => TRUE, 'size' => 'big'), + 'body' => array('type' => 'clob', 'not null' => TRUE, 'size' => 'big'), + 'teaser' => array('type' => 'clob', 'not null' => TRUE, 'size' => 'big'), 'log' => array('type' => 'text', 'not null' => TRUE, 'size' => 'big'), 'timestamp' => array('type' => 'int', 'not null' => TRUE, 'default' => 0), 'format' => array('type' => 'int', 'not null' => TRUE, 'default' => 0)