? css
? favicon.ico
? files
? i164532.patch
? img
? index.html
? index_omnibus.patch
? indexes_minus_schema_change_0.patch
? test
Index: modules/aggregator/aggregator.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.install,v
retrieving revision 1.11
diff -u -r1.11 aggregator.install
--- modules/aggregator/aggregator.install	10 Oct 2007 11:39:32 -0000	1.11
+++ modules/aggregator/aggregator.install	3 Nov 2007 20:29:20 -0000
@@ -75,7 +75,8 @@
         'description' => t('The {aggregator_category}.cid to which the feed is being assigned.'),
      )
     ),
-    'primary key' => array('fid', 'cid'),
+    'primary key' => array('cid', 'fid'),
+    'indexes' => array('fid' => array('fid')),
   );
 
   $schema['aggregator_category_item'] = array(
@@ -94,7 +95,8 @@
         'description' => t('The {aggregator_category}.cid to which the feed item is being assigned.'),
       )
     ),
-    'primary key' => array('iid', 'cid'),
+    'primary key' => array('cid', 'iid'),
+    'indexes' => array('iid' => array('iid')),
   );
 
   $schema['aggregator_feed'] = array(
@@ -171,11 +173,11 @@
         'description' => t("Number of items to display in the feed's block."),
       )
     ),
+    'primary key' => array('fid'),
     'unique keys' => array(
       'url'  => array('url'),
-      'title' => array('title')
+      'title' => array('title'),
     ),
-    'primary key' => array('fid'),
   );
 
   $schema['aggregator_item'] = array(
@@ -231,8 +233,8 @@
         'description' => t('Unique identifier for the feed item.'),
       )
     ),
-    'indexes' => array('fid' => array('fid')),
     'primary key' => array('iid'),
+    'indexes' => array('fid' => array('fid')),
   );
 
   return $schema;
Index: modules/block/block.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.install,v
retrieving revision 1.4
diff -u -r1.4 block.install
--- modules/block/block.install	21 Oct 2007 18:59:01 -0000	1.4
+++ modules/block/block.install	3 Nov 2007 20:29:20 -0000
@@ -97,6 +97,12 @@
       ),
     ),
     'primary key' => array('bid'),
+    'unique keys' => array(
+      'tmd' => array('theme', 'module', 'delta'),
+    ),
+    'indexes' => array(
+      'list' => array('theme', 'status', 'region', 'weight', 'module'),    
+    ),
   );
 
   $schema['blocks_roles'] = array(
@@ -126,6 +132,9 @@
       'delta',
       'rid'
     ),
+    'indexes' => array(
+      'rid' => array('rid'),
+    ),
   );
 
   $schema['boxes'] = array(
Index: modules/book/book.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.install,v
retrieving revision 1.12
diff -u -r1.12 book.install
--- modules/book/book.install	25 Oct 2007 15:32:55 -0000	1.12
+++ modules/book/book.install	3 Nov 2007 20:29:20 -0000
@@ -273,11 +273,13 @@
         'description' => t("The book ID is the {book}.nid of the top-level page."),
       ),
     ),
+    'primary key' => array('mlid'),
+    'unique keys' => array(
+      'nid' => array('nid'),      
+    ),
     'indexes' => array(
-      'nid'     => array('nid'),
-      'bid' => array('bid')
+      'bid' => array('bid'),
     ),
-    'primary key' => array('mlid'),
   );
 
   return $schema;
Index: modules/comment/comment.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.install,v
retrieving revision 1.7
diff -u -r1.7 comment.install
--- modules/comment/comment.install	10 Oct 2007 11:39:32 -0000	1.7
+++ modules/comment/comment.install	3 Nov 2007 20:29:20 -0000
@@ -155,7 +155,7 @@
     ),
     'indexes' => array(
       'nid'    => array('nid'),
-      'status' => array('status')
+      'status' => array('status'), // This index is probably unused
     ),
     'primary key' => array('cid'),
   );
@@ -196,8 +196,10 @@
          'description' => t('The total number of comments on this node.'),
        ),
       ),
-      'indexes' => array('node_comment_timestamp' => array('last_comment_timestamp')),
       'primary key' => array('nid'),
