From 982e6f9b6b15400f989b439f8b3e1672d09f5c3a Mon Sep 17 00:00:00 2001
From: Pistos <github.pistos@purepistos.net>
Date: Mon, 17 Oct 2011 10:52:03 -0400
Subject: [PATCH 1/3] Added missing rollback for photo migration.

---
 ...12215141_move_photos_to_their_own_table.rb | 33 +++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/db/migrate/20111012215141_move_photos_to_their_own_table.rb b/db/migrate/20111012215141_move_photos_to_their_own_table.rb
index 0bec98f25..fba0c3fca 100644
--- a/db/migrate/20111012215141_move_photos_to_their_own_table.rb
+++ b/db/migrate/20111012215141_move_photos_to_their_own_table.rb
@@ -48,7 +48,35 @@ INSERT INTO posts
   FROM photos
 SQL
 
-    execute <<SQL
+    if postgres?
+      execute %{
+        UPDATE
+          aspect_visibilities
+        SET
+            shareable_id=posts.id
+          , shareable_type='Post'
+        FROM
+            posts
+          , photos
+        WHERE
+          posts.guid=photos.guid
+          AND photos.id=aspect_visibilities.shareable_id
+        }
+      execute %{
+        UPDATE
+          share_visibilities
+        SET
+            shareable_id=posts.id
+          , shareable_type='Post'
+        FROM
+            posts
+          , photos
+        WHERE
+          posts.guid=photos.guid
+          AND photos.id=share_visibilities.shareable_id
+        }
+    else
+      execute <<SQL
 UPDATE aspect_visibilities, posts, photos
 SET
 aspect_visibilities.shareable_id=posts.id,
@@ -58,7 +86,7 @@ posts.guid=photos.guid AND
 photos.id=aspect_visibilities.shareable_id
 SQL
 
-    execute <<SQL
+      execute <<SQL
 UPDATE share_visibilities, posts, photos
 SET
 share_visibilities.shareable_id=posts.id,
@@ -67,6 +95,7 @@ WHERE
 posts.guid=photos.guid AND
 photos.id=share_visibilities.shareable_id
 SQL
+      end
 
     execute "DROP TABLE photos"
   end

From 424e7369825ee824b3873412dcf46a55e749b630 Mon Sep 17 00:00:00 2001
From: Pistos <github.pistos@purepistos.net>
Date: Mon, 17 Oct 2011 11:53:40 -0400
Subject: [PATCH 2/3] Correct down migration for photo migration under
 PostgreSQL.

---
 ...12215141_move_photos_to_their_own_table.rb | 35 ++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/db/migrate/20111012215141_move_photos_to_their_own_table.rb b/db/migrate/20111012215141_move_photos_to_their_own_table.rb
index fba0c3fca..c4463ba83 100644
--- a/db/migrate/20111012215141_move_photos_to_their_own_table.rb
+++ b/db/migrate/20111012215141_move_photos_to_their_own_table.rb
@@ -40,15 +40,24 @@ SQL
 
 
   def self.down
-    execute <<SQL
-INSERT INTO posts
-  SELECT NULL AS id, author_id, public, diaspora_handle, guid, pending, 'Photo' AS type, text, remote_photo_path, remote_photo_name, random_string,
-    processed_image, NULL AS youtube_titles, created_at, updated_at, unprocessed_image, NULL AS object_url, NULL AS image_url, NULL AS image_height, NULL AS image_width, NULL AS provider_display_name,
-    NULL AS actor_url, NULL AS objectId, NULL AS root_guid, status_message_guid, 0 AS likes_count, comments_count, NULL AS o_embed_cache_id
-  FROM photos
-SQL
-
     if postgres?
+      execute %{
+        INSERT INTO posts (
+          author_id, public, diaspora_handle, guid, pending, type, text,
+          remote_photo_path, remote_photo_name, random_string, processed_image,
+          youtube_titles, created_at, updated_at, unprocessed_image,
+          object_url, image_url, image_height, image_width,
+          provider_display_name, actor_url, "objectId", root_guid,
+          status_message_guid, likes_count, comments_count, o_embed_cache_id
+        ) SELECT
+          author_id, public, diaspora_handle, guid, pending, 'Photo', text,
+          remote_photo_path, remote_photo_name, random_string, processed_image,
+          NULL, created_at, updated_at, unprocessed_image, NULL, NULL, NULL, NULL,
+          NULL, NULL, NULL, NULL,
+          status_message_guid, 0, comments_count, NULL
+        FROM photos
+      }
+
       execute %{
         UPDATE
           aspect_visibilities
@@ -62,6 +71,7 @@ SQL
           posts.guid=photos.guid
           AND photos.id=aspect_visibilities.shareable_id
         }
+
       execute %{
         UPDATE
           share_visibilities
@@ -76,6 +86,15 @@ SQL
           AND photos.id=share_visibilities.shareable_id
         }
     else
+      execute <<SQL
+INSERT INTO posts
+  SELECT NULL AS id, author_id, public, diaspora_handle, guid, pending, 'Photo' AS type, text, remote_photo_path, remote_photo_name, random_string,
+    processed_image, NULL AS youtube_titles, created_at, updated_at, unprocessed_image, NULL AS object_url, NULL AS image_url, NULL AS image_height, NULL AS image_width
+ NULL AS provider_display_name,
+    NULL AS actor_url, NULL AS objectId, NULL AS root_guid, status_message_guid, 0 AS likes_count, comments_count, NULL AS o_embed_cache_id
+  FROM photos
+SQL
+
       execute <<SQL
 UPDATE aspect_visibilities, posts, photos
 SET

From 724c401625028f5a04f1a9b745d332b8dcd57ecd Mon Sep 17 00:00:00 2001
From: Pistos <github.pistos@purepistos.net>
Date: Mon, 17 Oct 2011 13:21:38 -0400
Subject: [PATCH 3/3] Corrected SQL syntax error in MySQL down migration (in
 MovePhotosToTheirOwnTable).

---
 db/migrate/20111012215141_move_photos_to_their_own_table.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/db/migrate/20111012215141_move_photos_to_their_own_table.rb b/db/migrate/20111012215141_move_photos_to_their_own_table.rb
index c4463ba83..77604f756 100644
--- a/db/migrate/20111012215141_move_photos_to_their_own_table.rb
+++ b/db/migrate/20111012215141_move_photos_to_their_own_table.rb
@@ -89,8 +89,7 @@ SQL
       execute <<SQL
 INSERT INTO posts
   SELECT NULL AS id, author_id, public, diaspora_handle, guid, pending, 'Photo' AS type, text, remote_photo_path, remote_photo_name, random_string,
-    processed_image, NULL AS youtube_titles, created_at, updated_at, unprocessed_image, NULL AS object_url, NULL AS image_url, NULL AS image_height, NULL AS image_width
- NULL AS provider_display_name,
+    processed_image, NULL AS youtube_titles, created_at, updated_at, unprocessed_image, NULL AS object_url, NULL AS image_url, NULL AS image_height, NULL AS image_width, NULL AS provider_display_name,
     NULL AS actor_url, NULL AS objectId, NULL AS root_guid, status_message_guid, 0 AS likes_count, comments_count, NULL AS o_embed_cache_id
   FROM photos
 SQL