Index: modules/aggregator/aggregator.schema
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.schema,v
retrieving revision 1.1
diff -u -r1.1 aggregator.schema
--- modules/aggregator/aggregator.schema	25 May 2007 12:46:43 -0000	1.1
+++ modules/aggregator/aggregator.schema	28 May 2007 01:18:15 -0000
@@ -18,7 +18,8 @@
       'fid' => array('type' => 'int', 'not null' => TRUE, 'default' => 0),
       'cid' => array('type' => 'int', 'not null' => TRUE, 'default' => 0)
     ),
-    'primary key' => array('fid', 'cid'),
+    'primary key' => array('cid', 'fid'),
+    'indexes' => array('fid' => array('fid')),
   );
 
   $schema['aggregator_category_item'] = array(
@@ -43,11 +44,11 @@
       'modified'    => array('type' => 'int', 'not null' => TRUE, 'default' => 0),
       'block'       => array('type' => 'int', 'not null' => TRUE, 'default' => 0, 'size' => 'tiny')
     ),
+    'primary key' => array('fid'),
     'unique keys' => array(
       'url'  => array('url'),
       'title' => array('title')
     ),
-    'primary key' => array('fid'),
   );
 
   $schema['aggregator_item'] = array(
@@ -61,8 +62,8 @@
       'timestamp'   => array('type' => 'int', 'not null' => FALSE),
       'guid'        => array('type' => 'varchar', 'length' => 255, 'not null' => FALSE)
     ),
-    'indexes' => array('fid' => array('fid')),
     'primary key' => array('iid'),
+    'indexes' => array('fid' => array('fid')),
   );
 
   return $schema;
Index: modules/block/block.schema
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.schema,v
retrieving revision 1.1
diff -u -r1.1 block.schema
--- modules/block/block.schema	25 May 2007 12:46:43 -0000	1.1
+++ modules/block/block.schema	28 May 2007 01:18:15 -0000
@@ -4,7 +4,6 @@
 function block_schema() {
   $schema['blocks'] = array(
     'fields' => array(
-      'bid'        => array('type' => 'serial', 'not null' => TRUE),
       'module'     => array('type' => 'varchar', 'length' => 64, 'not null' => TRUE, 'default' => ''),
       'delta'      => array('type' => 'varchar', 'length' => 32, 'not null' => TRUE, 'default' => '0'),
       'theme'      => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''),
@@ -17,7 +16,7 @@
       'pages'      => array('type' => 'text', 'not null' => TRUE),
       'title'      => array('type' => 'varchar', 'length' => 64, 'not null' => TRUE, 'default' => '')
     ),
-    'primary key' => array('bid'),
+    'primary key' => array('module', 'delta'),
   );
 
   $schema['blocks_roles'] = array(
Index: modules/filter/filter.schema
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.schema,v
retrieving revision 1.1
diff -u -r1.1 filter.schema
--- modules/filter/filter.schema	25 May 2007 12:46:44 -0000	1.1
+++ modules/filter/filter.schema	28 May 2007 01:18:16 -0000
@@ -4,13 +4,12 @@
 function filter_schema() {
   $schema['filters'] = array(
     'fields' => array(
-      'fid'    => array('type' => 'serial', 'not null' => TRUE),
       'format' => array('type' => 'int', 'not null' => TRUE, 'default' => 0),
       'module' => array('type' => 'varchar', 'length' => 64, 'not null' => TRUE, 'default' => ''),
       'delta'  => array('type' => 'int', 'not null' => TRUE, 'default' => 0, 'size' => 'tiny'),
       'weight' => array('type' => 'int', 'not null' => TRUE, 'default' => 0, 'size' => 'tiny')
     ),
-    'primary key' => array('fid'),
+    'primary key' => array('format', 'module', 'delta'),
     'indexes' => array('weight' => array('weight')),
   );
   $schema['filter_formats'] = array(
@@ -20,8 +19,8 @@
       'roles'  => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''),
       'cache'  => array('type' => 'int', 'not null' => TRUE, 'default' => 0, 'size' => 'tiny')
     ),
-    'unique keys' => array('name' => array('name')),
     'primary key' => array('format'),
+    'unique keys' => array('name' => array('name')),
   );
 
   $schema['cache_filter'] = drupal_get_schema_unprocessed('system', 'cache');
