- Patch #12497 by Morbus: Just working on a profile reporting idea and spotted that the following fields appear to have incorrect type definitions:

profile_values.fid = int(11)
profile_values.uid = int(11)

These both appear inconsistant with the rest of the database (that I have seen i.e. user tables) where they are defined as int(10). The profile_fields.fid is defined as int(10) also.

1 files changed, 39 insertions, 39 deletions

diff --git a/database/database.mysql b/database/database.mysql
index 7c14bdfd1..3d78e71fd 100644
--- a/database/database.mysql
+++ b/database/database.mysql
@@ -12,7 +12,7 @@ CREATE TABLE access (
   mask varchar(255) NOT NULL default '',
   type varchar(255) NOT NULL default '',
   status tinyint(2) NOT NULL default '0',
-  PRIMARY KEY  (aid)
+  PRIMARY KEY (aid)
 ) TYPE=MyISAM;
 
 --
@@ -28,7 +28,7 @@ CREATE TABLE accesslog (
   uid int(10) unsigned default '0',
   timestamp int(11) unsigned NOT NULL default '0',
   KEY accesslog_timestamp (timestamp),
-  PRIMARY KEY  (aid)
+  PRIMARY KEY (aid)
 ) TYPE=MyISAM;
 
 --
@@ -40,7 +40,7 @@ CREATE TABLE aggregator_category (
   title varchar(255) NOT NULL default '',
   description longtext NOT NULL,
   block tinyint(2) NOT NULL default '0',
-  PRIMARY KEY  (cid),
+  PRIMARY KEY (cid),
   UNIQUE KEY title (title)
 ) TYPE=MyISAM;
 
