Index: database/database.mysql
===================================================================
RCS file: /cvs/drupal/drupal/database/database.mysql,v
retrieving revision 1.170
diff -u -r1.170 database.mysql
--- database/database.mysql	21 Feb 2005 19:47:44 -0000	1.170
+++ database/database.mysql	16 Mar 2005 04:43:13 -0000
@@ -12,7 +12,7 @@
   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 @@
   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 @@
   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_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_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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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;
 
 --
@@ -475,7 +475,7 @@
   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 @@
   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 @@
   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 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 @@
   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 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 @@
   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 @@
   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 @@
   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 @@
   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 variable (
   name varchar(48) NOT NULL default '',
   value longtext NOT NULL,
-  PRIMARY KEY  (name)
+  PRIMARY KEY (name)
 ) TYPE=MyISAM;
 
 --
@@ -740,7 +740,7 @@
   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 @@
   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;
 
 --
Index: database/database.pgsql
===================================================================
RCS file: /cvs/drupal/drupal/database/database.pgsql,v
retrieving revision 1.106
diff -u -r1.106 database.pgsql
--- database/database.pgsql	27 Feb 2005 15:40:35 -0000	1.106
+++ database/database.pgsql	16 Mar 2005 04:43:14 -0000
@@ -38,7 +38,7 @@
   title varchar(255) NOT NULL default '',
   description text,
   block smallint NOT NULL default '0',
-  PRIMARY KEY  (cid),
+  PRIMARY KEY (cid),
   UNIQUE (title)
 );
 
@@ -49,7 +49,7 @@
 CREATE TABLE aggregator_category_feed (
   fid integer NOT NULL default '0',
   cid integer NOT NULL default '0',
-  PRIMARY KEY  (fid,cid)
+  PRIMARY KEY (fid,cid)
 );
 
 --
@@ -59,7 +59,7 @@
 CREATE TABLE aggregator_category_item (
   iid integer NOT NULL default '0',
   cid integer NOT NULL default '0',
-  PRIMARY KEY  (iid,cid)
+  PRIMARY KEY (iid,cid)
 );
 
 --
@@ -78,7 +78,7 @@
   etag varchar(255) NOT NULL default '',
   modified integer NOT NULL default '0',
   block smallint NOT NULL default '0',
-  PRIMARY KEY  (fid),
+  PRIMARY KEY (fid),
   UNIQUE (url),
   UNIQUE (title)
 );
@@ -95,7 +95,7 @@
   author varchar(255) NOT NULL default '',
   description text,
   timestamp integer default NULL,
-  PRIMARY KEY  (iid)
+  PRIMARY KEY (iid)
 );
 
 --
@@ -152,7 +152,7 @@
   body text default '',
   info varchar(128) NOT NULL default '',
   format smallint NOT NULL default '0',
-  PRIMARY KEY  (bid),
+  PRIMARY KEY (bid),
   UNIQUE (info),
   UNIQUE (title)
 );
@@ -167,7 +167,7 @@
   expire integer NOT NULL default '0',
   created integer NOT NULL default '0',
   headers text default '',
-  PRIMARY KEY  (cid)
+  PRIMARY KEY (cid)
 );
 CREATE INDEX cache_expire_idx ON cache(expire);
 
@@ -192,7 +192,7 @@
   name varchar(60) default NULL,
   mail varchar(64) default NULL,
   homepage varchar(255) default NULL,
-  PRIMARY KEY  (cid)
+  PRIMARY KEY (cid)
 );
 CREATE INDEX comments_nid_idx ON comments(nid);
 
@@ -221,7 +221,7 @@
   slogan text NOT NULL default '',
   mission text NOT NULL default '',
   timestamp integer NOT NULL default '0',
-  PRIMARY KEY  (link)
+  PRIMARY KEY (link)
 );
 
 --
@@ -236,7 +236,7 @@
   filemime varchar(255) NOT NULL default '',
   filesize integer NOT NULL default '0',
   list smallint NOT NULL default '0',
-  PRIMARY KEY  (fid)
+  PRIMARY KEY (fid)
 );
 
 --
@@ -282,7 +282,7 @@
   nid integer NOT NULL default '0',
   tid integer NOT NULL default '0',
   shadow integer NOT NULL default '0',
-  PRIMARY KEY  (nid)
+  PRIMARY KEY (nid)
 );
 CREATE INDEX forum_tid_idx ON forum(tid);
 
@@ -294,7 +294,7 @@
   uid integer NOT NULL default '0',
   nid integer NOT NULL default '0',
   timestamp integer NOT NULL default '0',
-  PRIMARY KEY  (uid,nid)
+  PRIMARY KEY (uid,nid)
 );
 
 --
@@ -308,7 +308,7 @@
   isdefault int4 NOT NULL default '0',
   plurals int4 NOT NULL default '0',
   formula varchar(128) NOT NULL default '',
-  PRIMARY KEY  (locale)
+  PRIMARY KEY (locale)
 );
 
 --