+      'indexes' => array(
+        'node_comment_timestamp' => array('last_comment_timestamp'),
+      ),
   );
 
   return $schema;
Index: modules/contact/contact.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.install,v
retrieving revision 1.9
diff -u -r1.9 contact.install
--- modules/contact/contact.install	10 Oct 2007 11:39:32 -0000	1.9
+++ modules/contact/contact.install	3 Nov 2007 20:29:20 -0000
@@ -68,10 +68,14 @@
         'description' => t('Flag to indicate whether or not category is selected by default. (1 = Yes, 0 = No)'),
       ),
     ),
-    'unique keys' => array('category' => array('category')),
     'primary key' => array('cid'),
+    'unique keys' => array(
+      'category' => array('category'),
+    ),
+    'indexes' => array(
+      'list' => array('weight', 'category'),
+    ),
   );
 
   return $schema;
 }
-
Index: modules/filter/filter.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.install,v
retrieving revision 1.2
diff -u -r1.2 filter.install
--- modules/filter/filter.install	10 Oct 2007 11:39:32 -0000	1.2
+++ modules/filter/filter.install	3 Nov 2007 20:29:20 -0000
@@ -42,7 +42,12 @@
       )
     ),
     'primary key' => array('fid'),
-    'indexes' => array('weight' => array('weight')),
+    'unique keys' => array(
+      'fmd' => array('format', 'module', 'delta'),
+    ),
+    'indexes' => array(
+      'list' => array('format', 'weight', 'module', 'delta'),
+    ),
   );
   $schema['filter_formats'] = array(
     'description' => t('Stores input formats: custom groupings of filters, such as Filtered HTML.'),
@@ -64,7 +69,7 @@
         'length' => 255,
         'not null' => TRUE,
         'default' => '',
-        'description' => t('A comma-separated string of roles; references {role}.rid.'),
+        'description' => t('A comma-separated string of roles; references {role}.rid.'), // This is stupid.
       ),
       'cache' => array(
         'type' => 'int',
@@ -74,8 +79,8 @@
         'description' => t('Flag to indicate whether format is cachable. (1 = cachable, 0 = not cachable)'),
       ),
     ),
-    '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/filter/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.190
diff -u -r1.190 filter.module
--- modules/filter/filter.module	22 Oct 2007 10:32:03 -0000	1.190
+++ modules/filter/filter.module	3 Nov 2007 20:29:20 -0000
@@ -369,7 +369,7 @@
 
   if (!isset($filters[$format])) {
     $filters[$format] = array();
-    $result = db_query("SELECT * FROM {filters} WHERE format = %d ORDER BY weight ASC", $format);
+    $result = db_query("SELECT * FROM {filters} WHERE format = %d ORDER BY weight, module, delta", $format);
     while ($filter = db_fetch_object($result)) {
       $list = module_invoke($filter->module, 'filter', 'list');
       if (isset($list) && is_array($list) && isset($list[$filter->delta])) {
Index: modules/locale/locale.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.install,v
retrieving revision 1.20
diff -u -r1.20 locale.install
--- modules/locale/locale.install	21 Oct 2007 18:59:02 -0000	1.20
+++ modules/locale/locale.install	3 Nov 2007 20:29:20 -0000
@@ -216,6 +216,9 @@
       ),
     ),
     'primary key' => array('language'),
+    'indexes' => array(
+      'list' => array('weight', 'name'),
+    ),
   );
 
   $schema['locales_source'] = array(
@@ -255,8 +258,9 @@
       ),
     ),
     'primary key' => array('lid'),
-    'indexes' => array
-        ('source' => array(array('source', 30))),
+    'indexes' => array(
+      'source' => array(array('source', 30)),
+    ),
   );
 
   $schema['locales_target'] = array(
@@ -283,7 +287,7 @@
       ),
       'plid' => array(
         'type' => 'int',
-        'not null' => TRUE,
+        'not null' => TRUE, // This should be NULL for no referenced string, not zero.
         'default' => 0,
         'description' => t('Parent lid (lid of the previous string in the plural chain) in case of plural strings. References {locales_source}.lid.'),
       ),
