diff options
| author | Ian Taylor <ian@lorf.org> | 2009-06-05 12:39:04 -0400 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-06-06 09:12:00 +1000 |
| commit | 4f2c066a97e59a89df64af4b25beac6f3f0553c2 (patch) | |
| tree | 126540beec3c65448e01e1b48d27275ec4ee6ea4 /ext/dbfix.sql | |
| parent | 97e6975d69f239e24993315a25a3117b1daa48c3 (diff) | |
| download | puppet-4f2c066a97e59a89df64af4b25beac6f3f0553c2.tar.gz puppet-4f2c066a97e59a89df64af4b25beac6f3f0553c2.tar.xz puppet-4f2c066a97e59a89df64af4b25beac6f3f0553c2.zip | |
Removed extra whitespace from end of lines
Diffstat (limited to 'ext/dbfix.sql')
| -rw-r--r-- | ext/dbfix.sql | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/ext/dbfix.sql b/ext/dbfix.sql index 960369117..3720289b9 100644 --- a/ext/dbfix.sql +++ b/ext/dbfix.sql @@ -1,5 +1,5 @@ -- MySQL DB consistency check/fix --- +-- -- Usage: -- cat dbfix.sql | mysql -u user -p puppet -- @@ -13,11 +13,11 @@ FROM resources AS bad_rows FROM resources GROUP BY title,restype,host_id HAVING count(*) > 1 - ) AS good_rows - ON - good_rows.title = bad_rows.title AND - good_rows.restype = bad_rows.restype AND - good_rows.host_id = bad_rows.host_id AND + ) AS good_rows + ON + good_rows.title = bad_rows.title AND + good_rows.restype = bad_rows.restype AND + good_rows.host_id = bad_rows.host_id AND good_rows.max_id <> bad_rows.id; -- Remove duplicate param_values, and keep the latest one @@ -28,17 +28,17 @@ FROM param_values AS bad_rows FROM param_values GROUP BY value,param_name_id,resource_id HAVING count(*) > 1 - ) AS good_rows - ON - good_rows.value = bad_rows.value AND - good_rows.param_name_id = bad_rows.param_name_id AND - good_rows.resource_id = bad_rows.resource_id AND + ) AS good_rows + ON + good_rows.value = bad_rows.value AND + good_rows.param_name_id = bad_rows.param_name_id AND + good_rows.resource_id = bad_rows.resource_id AND good_rows.max_id <> bad_rows.id; -- rewrite param_values that points to duplicated param_names -- to point to the highest param_name id. -UPDATE - param_values v +UPDATE + param_values v INNER JOIN param_names n ON n.id = v.param_name_id @@ -60,8 +60,8 @@ FROM param_names AS bad_rows FROM param_names GROUP BY name HAVING count(*) > 1 - ) AS good_rows - ON + ) AS good_rows + ON good_rows.name = bad_rows.name AND good_rows.max_id <> bad_rows.id; @@ -73,16 +73,16 @@ FROM resource_tags AS bad_rows FROM resource_tags GROUP BY resource_id,puppet_tag_id HAVING count(*) > 1 - ) AS good_rows - ON + ) AS good_rows + ON good_rows.resource_id = bad_rows.resource_id AND good_rows.puppet_tag_id = bad_rows.puppet_tag_id AND good_rows.max_id <> bad_rows.id; -- rewrite resource_tags that points to duplicated puppet_tags -- to point to the highest puppet_tags id. -UPDATE - resource_tags v +UPDATE + resource_tags v INNER JOIN puppet_tags n ON n.id = v.puppet_tag_id @@ -104,8 +104,8 @@ FROM puppet_tags AS bad_rows FROM puppet_tags GROUP BY name HAVING count(*) > 1 - ) AS good_rows - ON + ) AS good_rows + ON good_rows.name = bad_rows.name AND good_rows.max_id <> bad_rows.id; |
