=== modified file 'drupal-sanitize-dump.sql'
--- drupal-sanitize-dump.sql	2010-07-22 04:43:34 +0000
+++ drupal-sanitize-dump.sql	2010-07-23 01:58:12 +0000
@@ -10,6 +10,7 @@
 UPDATE project_issue_projects SET mail_digest = 'foo@localhost', mail_copy = 'foo@localhost';
 UPDATE projects SET mail = CONCAT("empty", '@localhost');
 UPDATE simplenews_subscriptions SET mail = CONCAT(snid, '@localhost');
+UPDATE users_access SET access = 280299600;
 
 UPDATE cvs_accounts SET pass = '';
 
@@ -21,6 +22,8 @@
 TRUNCATE cache_menu;
 TRUNCATE cache_page;
 -- TRUNCATE cache_project_release;
+TRUNCATE cache_update;
+TRUNCATE cache_views;
 TRUNCATE devel_queries;
 TRUNCATE devel_times;
 TRUNCATE directory;
@@ -30,20 +33,39 @@
 TRUNCATE search_dataset;
 TRUNCATE search_index;
 TRUNCATE search_total;
+TRUNCATE search_node_links;
 TRUNCATE sessions;
 TRUNCATE watchdog;
 TRUNCATE donations;
 TRUNCATE old_revisions;
+TRUNCATE access;
 
--- Remove sensitive variables
+-- Remove sensitive variables and profile data
 DELETE FROM variable WHERE name = 'drupal_private_key';
 DELETE FROM variable WHERE name LIKE '%key%';
 DELETE FROM profile_values WHERE fid IN (select fid from profile_fields where visibility in (1, 4));
 
--- Remove unpublished
+-- Get rid of unpublished/blocked nodes, users, comments and related data in other tables.
 DELETE FROM node WHERE status <> 1;
 DELETE FROM comments WHERE status <> 0;
+DELETE FROM users WHERE status <> 1 AND uid <> 0;
+DELETE node FROM node LEFT JOIN users ON node.uid = users.uid WHERE users.uid IS NULL;
 DELETE node_revisions FROM node_revisions LEFT JOIN node ON node.nid = node_revisions.nid WHERE node.nid IS NULL;
 DELETE comments FROM comments LEFT JOIN node ON node.nid = comments.nid WHERE node.nid IS NULL;
+DELETE comments FROM comments LEFT JOIN users ON comments.uid = users.uid WHERE users.uid IS NULL;
+DELETE FROM comments WHERE c1.pid NOT IN (SELECT cid FROM comments);
 DELETE project_issue_comments FROM project_issue_comments LEFT JOIN node ON node.nid = project_issue_comments.nid WHERE node.nid IS NULL;
-DELETE FROM users WHERE status <> 1 AND uid <> 0;
+DELETE project_issue_comments FROM project_issue_comments LEFT JOIN comments ON comments.cid = project_issue_comments.cid WHERE comments.cid IS NULL;
+DELETE files FROM files LEFT JOIN users ON files.uid = users.uid WHERE users.uid IS NULL;
+DELETE upload FROM upload LEFT JOIN node ON upload.nid = node.nid WHERE node.nid IS NULL;
+DELETE files FROM files LEFT JOIN upload ON files.fid = upload.fid WHERE upload.fid IS NULL;
+DELETE files FROM files INNER JOIN comment_upload ON files.fid = comment_upload.fid LEFT JOIN comments ON comments.cid = comment_upload.cid WHERE comments.cid IS NULL;
+DELETE comment_upload FROM comment_upload LEFT JOIN comments ON comments.cid = comment_upload.cid WHERE comments.cid IS NULL;
+DELETE image FROM image LEFT JOIN node ON image.nid = node.nid WHERE node.nid IS NULL;
+DELETE image_attach FROM image_attach LEFT JOIN node ON image_attach.nid = node.nid WHERE node.nid IS NULL;
+
+DELETE tracker2_node FROM tracker2_node LEFT JOIN node ON node.nid = tracker2_node.nid WHERE node.nid IS NULL;
+DELETE tracker2_user FROM tracker2_user LEFT JOIN node ON node.nid = tracker2_user.nid WHERE node.nid IS NULL;
+DELETE tracker2_user FROM tracker2_user LEFT JOIN user ON user.uid = tracker2_user.uid WHERE user.uid IS NULL;
+DELETE users_roles FROM users_roles LEFT JOIN users ON users_roles.uid = users.uid WHERE users.uid IS NULL;
+