@@ -51,7 +51,7 @@ CREATE TABLE aggregator_category (
 CREATE TABLE aggregator_category_feed (
   fid int(10) NOT NULL default '0',
   cid int(10) NOT NULL default '0',
-  PRIMARY KEY  (fid,cid)
+  PRIMARY KEY (fid,cid)
 ) TYPE=MyISAM;
 
 --
@@ -61,7 +61,7 @@ CREATE TABLE aggregator_category_feed (
 CREATE TABLE aggregator_category_item (
   iid int(10) NOT NULL default '0',
   cid int(10) NOT NULL default '0',
-  PRIMARY KEY  (iid,cid)
+  PRIMARY KEY (iid,cid)
 ) TYPE=MyISAM;
 
 --
@@ -80,7 +80,7 @@ CREATE TABLE aggregator_feed (
   etag varchar(255) NOT NULL default '',
   modified int(10) NOT NULL default '0',
   block tinyint(2) NOT NULL default '0',
-  PRIMARY KEY  (fid),
+  PRIMARY KEY (fid),
   UNIQUE KEY link (url),
   UNIQUE KEY title (title)
 ) TYPE=MyISAM;
@@ -97,7 +97,7 @@ CREATE TABLE aggregator_item (
   author varchar(255) NOT NULL default '',
   description longtext NOT NULL,
   timestamp int(11) default NULL,
-  PRIMARY KEY  (iid)
+  PRIMARY KEY (iid)
 ) TYPE=MyISAM;
 
 --
@@ -109,7 +109,7 @@ CREATE TABLE authmap (
   uid int(10) NOT NULL default '0',
   authname varchar(128) NOT NULL default '',
   module varchar(128) NOT NULL default '',
-  PRIMARY KEY  (aid),
+  PRIMARY KEY (aid),
   UNIQUE KEY authname (authname)
 ) TYPE=MyISAM;
 
@@ -139,7 +139,7 @@ CREATE TABLE book (
   parent int(10) NOT NULL default '0',
   weight tinyint(3) NOT NULL default '0',
   log longtext,
-  PRIMARY KEY  (nid),
+  PRIMARY KEY (nid),
   KEY parent (parent)
 ) TYPE=MyISAM;
 
@@ -153,7 +153,7 @@ CREATE TABLE boxes (
   body longtext,
   info varchar(128) NOT NULL default '',
   format int(4) NOT NULL default '0',
-  PRIMARY KEY  (bid),
+  PRIMARY KEY (bid),
   UNIQUE KEY title (title),
   UNIQUE KEY info (info)
 ) TYPE=MyISAM;
@@ -168,7 +168,7 @@ CREATE TABLE cache (
   expire int(11) NOT NULL default '0',
   created int(11) NOT NULL default '0',
   headers text,
-  PRIMARY KEY  (cid),
+  PRIMARY KEY (cid),
   INDEX expire (expire)
 ) TYPE=MyISAM;
 
@@ -193,7 +193,7 @@ CREATE TABLE comments (
   name varchar(60) default NULL,
   mail varchar(64) default NULL,
   homepage varchar(255) default NULL,
-  PRIMARY KEY  (cid),
+  PRIMARY KEY (cid),
   KEY lid (nid)
 ) TYPE=MyISAM;
 
@@ -222,7 +222,7 @@ CREATE TABLE directory (
   slogan longtext NOT NULL,
   mission longtext NOT NULL,
   timestamp int(11) NOT NULL default '0',
-  PRIMARY KEY  (link)
+  PRIMARY KEY (link)
 ) TYPE=MyISAM;
 
 --
@@ -237,7 +237,7 @@ CREATE TABLE files (
   filemime varchar(255) NOT NULL default '',
   filesize int(10) unsigned NOT NULL default '0',
   list tinyint(1) unsigned NOT NULL default '0',
-  PRIMARY KEY  (fid)
+  PRIMARY KEY (fid)
 ) TYPE=MyISAM;
 
 --
@@ -249,7 +249,7 @@ CREATE TABLE filter_formats (
   name varchar(255) NOT NULL default '',
   roles varchar(255) NOT NULL default '',
   cache tinyint(2) NOT NULL default '0',
-  PRIMARY KEY format (format)
+  PRIMARY KEY (format)
 ) TYPE=MyISAM;
 
 --
@@ -281,7 +281,7 @@ CREATE TABLE flood (
 CREATE TABLE forum (
   nid int(10) unsigned NOT NULL default '0',
   tid int(10) unsigned NOT NULL default  '0',
-  PRIMARY KEY  (nid),
+  PRIMARY KEY (nid),
   KEY tid (tid)
 ) TYPE=MyISAM;
 
@@ -293,7 +293,7 @@ CREATE TABLE history (
   uid int(10) NOT NULL default '0',
   nid int(10) NOT NULL default '0',
   timestamp int(11) NOT NULL default '0',
-  PRIMARY KEY  (uid,nid)
+  PRIMARY KEY (uid,nid)
 ) TYPE=MyISAM;
 
 --
@@ -307,7 +307,7 @@ CREATE TABLE locales_meta (
   isdefault int(2) NOT NULL default '0',
   plurals int(1) NOT NULL default '0',
   formula varchar(128) NOT NULL default '',
-  PRIMARY KEY  (locale)
+  PRIMARY KEY (locale)
 ) TYPE=MyISAM;
 
 --
@@ -318,7 +318,7 @@ CREATE TABLE locales_source (
   lid int(11) NOT NULL auto_increment,
   location varchar(128) NOT NULL default '',
   source blob NOT NULL,
-  PRIMARY KEY  (lid)
+  PRIMARY KEY (lid)
 ) TYPE=MyISAM;
 
 --
@@ -349,7 +349,7 @@ CREATE TABLE menu (
   description varchar(255) NOT NULL default '',
   weight tinyint(4) NOT NULL default '0',
   type int(2) unsigned NOT NULL default '0',
-  PRIMARY KEY  (mid)
+  PRIMARY KEY (mid)
 ) TYPE=MyISAM;
 
 --
@@ -360,7 +360,7 @@ CREATE TABLE moderation_filters (
   fid int(10) unsigned NOT NULL auto_increment,
   filter varchar(255) NOT NULL default '',
   minimum smallint(6) NOT NULL default '0',
-  PRIMARY KEY  (fid)
+  PRIMARY KEY (fid)
 ) TYPE=MyISAM;
 
 --
@@ -383,7 +383,7 @@ CREATE TABLE moderation_votes (
   mid int(10) unsigned NOT NULL auto_increment,
   vote varchar(255) default NULL,
   weight tinyint(4) NOT NULL default '0',
-  PRIMARY KEY  (mid)
+  PRIMARY KEY (mid)
 ) TYPE=MyISAM;
 
 --
@@ -406,7 +406,7 @@ CREATE TABLE node (
   revisions longtext NOT NULL,
   sticky int(2) NOT NULL default '0',
   format int(4) NOT NULL default '0',
-  PRIMARY KEY  (nid),
+  PRIMARY KEY (nid),
   KEY node_type (type(4)),
   KEY node_title_type (title,type(4)),
   KEY status (status),
@@ -429,7 +429,7 @@ CREATE TABLE node_access (
   grant_view tinyint(1) unsigned NOT NULL default '0',
   grant_update tinyint(1) unsigned NOT NULL default '0',
   grant_delete tinyint(1) unsigned NOT NULL default '0',
-  PRIMARY KEY  (nid,gid,realm)
+  PRIMARY KEY (nid,gid,realm)
 ) TYPE=MyISAM;
 
 --
@@ -459,8 +459,8 @@ CREATE TABLE profile_fields (
 --
 
 CREATE TABLE profile_values (
-  fid int(11) unsigned default '0',
-  uid int(11) unsigned default '0',
+  fid int(10) unsigned default '0',
+  uid int(10) unsigned default '0',
   value text,
   KEY uid (uid),
   KEY fid (fid)
@@ -475,7 +475,7 @@ CREATE TABLE url_alias (
   pid int(10) unsigned NOT NULL auto_increment,
   src varchar(128) NOT NULL default '',
   dst varchar(128) NOT NULL default '',
-  PRIMARY KEY  (pid),
+  PRIMARY KEY (pid),
   UNIQUE KEY dst (dst)
 ) TYPE=MyISAM;
 
@@ -499,7 +499,7 @@ CREATE TABLE poll (
   runtime int(10) NOT NULL default '0',
   voters longtext NOT NULL,
   active int(2) unsigned NOT NULL default '0',
-  PRIMARY KEY  (nid)
+  PRIMARY KEY (nid)
 ) TYPE=MyISAM;
 
 --
@@ -512,7 +512,7 @@ CREATE TABLE poll_choices (
   chtext varchar(128) NOT NULL default '',
   chvotes int(6) NOT NULL default '0',
   chorder int(2) NOT NULL default '0',
-  PRIMARY KEY  (chid),
+  PRIMARY KEY (chid),
   KEY nid (nid)
 ) TYPE=MyISAM;
 
@@ -534,7 +534,7 @@ CREATE TABLE queue (
 CREATE TABLE role (
   rid int(10) unsigned NOT NULL auto_increment,
   name varchar(32) NOT NULL default '',
-  PRIMARY KEY  (rid),
+  PRIMARY KEY (rid),
   UNIQUE KEY name (name)
 ) TYPE=MyISAM;
 
@@ -576,7 +576,7 @@ CREATE TABLE sessions (
   timestamp int(11) NOT NULL default '0',
   session longtext,
   KEY uid (uid),
-  PRIMARY KEY sid (sid),
+  PRIMARY KEY (sid),
   KEY timestamp (timestamp)
 ) TYPE=MyISAM;
 
@@ -587,7 +587,7 @@ CREATE TABLE sessions (
 CREATE TABLE sequences (
   name varchar(255) NOT NULL default '',
   id int(10) unsigned NOT NULL default '0',
-  PRIMARY KEY  (name)
+  PRIMARY KEY (name)
 ) TYPE=MyISAM;
 
 --
@@ -599,7 +599,7 @@ CREATE TABLE node_counter (
   totalcount bigint(20) unsigned NOT NULL default '0',
   daycount mediumint(8) unsigned NOT NULL default '0',
   timestamp int(11) unsigned NOT NULL default '0',
-  PRIMARY KEY  (nid),
+  PRIMARY KEY (nid),
   KEY totalcount (totalcount),
   KEY daycount (daycount),
   KEY timestamp (timestamp)
@@ -617,7 +617,7 @@ CREATE TABLE system (
   status int(2) NOT NULL default '0',
   throttle tinyint(1) DEFAULT '0' NOT NULL,
   bootstrap int(2) NOT NULL default '0',
-  PRIMARY KEY  (filename)
+  PRIMARY KEY (filename)
 ) TYPE=MyISAM;
 
 --
@@ -630,7 +630,7 @@ CREATE TABLE term_data (
   name varchar(255) NOT NULL default '',
   description longtext,
   weight tinyint(4) NOT NULL default '0',
-  PRIMARY KEY  (tid),
+  PRIMARY KEY (tid),
   KEY vid (vid)
 ) TYPE=MyISAM;
 
@@ -700,7 +700,7 @@ CREATE TABLE users (
   picture varchar(255) NOT NULL DEFAULT '',
   init varchar(64) default '',
   data longtext,
-  PRIMARY KEY  (uid),
+  PRIMARY KEY (uid),
   UNIQUE KEY name (name),
   KEY changed (changed)
 ) TYPE=MyISAM;
@@ -722,7 +722,7 @@ CREATE TABLE users_roles (
 CREATE TABLE variable (
   name varchar(48) NOT NULL default '',
   value longtext NOT NULL,
-  PRIMARY KEY  (name)
+  PRIMARY KEY (name)
 ) TYPE=MyISAM;
 
 --
@@ -740,7 +740,7 @@ CREATE TABLE vocabulary (
   required tinyint(3) unsigned NOT NULL default '0',
   module varchar(255) NOT NULL default '',
   weight tinyint(4) NOT NULL default '0',
-  PRIMARY KEY  (vid)
+  PRIMARY KEY (vid)
 ) TYPE=MyISAM;
 
 --
@@ -767,7 +767,7 @@ CREATE TABLE watchdog (
   location varchar(128) NOT NULL default '',
   hostname varchar(128) NOT NULL default '',
   timestamp int(11) NOT NULL default '0',
-  PRIMARY KEY  (wid)
+  PRIMARY KEY (wid)
 ) TYPE=MyISAM;
 
 --