Changeset 4860

Timestamp:

02/02/2007 12:04:35 AM (18 years ago)

Author:

ryan

Message:

First cut at mysql utf-8 charset suport. Props to sehh, drupal, and textpattern. fixes #3517

Location:

trunk

Files:

• wp-admin/upgrade-schema.php (modified) (11 diffs)
• wp-config-sample.php (modified) (1 diff)
• wp-includes/version.php (modified) (1 diff)
• wp-includes/wp-db.php (modified) (3 diffs)

trunk/wp-admin/upgrade-schema.php

@@ -1 +1 @@
 <?php
 // Here we keep the DB structure and option values
+
+$charset_collate = '';
+    
+if ( version_compare(mysql_get_server_info(), '4.1.0', '>=') ) {
+    if ( ! empty($wpdb->charset) )
+        $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
+    if ( ! empty($wpdb->collate) )
+        $charset_collate .= " COLLATE $wpdb->collate";  
+}
 
 $wp_queries="CREATE TABLE $wpdb->categories (
@@ -14 +23 @@
   PRIMARY KEY  (cat_ID),
   KEY category_nicename (category_nicename)
-);
+) $charset_collate;
 CREATE TABLE $wpdb->comments (
   comment_ID bigint(20) unsigned NOT NULL auto_increment,
@@ -34 +43 @@
   KEY comment_approved (comment_approved),
   KEY comment_post_ID (comment_post_ID)
-);
+) $charset_collate;
 CREATE TABLE $wpdb->link2cat (
   rel_id bigint(20) NOT NULL auto_increment,
@@ -41 +50 @@
   PRIMARY KEY  (rel_id),
   KEY link_id (link_id,category_id)
-);
+) $charset_collate;
 CREATE TABLE $wpdb->links (
   link_id bigint(20) NOT NULL auto_increment,
@@ -60 +69 @@
   KEY link_category (link_category),
   KEY link_visible (link_visible)
-);
+) $charset_collate;
 CREATE TABLE $wpdb->options (
   option_id bigint(20) NOT NULL auto_increment,
@@ -75 +84 @@
   PRIMARY KEY  (option_id,blog_id,option_name),
   KEY option_name (option_name)
-);
+) $charset_collate;
 CREATE TABLE $wpdb->post2cat (
   rel_id bigint(20) NOT NULL auto_increment,
@@ -82 +91 @@
   PRIMARY KEY  (rel_id),
   KEY post_id (post_id,category_id)
-);
+) $charset_collate;
 CREATE TABLE $wpdb->postmeta (
   meta_id bigint(20) NOT NULL auto_increment,
@@ -91 +100 @@
   KEY post_id (post_id),
   KEY meta_key (meta_key)
-);
+) $charset_collate;
 CREATE TABLE $wpdb->posts (
   ID bigint(20) unsigned NOT NULL auto_increment,
@@ -120 +129 @@
   KEY post_name (post_name),
   KEY type_status_date (post_type,post_status,post_date,ID)
-);
+) $charset_collate;
 CREATE TABLE $wpdb->users (
   ID bigint(20) unsigned NOT NULL auto_increment,
@@ -134 +143 @@
   PRIMARY KEY  (ID),
   KEY user_login_key (user_login)
-);
+) $charset_collate;
 CREATE TABLE $wpdb->usermeta (
   umeta_id bigint(20) NOT NULL auto_increment,
@@ -143 +152 @@
   KEY user_id (user_id),
   KEY meta_key (meta_key)
-);";
+) $charset_collate;";
 
 function populate_options() {

trunk/wp-config-sample.php

@@ -5 +5 @@
 define('DB_PASSWORD', 'password'); // ...and password
 define('DB_HOST', 'localhost');    // 99% chance you won't need to change this value
+define('DB_CHARSET', 'utf8');
+define('DB_COLLATE', 'utf8_general_ci');
 
 // You can have multiple installations in one database if you give each a unique prefix

trunk/wp-includes/version.php

@@ -4 +4 @@
 
 $wp_version = '2.2-bleeding';
-$wp_db_version = 4859;
+$wp_db_version = 4860;
 
 ?>

trunk/wp-includes/wp-db.php

@@ -36 +36 @@
     var $postmeta;
 
+    var $charset;
+    var $collate;
+
     /**
      * Connects to the database server and selects a database
@@ -49 +52 @@
     function __construct($dbuser, $dbpassword, $dbname, $dbhost) {
         register_shutdown_function(array(&$this, "__destruct"));
+
+        if ( defined('DB_CHARSET') )
+            $this->charset = DB_CHARSET;
+
+        if ( defined('DB_COLLATE') )
+            $this->collate = DB_COLLATE;
 
         $this->dbh = @mysql_connect($dbhost, $dbuser, $dbpassword);
@@ -63 +72 @@
 ");
         }
+
+        if ( !empty($this->charset) && version_compare(mysql_get_server_info(), '4.1.0', '>=') )
+            $this->query("SET NAMES '$this->charset'");
 
         $this->select($dbname);