--- /tmp/privatemsg/privatemsg.install	2010-08-09 21:26:52.000000000 +0200
+++ privatemsg.install	2011-04-03 22:06:17.000000000 +0200
@@ -215,6 +215,11 @@ function privatemsg_update_6000() {
         'default' => 0
       ),
     ),
+    'indexes'=> array(
+		      'mid'               => array('mid'),
+		      'thread_id'         => array('thread_id'),
+		      'uid'         => array('uid'),
+		      ),
   );
 
   $schema['pm_message'] = array(
@@ -252,11 +257,6 @@ function privatemsg_update_6000() {
       ),
     ),
     'primary key'     => array('mid'),
-    'indexes'         => array(
-      'author'            => array('author'),
-      'subject'           => array(array('subject', 20)),
-      'timestamp'         => array('timestamp'),
-    ),
   );
   $ret = array();
 
@@ -291,89 +291,66 @@ function privatemsg_update_6000() {
   // Step 2: Get the data
 
   // Step 2a: get the folder/tagging data first.
-  if (db_table_exists('privatemsg_folder')) {
-    $data = db_query("SELECT * FROM {privatemsg_folder}");
-    while ($result = db_fetch_array($data)) {
-      if (db_result(db_query("SELECT COUNT(*) FROM {pm_tags} WHERE tag = '%s'", $result['name'])) == 0) {
-        db_query("INSERT INTO {pm_tags} (tag) VALUES ('%s')", $result['name']);
-      }
-    }
-  }
+  db_query("INSERT INTO {pm_tags} (tag)  SELECT DISTINCT name FROM {privatemsg_folder} " ) ;
 
   // Step 2b: Next, copy the user blocking data.
   if (db_table_exists('privatemsg_block_user')) {
-    $data = db_query("SELECT * FROM {privatemsg_block_user}");
-    while ($result = db_fetch_array($data)) {
-      db_query("INSERT INTO {pm_block_user} (author, recipient) VALUES ( %d, %d )", $result['author'], $result['recipient']);
-    }
+    db_query("INSERT INTO {pm_block_user} (author, recipient) SELECT author, recipient FROM privatemsg_block_user" ) ;
   }
 
   // Step 2c: Next the data from the archive table - notice all these messages have been deleted both by the author and the recipient.
+  
   if (db_table_exists('privatemsg_archive')) {
-    $data = db_query("SELECT * FROM {privatemsg_archive}");
-    while ($result = db_fetch_array($data)) {
-      if ($result['thread'] == 0) {
-        $result['thread_id'] = $result['id'];
-      }
-      else{
-        $result['thread_id'] = 0;
-      }
-      if ($result['author'] <> $result['recipient']) {
-        db_query("INSERT INTO {pm_message} (mid, author, subject, body, timestamp) VALUES ( %d, %d, '%s', '%s', %d )", $result['id'], $result['author'], $result['subject'], $result['message'], $result['timestamp']);
-        db_query("INSERT INTO {temp_pm_index} (mid, thread, folder, thread_id, uid, is_new, deleted) VALUES ( %d, %d, %d, %d, %d, %d, %d )", $result['id'], $result['thread'], $result['folder'], $result['thread_id'], $result['recipient'], 0, 1);
-      }
-      db_query("INSERT INTO {temp_pm_index} (mid, thread, folder, thread_id, uid, is_new, deleted) VALUES ( %d, %d, %d, %d, %d, %d, %d )", $result['id'], $result['thread'], 0, $result['thread_id'], $result['author'], 0, 1);
-    }
+    
+    db_query("INSERT INTO {pm_message} (mid, author, subject, body, timestamp) SELECT id,author,subject,message,timestamp FROM {privatemsg_archive} WHERE author<>recipient")  ;
+    db_query("INSERT INTO {temp_pm_index} (mid, thread, folder, thread_id, uid, is_new, deleted) SELECT id, thread, folder, id, recipient, newmsg, recipient_del FROM {privatemsg_archive} WHERE thread=0" );
+    db_query("INSERT INTO {temp_pm_index} (mid, thread, folder, thread_id, uid, is_new, deleted) SELECT id, thread, folder, 0, recipient, newmsg, recipient_del FROM {privatemsg_archive} WHERE thread<>0");
+    db_query("INSERT INTO {temp_pm_index} (mid, thread, folder, thread_id, uid, is_new, deleted) SELECT id,thread,0,id,author,0, author_del  FROM {privatemsg_archive} WHERE thread=0") ;
+    db_query("INSERT INTO {temp_pm_index} (mid, thread, folder, thread_id, uid, is_new, deleted) SELECT id,thread,0,0,author,0,author_del FROM {privatemsg_archive} WHERE thread<>0") ;
+
   }
 
   // Step 2d: Finally, get the data from the privatemsg table.
   if (db_table_exists('privatemsg')) {
-    $data = db_query("SELECT * FROM {privatemsg}");
-    while ($result = db_fetch_array($data)) {
-      if ($result['thread'] == 0) {
-        $result['thread_id'] = $result['id'];
-      }
-      else{
-        $result['thread_id'] = 0;
-      }
-      if ($result['author'] <> $result['recipient']) {
-        db_query("INSERT INTO {pm_message} (mid, author, subject, body, timestamp) VALUES ( %d, %d, '%s', '%s', %d )", $result['id'], $result['author'], $result['subject'], $result['message'], $result['timestamp']);
-        db_query("INSERT INTO {temp_pm_index} (mid, thread, folder, thread_id, uid, is_new, deleted) VALUES ( %d, %d, %d, %d, %d, %d, %d )", $result['id'], $result['thread'], $result['folder'], $result['thread_id'], $result['recipient'], $result['newmsg'], $result['recipient_del']);
-      }
-      db_query("INSERT INTO {temp_pm_index} (mid, thread, folder, thread_id, uid, is_new, deleted) VALUES ( %d, %d, %d, %d, %d, %d, %d )", $result['id'], $result['thread'], 0, $result['thread_id'], $result['author'], 0, $result['author_del']);
-    }
+
+    db_query("INSERT INTO {pm_message} (mid, author, subject, body, timestamp) SELECT id,author,subject,message,timestamp FROM {privatemsg} WHERE author<>recipient")  ;
+    db_query("INSERT INTO {temp_pm_index} (mid, thread, folder, thread_id, uid, is_new, deleted) SELECT id, thread, folder, id, recipient, newmsg, recipient_del FROM {privatemsg} WHERE thread=0" );
+    db_query("INSERT INTO {temp_pm_index} (mid, thread, folder, thread_id, uid, is_new, deleted) SELECT id, thread, folder, 0, recipient, newmsg, recipient_del FROM {privatemsg} WHERE thread<>0");
+    db_query("INSERT INTO {temp_pm_index} (mid, thread, folder, thread_id, uid, is_new, deleted) SELECT id,thread,0,id,author,0, author_del  FROM {privatemsg} WHERE thread=0") ;
+    db_query("INSERT INTO {temp_pm_index} (mid, thread, folder, thread_id, uid, is_new, deleted) SELECT id,thread,0,0,author,0,author_del FROM {privatemsg} WHERE thread<>0") ;
+
   }
 
   // Step 3: Process the Data.
-  // Step 3a: Fix the thread data.
-  $data = db_query("SELECT thread, MIN(mid) as new_thread FROM {temp_pm_index} WHERE thread_id = %d GROUP BY thread", 0);
-  while ($result = db_fetch_array($data)) {
-    db_query("UPDATE {temp_pm_index} SET thread_id = %d WHERE thread = %d", $result['new_thread'], $result['thread']);
-  }
+  // Step 3a: Fix the thread dat
+  db_query("DROP TABLE IF EXISTS {temptable}") ;
+  db_query("CREATE TABLE temptable select thread, min(mid) as mid  FROM temp_pm_index where thread_id=0 group by thread" ) ;
+  db_query("create index t2 on temptable ( thread) ") ; 
+  db_query("create index t1 on temp_pm_index ( thread_id)" ) ; 
+  db_query("create index t2 on temp_pm_index ( thread)" ) ;
+
+  db_query("UPDATE temp_pm_index i, temptable t SET i.thread_id=t.mid WHERE i.thread_id=0 and i.thread=t.thread ");
 
   // Step 3b: Fix and import the tagging data.
-  $data = db_query("SELECT thread_id, folder, uid FROM {temp_pm_index} WHERE folder <> %d", 0);
-  while ($result = db_fetch_array($data)) {
-    $tag_id = db_result(db_query('SELECT pmt.tag_id FROM {pm_tags} pmt INNER JOIN {privatemsg_folder} pmf ON pmt.tag = pmf.name WHERE pmf.fid = %d', $result['folder']));
-    if (db_result(db_query("SELECT COUNT(*) FROM {pm_tags_index} WHERE uid = %d AND (thread_id = %d AND tag_id = %d)", $result['uid'], $result['thread_id'], $tag_id)) == 0) {
-      db_query("INSERT INTO {pm_tags_index} (uid, tag_id, thread_id) VALUES (%d, %d, %d)", $result['uid'], $tag_id, $result['thread_id']);
-    }
-  }
+  db_query("INSERT INTO {pm_tags_index} SELECT distinct pmf.uid, t.tag_id, thread_id FROM {pm_tags} t INNER JOIN {privatemsg_folder} pmf ON t.tag = pmf.name, temp_pm_index tmp WHERE pmf.fid =tmp.folder  and tmp.folder<>0" )  ;
 
   // Step 3c: Copy the index data.
-  $data = db_query("SELECT * FROM {temp_pm_index}");
-  while ($result = db_fetch_array($data)) {
-    db_query("INSERT INTO {pm_index} (mid, thread_id, uid, is_new, deleted) VALUES ( %d, %d, %d, %d, %d )", $result['mid'], $result['thread_id'], $result['uid'], $result['is_new'], $result['deleted']);
-  }
+  db_query("INSERT INTO {pm_index} (mid, thread_id, uid, is_new, deleted) SELECT mid, thread_id, uid, is_new, deleted FROM {temp_pm_index}  " ) ;
 
   // Step 4: Clean up.
-  db_drop_table($ret, 'privatemsg');
-  db_drop_table($ret, 'privatemsg_archive');
-  db_drop_table($ret, 'privatemsg_folder');
-  if (db_table_exists('privatemsg_block_user')) {
-    db_drop_table($ret, 'privatemsg_block_user');
+
+  if ( 1==2 ) { 
+    db_drop_table($ret, 'privatemsg');
+    db_drop_table($ret, 'privatemsg_archive');
+    db_drop_table($ret, 'privatemsg_folder');
+    if (db_table_exists('privatemsg_block_user')) {
+      db_drop_table($ret, 'privatemsg_block_user');
+    }
+    db_drop_table($ret, 'temp_pm_index');
+    if (db_table_exists('temptable')) {
+      db_drop_table($ret, 'temptable');
+    }
   }
-  db_drop_table($ret, 'temp_pm_index');
 
   return $ret;
 }
@@ -424,8 +401,8 @@ function privatemsg_update_6003() {
   $ret = array();
   // Find messages that have aformentioned problem
   $sql = "SELECT DISTINCT p1.mid, p1.uid FROM {pm_index} p1 INNER JOIN {pm_index} p2 ON p1.thread_id = p2.thread_id AND p1.mid = p2.mid INNER JOIN {pm_message} pm ON p1.uid = pm.author AND p2.uid = pm.author WHERE p1.is_new <> p2.is_new";
-  $result = db_query($sql);
-  while ($row = db_fetch_object($result)) {
+  //$result = db_query($sql);
+  while (0 && $row = db_fetch_object($result)) {
       privatemsg_message_change_status($row->mid, PRIVATEMSG_READ, $row );
   }
   $ret[] = array('success' => $result !== FALSE, 'query' => check_plain($sql));
@@ -500,4 +477,4 @@ function privatemsg_update_6007() {
   db_add_index($ret, 'pm_index', 'participants', array('thread_id', 'uid', 'deleted'));
 
   return $ret;
-}
\ No newline at end of file
+}