@@ -294,11 +298,11 @@
         'description' => t('Plural index number in case of plural strings.'),
       ),
     ),
+    'primary key' => array('language', 'lid', 'plural'),
     'indexes' => array(
-      'language'   => array('language'),
-      'lid'    => array('lid'),
-      'plid'   => array('plid'),
-      'plural' => array('plural')
+      'lid'      => array('lid'),
+      'plid'     => array('plid'),
+      'plural'   => array('plural'),
     ),
   );
 
Index: modules/node/node.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.install,v
retrieving revision 1.2
diff -u -r1.2 node.install
--- modules/node/node.install	10 Oct 2007 11:39:33 -0000	1.2
+++ modules/node/node.install	3 Nov 2007 20:29:20 -0000
@@ -97,13 +97,11 @@
       'node_status_type'    => array('status', 'type', 'nid'),
       'node_title_type'     => array('title', array('type', 4)),
       'node_type'           => array(array('type', 4)),
-      'status'              => array('status'),
       'uid'                 => array('uid'),
       'tnid'                => array('tnid'),
       'translate'           => array('translate'),
       ),
     'unique keys' => array(
-      'nid_vid' => array('nid', 'vid'),
       'vid'     => array('vid')
       ),
     'primary key' => array('nid'),
Index: modules/poll/poll.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.install,v
retrieving revision 1.12
diff -u -r1.12 poll.install
--- modules/poll/poll.install	21 Oct 2007 18:59:02 -0000	1.12
+++ modules/poll/poll.install	3 Nov 2007 20:29:20 -0000
@@ -120,10 +120,10 @@
         'description' => t('The IP address this vote is from unless the voter was logged in.'),
         ),
       ),
+    'primary key' => array('nid', 'uid', 'hostname'),
     'indexes' => array(
       'hostname' => array('hostname'),
-      'nid'      => array('nid'),
-      'uid'      => array('uid')
+      'uid'      => array('uid'),
       ),
     );
 
Index: modules/profile/profile.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.install,v
retrieving revision 1.11
diff -u -r1.11 profile.install
--- modules/profile/profile.install	10 Oct 2007 11:39:33 -0000	1.11
+++ modules/profile/profile.install	3 Nov 2007 20:29:20 -0000
@@ -136,9 +136,9 @@
         'description' => t('The value for the field.'),
       ),
     ),
+    'primary key' => array('uid', 'fid'),
     'indexes' => array(
       'fid' => array('fid'),
-      'uid' => array('uid')
     ),
   );
 
Index: modules/statistics/statistics.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.install,v
retrieving revision 1.11
diff -u -r1.11 statistics.install
--- modules/statistics/statistics.install	12 Oct 2007 14:10:18 -0000	1.11
+++ modules/statistics/statistics.install	3 Nov 2007 20:29:20 -0000
@@ -109,7 +109,10 @@
         'description' => t('Timestamp of when the page was visited.'),
       ),
     ),
-    'indexes' => array('accesslog_timestamp' => array('timestamp')),
+    'indexes' => array(
+      'accesslog_timestamp' => array('timestamp'),
+      'uid' => array('uid'),
+    ),
     'primary key' => array('aid'),
   );
 
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.167
diff -u -r1.167 system.install
--- modules/system/system.install	25 Oct 2007 20:41:16 -0000	1.167
+++ modules/system/system.install	3 Nov 2007 20:29:20 -0000
@@ -528,6 +528,9 @@
         'default' => 0)
       ),
     'primary key' => array('fid'),
+    'indexes' => array(
+      'allow' => array('event', 'hostname', 'timestamp'),
+    ),
     );
 
   $schema['history'] = array(
@@ -550,6 +553,9 @@
         'default' => 0)
       ),
     'primary key' => array('uid', 'nid'),