Index: modules/system/system.schema
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.schema,v
retrieving revision 1.3
diff -u -r1.3 system.schema
--- modules/system/system.schema	27 May 2007 20:31:13 -0000	1.3
+++ modules/system/system.schema	28 May 2007 01:18:16 -0000
@@ -39,8 +39,8 @@
       'filemime' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''),
       'filesize' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0)
     ),
-    'indexes' => array('nid' => array('nid')),
     'primary key' => array('fid'),
+    'indexes' => array('nid' => array('nid')),
   );
 
   $schema['file_revisions'] = array(
@@ -95,11 +95,11 @@
       'weight'           => array('type' => 'int', 'not null' => TRUE, 'default' => 0),
       'file'             => array('type' => 'text', 'size' => 'medium')
     ),
+    'primary key' => array('path'),
     'indexes' => array(
       'fit'        => array('fit'),
       'tab_parent' => array('tab_parent')
     ),
-    'primary key' => array('path'),
   );
 
   $schema['menu_links'] = array(
@@ -178,13 +178,11 @@
 
   $schema['url_alias'] = array(
     'fields' => array(
-      'pid'      => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
       'src'      => array('type' => 'varchar', 'length' => 128, 'not null' => TRUE, 'default' => ''),
       'dst'      => array('type' => 'varchar', 'length' => 128, 'not null' => TRUE, 'default' => ''),
       'language' => array('type' => 'varchar', 'length' => 12, 'not null' => TRUE, 'default' => '')
     ),
-    'unique keys' => array('dst_language' => array('dst', 'language')),
-    'primary key' => array('pid'),
+    'primary key' => array('dst', 'language'),
     'indexes' => array('src' => array('src')),
   );
 
Index: modules/taxonomy/taxonomy.schema
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.schema,v
retrieving revision 1.1
diff -u -r1.1 taxonomy.schema
--- modules/taxonomy/taxonomy.schema	25 May 2007 12:46:46 -0000	1.1
+++ modules/taxonomy/taxonomy.schema	28 May 2007 01:18:16 -0000
@@ -33,41 +33,35 @@
       'tid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0)
     ),
     'indexes' => array(
+      'vid' => array('vid'),
       'nid' => array('nid'),
-      'tid' => array('tid'),
-      'vid' => array('vid')
     ),
     'primary key' => array(
-      'vid',
       'tid',
-      'nid'
+      'vid',
     ),
   );
 
   $schema['term_relation'] = array(
     'fields' => array(
-      'trid' => array('type' => 'serial', 'not null' => TRUE),
       'tid1' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
       'tid2' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0)
     ),
     'indexes' => array(
-      'tid1' => array('tid1'),
       'tid2' => array('tid2')
     ),
-    'primary key' => array('trid'),
+    'primary key' => array('tid1', 'tid2'),
   );
 
   $schema['term_synonym'] = array(
     'fields' => array(
-      'tsid' => array('type' => 'serial', 'not null' => TRUE),
       'tid'  => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
       'name' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => '')
     ),
     'indexes' => array(
       'name' => array(array('name', 3)),
-      'tid'  => array('tid')
     ),
-    'primary key' => array('tsid'),
+    'primary key' => array('tid', 'name'),
   );
 
   $schema['vocabulary'] = array(
@@ -85,6 +79,7 @@
       'weight'      => array('type' => 'int', 'not null' => TRUE, 'default' => 0, 'size' => 'tiny')
     ),
     'primary key' => array('vid'),
+    'unique keys' => array('name' => 'name'),
   );
 
   $schema['vocabulary_node_types'] = array(