Enforce consistent ID types to allow for foreign keys to be defined between tables. Props Denis-de-Bernardy. see #9422
git-svn-id: http://svn.automattic.com/wordpress/trunk@10852 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
f84839d5af
commit
abec350e44
|
@ -28,7 +28,7 @@ if ( $wpdb->has_cap( 'collation' ) ) {
|
||||||
|
|
||||||
/** Create WordPress database tables SQL */
|
/** Create WordPress database tables SQL */
|
||||||
$wp_queries = "CREATE TABLE $wpdb->terms (
|
$wp_queries = "CREATE TABLE $wpdb->terms (
|
||||||
term_id bigint(20) NOT NULL auto_increment,
|
term_id bigint(20) unsigned NOT NULL auto_increment,
|
||||||
name varchar(200) NOT NULL default '',
|
name varchar(200) NOT NULL default '',
|
||||||
slug varchar(200) NOT NULL default '',
|
slug varchar(200) NOT NULL default '',
|
||||||
term_group bigint(10) NOT NULL default 0,
|
term_group bigint(10) NOT NULL default 0,
|
||||||
|
@ -37,26 +37,26 @@ $wp_queries = "CREATE TABLE $wpdb->terms (
|
||||||
KEY name (name)
|
KEY name (name)
|
||||||
) $charset_collate;
|
) $charset_collate;
|
||||||
CREATE TABLE $wpdb->term_taxonomy (
|
CREATE TABLE $wpdb->term_taxonomy (
|
||||||
term_taxonomy_id bigint(20) NOT NULL auto_increment,
|
term_taxonomy_id bigint(20) unsigned NOT NULL auto_increment,
|
||||||
term_id bigint(20) NOT NULL default 0,
|
term_id bigint(20) unsigned NOT NULL default 0,
|
||||||
taxonomy varchar(32) NOT NULL default '',
|
taxonomy varchar(32) NOT NULL default '',
|
||||||
description longtext NOT NULL,
|
description longtext NOT NULL,
|
||||||
parent bigint(20) NOT NULL default 0,
|
parent bigint(20) unsigned NOT NULL default 0,
|
||||||
count bigint(20) NOT NULL default 0,
|
count bigint(20) NOT NULL default 0,
|
||||||
PRIMARY KEY (term_taxonomy_id),
|
PRIMARY KEY (term_taxonomy_id),
|
||||||
UNIQUE KEY term_id_taxonomy (term_id,taxonomy),
|
UNIQUE KEY term_id_taxonomy (term_id,taxonomy),
|
||||||
KEY taxonomy (taxonomy)
|
KEY taxonomy (taxonomy)
|
||||||
) $charset_collate;
|
) $charset_collate;
|
||||||
CREATE TABLE $wpdb->term_relationships (
|
CREATE TABLE $wpdb->term_relationships (
|
||||||
object_id bigint(20) NOT NULL default 0,
|
object_id bigint(20) unsigned NOT NULL default 0,
|
||||||
term_taxonomy_id bigint(20) NOT NULL default 0,
|
term_taxonomy_id bigint(20) unsigned NOT NULL default 0,
|
||||||
term_order int(11) NOT NULL default 0,
|
term_order int(11) NOT NULL default 0,
|
||||||
PRIMARY KEY (object_id,term_taxonomy_id),
|
PRIMARY KEY (object_id,term_taxonomy_id),
|
||||||
KEY term_taxonomy_id (term_taxonomy_id)
|
KEY term_taxonomy_id (term_taxonomy_id)
|
||||||
) $charset_collate;
|
) $charset_collate;
|
||||||
CREATE TABLE $wpdb->comments (
|
CREATE TABLE $wpdb->comments (
|
||||||
comment_ID bigint(20) unsigned NOT NULL auto_increment,
|
comment_ID bigint(20) unsigned NOT NULL auto_increment,
|
||||||
comment_post_ID int(11) NOT NULL default '0',
|
comment_post_ID bigint(20) unsigned NOT NULL default '0',
|
||||||
comment_author tinytext NOT NULL,
|
comment_author tinytext NOT NULL,
|
||||||
comment_author_email varchar(100) NOT NULL default '',
|
comment_author_email varchar(100) NOT NULL default '',
|
||||||
comment_author_url varchar(200) NOT NULL default '',
|
comment_author_url varchar(200) NOT NULL default '',
|
||||||
|
@ -69,7 +69,7 @@ CREATE TABLE $wpdb->comments (
|
||||||
comment_agent varchar(255) NOT NULL default '',
|
comment_agent varchar(255) NOT NULL default '',
|
||||||
comment_type varchar(20) NOT NULL default '',
|
comment_type varchar(20) NOT NULL default '',
|
||||||
comment_parent bigint(20) NOT NULL default '0',
|
comment_parent bigint(20) NOT NULL default '0',
|
||||||
user_id bigint(20) NOT NULL default '0',
|
user_id bigint(20) unsigned NOT NULL default '0',
|
||||||
PRIMARY KEY (comment_ID),
|
PRIMARY KEY (comment_ID),
|
||||||
KEY comment_approved (comment_approved),
|
KEY comment_approved (comment_approved),
|
||||||
KEY comment_post_ID (comment_post_ID),
|
KEY comment_post_ID (comment_post_ID),
|
||||||
|
@ -77,7 +77,7 @@ CREATE TABLE $wpdb->comments (
|
||||||
KEY comment_date_gmt (comment_date_gmt)
|
KEY comment_date_gmt (comment_date_gmt)
|
||||||
) $charset_collate;
|
) $charset_collate;
|
||||||
CREATE TABLE $wpdb->links (
|
CREATE TABLE $wpdb->links (
|
||||||
link_id bigint(20) NOT NULL auto_increment,
|
link_id bigint(20) unsigned NOT NULL auto_increment,
|
||||||
link_url varchar(255) NOT NULL default '',
|
link_url varchar(255) NOT NULL default '',
|
||||||
link_name varchar(255) NOT NULL default '',
|
link_name varchar(255) NOT NULL default '',
|
||||||
link_image varchar(255) NOT NULL default '',
|
link_image varchar(255) NOT NULL default '',
|
||||||
|
@ -85,7 +85,7 @@ CREATE TABLE $wpdb->links (
|
||||||
link_category bigint(20) NOT NULL default '0',
|
link_category bigint(20) NOT NULL default '0',
|
||||||
link_description varchar(255) NOT NULL default '',
|
link_description varchar(255) NOT NULL default '',
|
||||||
link_visible varchar(20) NOT NULL default 'Y',
|
link_visible varchar(20) NOT NULL default 'Y',
|
||||||
link_owner int(11) NOT NULL default '1',
|
link_owner bigint(20) NOT NULL default '1',
|
||||||
link_rating int(11) NOT NULL default '0',
|
link_rating int(11) NOT NULL default '0',
|
||||||
link_updated datetime NOT NULL default '0000-00-00 00:00:00',
|
link_updated datetime NOT NULL default '0000-00-00 00:00:00',
|
||||||
link_rel varchar(255) NOT NULL default '',
|
link_rel varchar(255) NOT NULL default '',
|
||||||
|
@ -96,7 +96,7 @@ CREATE TABLE $wpdb->links (
|
||||||
KEY link_visible (link_visible)
|
KEY link_visible (link_visible)
|
||||||
) $charset_collate;
|
) $charset_collate;
|
||||||
CREATE TABLE $wpdb->options (
|
CREATE TABLE $wpdb->options (
|
||||||
option_id bigint(20) NOT NULL auto_increment,
|
option_id bigint(20) unsigned NOT NULL auto_increment,
|
||||||
blog_id int(11) NOT NULL default '0',
|
blog_id int(11) NOT NULL default '0',
|
||||||
option_name varchar(64) NOT NULL default '',
|
option_name varchar(64) NOT NULL default '',
|
||||||
option_value longtext NOT NULL,
|
option_value longtext NOT NULL,
|
||||||
|
@ -105,8 +105,8 @@ CREATE TABLE $wpdb->options (
|
||||||
KEY option_name (option_name)
|
KEY option_name (option_name)
|
||||||
) $charset_collate;
|
) $charset_collate;
|
||||||
CREATE TABLE $wpdb->postmeta (
|
CREATE TABLE $wpdb->postmeta (
|
||||||
meta_id bigint(20) NOT NULL auto_increment,
|
meta_id bigint(20) unsigned NOT NULL auto_increment,
|
||||||
post_id bigint(20) NOT NULL default '0',
|
post_id bigint(20) unsigned NOT NULL default '0',
|
||||||
meta_key varchar(255) default NULL,
|
meta_key varchar(255) default NULL,
|
||||||
meta_value longtext,
|
meta_value longtext,
|
||||||
PRIMARY KEY (meta_id),
|
PRIMARY KEY (meta_id),
|
||||||
|
@ -115,7 +115,7 @@ CREATE TABLE $wpdb->postmeta (
|
||||||
) $charset_collate;
|
) $charset_collate;
|
||||||
CREATE TABLE $wpdb->posts (
|
CREATE TABLE $wpdb->posts (
|
||||||
ID bigint(20) unsigned NOT NULL auto_increment,
|
ID bigint(20) unsigned NOT NULL auto_increment,
|
||||||
post_author bigint(20) NOT NULL default '0',
|
post_author bigint(20) unsigned NOT NULL default '0',
|
||||||
post_date datetime NOT NULL default '0000-00-00 00:00:00',
|
post_date datetime NOT NULL default '0000-00-00 00:00:00',
|
||||||
post_date_gmt datetime NOT NULL default '0000-00-00 00:00:00',
|
post_date_gmt datetime NOT NULL default '0000-00-00 00:00:00',
|
||||||
post_content longtext NOT NULL,
|
post_content longtext NOT NULL,
|
||||||
|
@ -132,7 +132,7 @@ CREATE TABLE $wpdb->posts (
|
||||||
post_modified datetime NOT NULL default '0000-00-00 00:00:00',
|
post_modified datetime NOT NULL default '0000-00-00 00:00:00',
|
||||||
post_modified_gmt datetime NOT NULL default '0000-00-00 00:00:00',
|
post_modified_gmt datetime NOT NULL default '0000-00-00 00:00:00',
|
||||||
post_content_filtered text NOT NULL,
|
post_content_filtered text NOT NULL,
|
||||||
post_parent bigint(20) NOT NULL default '0',
|
post_parent bigint(20) unsigned NOT NULL default '0',
|
||||||
guid varchar(255) NOT NULL default '',
|
guid varchar(255) NOT NULL default '',
|
||||||
menu_order int(11) NOT NULL default '0',
|
menu_order int(11) NOT NULL default '0',
|
||||||
post_type varchar(20) NOT NULL default 'post',
|
post_type varchar(20) NOT NULL default 'post',
|
||||||
|
@ -159,8 +159,8 @@ CREATE TABLE $wpdb->users (
|
||||||
KEY user_nicename (user_nicename)
|
KEY user_nicename (user_nicename)
|
||||||
) $charset_collate;
|
) $charset_collate;
|
||||||
CREATE TABLE $wpdb->usermeta (
|
CREATE TABLE $wpdb->usermeta (
|
||||||
umeta_id bigint(20) NOT NULL auto_increment,
|
umeta_id bigint(20) unsigned NOT NULL auto_increment,
|
||||||
user_id bigint(20) NOT NULL default '0',
|
user_id bigint(20) unsigned NOT NULL default '0',
|
||||||
meta_key varchar(255) default NULL,
|
meta_key varchar(255) default NULL,
|
||||||
meta_value longtext,
|
meta_value longtext,
|
||||||
PRIMARY KEY (umeta_id),
|
PRIMARY KEY (umeta_id),
|
||||||
|
|
|
@ -15,6 +15,6 @@ $wp_version = '2.8-bleeding-edge';
|
||||||
*
|
*
|
||||||
* @global int $wp_db_version
|
* @global int $wp_db_version
|
||||||
*/
|
*/
|
||||||
$wp_db_version = 10738;
|
$wp_db_version = 10850;
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
Loading…
Reference in New Issue