+    'indexes' => array(
+      array('nid' => 'nid'),
+    ),
     );
   $schema['menu_router'] = array(
     'description' => t('Maps paths to various callbacks (access, page and title)'),
Index: modules/taxonomy/taxonomy.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.install,v
retrieving revision 1.4
diff -u -r1.4 taxonomy.install
--- modules/taxonomy/taxonomy.install	21 Oct 2007 18:59:02 -0000	1.4
+++ modules/taxonomy/taxonomy.install	3 Nov 2007 20:29:20 -0000
@@ -43,7 +43,10 @@
       ),
     ),
     'primary key' => array('tid'),
-    'indexes' => array('vid' => array('vid')),
+    'unique keys' => array(
+      'vid_name' => array('vid', 'name'),
+    ),
+    'indexes' => array('taxonomy_tree' => array('vid', 'weight', 'name')),
   );
 
   $schema['term_hierarchy'] = array(
@@ -66,7 +69,6 @@
     ),
     'indexes' => array(
       'parent' => array('parent'),
-      'tid' => array('tid'),
     ),
     'primary key' => array('tid', 'parent'),
   );
@@ -97,11 +99,10 @@
       ),
     ),
     'indexes' => array(
-      'nid' => array('nid'),
       'vid' => array('vid'),
-      'tid' => array('tid'),
+      'nid' => array('nid'),
     ),
-    'primary key' => array('vid', 'tid', 'nid'),
+    'primary key' => array('tid', 'vid'),
   );
 
   $schema['term_relation'] = array(
@@ -127,8 +128,10 @@
         'description' => t('The {term_data}.tid of the second term in a relationship.'),
       ),
     ),
+    'unique keys' => array(
+      'tid1_tid2' => array('tid1', 'tid2'),
+    ),
     'indexes' => array(
-      'tid1' => array('tid1'),
       'tid2' => array('tid2'),
     ),
     'primary key' => array('trid'),
@@ -157,8 +160,10 @@
         'description' => t('The name of the synonym.'),
       ),
     ),
+    'unique keys' => array(
+      'name_tid' => array('name', 'tid'),
+    ),
     'indexes' => array(
-      'name' => array(array('name', 3)),
       'tid' => array('tid'),
     ),
     'primary key' => array('tsid'),
@@ -249,6 +254,9 @@
       ),
     ),
     'primary key' => array('vid'),
+    'indexes' => array(
+      'list' => array('weight', 'name'),
+    ),
   );
 
   $schema['vocabulary_node_types'] = array(
@@ -268,7 +276,10 @@
         'description' => t('The {node}.type of the node type for which the vocabulary may be used.'),
       ),
     ),
-    'primary key' => array('vid', 'type'),
+    'primary key' => array('type', 'vid'),
+    'indexes' => array(
+      'vid' => array('vid'),
+    ),
   );
 
   return $schema;
Index: modules/upload/upload.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.install,v
retrieving revision 1.3
diff -u -r1.3 upload.install
--- modules/upload/upload.install	10 Oct 2007 11:39:34 -0000	1.3
+++ modules/upload/upload.install	3 Nov 2007 20:29:20 -0000
@@ -61,8 +61,11 @@
         'description' => t('Whether the file should be visibly listed on the node: yes(1) or no(0).'),
       ),
     ),
-    'primary key' => array('fid', 'vid'),
-    'indexes' => array('vid' => array('vid'), 'nid' => array('nid')),
+    'primary key' => array('vid', 'fid'),
+    'indexes' => array(
+      'fid' => array('fid'),
+      'nid' => array('nid'),
+    ),
   );
 
   return $schema;
Index: modules/user/user.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.install,v
retrieving revision 1.2
diff -u -r1.2 user.install
--- modules/user/user.install	10 Oct 2007 11:39:35 -0000	1.2
+++ modules/user/user.install	3 Nov 2007 20:29:20 -0000
@@ -254,7 +254,10 @@
       'access' => array('access'),
       'created' => array('created')
     ),
-    'unique keys' => array('name' => array('name')),
+    'unique keys' => array(
+      'name' => array('name'),
+      'mail' => array('mail'),
+    ),
     'primary key' => array('uid'),
   );
 
@@ -277,6 +280,9 @@
       ),
     ),
     'primary key' => array('uid', 'rid'),
+    'indexes' => array(
+      'rid' => array('rid'),
+    ),
   );
 
   return $schema;