@@ -320,7 +320,7 @@
   lid SERIAL,
   location varchar(128) NOT NULL default '',
   source text NOT NULL,
-  PRIMARY KEY  (lid)
+  PRIMARY KEY (lid)
 );
 
 --
@@ -353,7 +353,7 @@
   description varchar(255) NOT NULL default '',
   weight smallint NOT NULL default '0',
   type smallint NOT NULL default '0',
-  PRIMARY KEY  (mid)
+  PRIMARY KEY (mid)
 );
 --
 -- Table structure for table 'moderation_filters'
@@ -363,7 +363,7 @@
   fid SERIAL,
   filter varchar(255) NOT NULL default '',
   minimum smallint NOT NULL default '0',
-  PRIMARY KEY  (fid)
+  PRIMARY KEY (fid)
 );
 
 --
@@ -386,7 +386,7 @@
   mid SERIAL,
   vote varchar(255) default NULL,
   weight smallint NOT NULL default '0',
-  PRIMARY KEY  (mid)
+  PRIMARY KEY (mid)
 );
 
 --
@@ -409,7 +409,7 @@
   revisions text NOT NULL default '',
   sticky integer NOT NULL default '0',
   format smallint NOT NULL default '0',
-  PRIMARY KEY  (nid)
+  PRIMARY KEY (nid)
 );
 CREATE INDEX node_type_idx ON node(type);
 CREATE INDEX node_title_idx ON node(title,type);
@@ -431,7 +431,7 @@
   grant_view smallint NOT NULL default '0',
   grant_update smallint NOT NULL default '0',
   grant_delete smallint NOT NULL default '0',
-  PRIMARY KEY  (nid,gid,realm)
+  PRIMARY KEY (nid,gid,realm)
 );
 
 
@@ -444,7 +444,7 @@
   totalcount integer NOT NULL default '0',
   daycount integer NOT NULL default '0',
   timestamp integer NOT NULL default '0',
-  PRIMARY KEY  (nid)
+  PRIMARY KEY (nid)
 );
 CREATE INDEX node_counter_totalcount_idx ON node_counter(totalcount);
 CREATE INDEX node_counter_daycount_idx ON node_counter(daycount);
@@ -488,7 +488,7 @@
   pid serial,
   src varchar(128) NOT NULL default '',
   dst varchar(128) NOT NULL default '',
-  PRIMARY KEY  (pid)
+  PRIMARY KEY (pid)
 );
 CREATE INDEX url_alias_dst_idx ON url_alias(dst);
 --
@@ -511,7 +511,7 @@
   runtime integer NOT NULL default '0',
   voters text NOT NULL default '',
   active integer NOT NULL default '0',
-  PRIMARY KEY  (nid)
+  PRIMARY KEY (nid)
 );
 
 --
@@ -524,7 +524,7 @@
   chtext varchar(128) NOT NULL default '',
   chvotes integer NOT NULL default '0',
   chorder integer NOT NULL default '0',
-  PRIMARY KEY  (chid)
+  PRIMARY KEY (chid)
 );
 CREATE INDEX poll_choices_nid_idx ON poll_choices(nid);
 
@@ -548,7 +548,7 @@
 CREATE TABLE role (
   rid SERIAL,
   name varchar(32) NOT NULL default '',
-  PRIMARY KEY  (rid),
+  PRIMARY KEY (rid),
   UNIQUE (name)
 );
 
@@ -615,7 +615,7 @@
   status integer NOT NULL default '0',
   throttle smallint NOT NULL default '0',
   bootstrap integer NOT NULL default '0',
-  PRIMARY KEY  (filename)
+  PRIMARY KEY (filename)
 );
 
 --
@@ -628,7 +628,7 @@
   name varchar(255) NOT NULL default '',
   description text default '',
   weight smallint NOT NULL default '0',
-  PRIMARY KEY  (tid)
+  PRIMARY KEY (tid)
 );
 CREATE INDEX term_data_vid_idx ON term_data(vid);
 
@@ -698,7 +698,7 @@
   picture varchar(255) NOT NULL DEFAULT '',
   init varchar(64) default '',
   data text default '',
-  PRIMARY KEY  (uid),
+  PRIMARY KEY (uid),
   UNIQUE (name)
 );
 CREATE INDEX users_changed_idx ON users(changed);
@@ -722,7 +722,7 @@
 CREATE TABLE variable (
   name varchar(48) NOT NULL default '',
   value text NOT NULL default '',
-  PRIMARY KEY  (name)
+  PRIMARY KEY (name)
 );
 
 --
@@ -740,7 +740,7 @@
   required smallint NOT NULL default '0',
   module varchar(255) NOT NULL default '',
   weight smallint NOT NULL default '0',
-  PRIMARY KEY  (vid)
+  PRIMARY KEY (vid)
 );
 
 --
@@ -767,7 +767,7 @@
   location varchar(128) NOT NULL default '',
   hostname varchar(128) NOT NULL default '',
   timestamp integer NOT NULL default '0',
-  PRIMARY KEY  (wid)
+  PRIMARY KEY (wid)
 );
 
 --