From d8e410f242908e0b9206cb8fbff05259b02a935f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20Sch=C3=B6lling?= <manuel.schoelling@gmx.de>
Date: Sat, 22 Oct 2011 19:53:59 +0200
Subject: [PATCH] Fixed postgre queries as suggested by Pistos

---
 ...12215141_move_photos_to_their_own_table.rb | 51 +++++++++++++++----
 1 file changed, 42 insertions(+), 9 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 63cab1734..33e3d9e55 100644
--- a/db/migrate/20111012215141_move_photos_to_their_own_table.rb
+++ b/db/migrate/20111012215141_move_photos_to_their_own_table.rb
@@ -20,16 +20,49 @@ class MovePhotosToTheirOwnTable < ActiveRecord::Migration
     end
 
     if postgres?
-      execute <<SQL
-INSERT INTO photos
-SELECT id AS tmp_old_id, author_id, public, diaspora_handle, guid, pending, text, remote_photo_path, remote_photo_name, random_string, processed_image,
-created_at, updated_at, unprocessed_image, status_message_guid, comments_count
-FROM posts
-WHERE type = 'Photo'
-SQL
+      execute %{
+INSERT INTO photos (
+tmp_old_id
+, author_id
+, public
+, diaspora_handle
+, guid
+, pending
+, text
+, remote_photo_path
+, remote_photo_name
+, random_string
+, processed_image
+, created_at
+, updated_at
+, unprocessed_image
+, status_message_guid
+, comments_count
+) SELECT
+id
+, author_id
+, public
+, diaspora_handle
+, guid
+, pending
+, text
+, remote_photo_path
+, remote_photo_name
+, random_string
+, processed_image
+, created_at
+, updated_at
+, unprocessed_image
+, status_message_guid
+, comments_count
+FROM
+posts
+WHERE
+type = 'Photo'
+}
 
-      execute "UPDATE aspect_visibilities AS av SET shareable_type='Photo' FROM photos WHERE av.shareable_id=photos.id"
-      execute "UPDATE share_visibilities AS sv SET shareable_type='Photo' FROM photos WHERE sv.shareable_id=photos.id"
+      execute "UPDATE aspect_visibilities SET shareable_type='Photo' FROM photos WHERE shareable_id=photos.id"
+      execute "UPDATE share_visibilities SET shareable_type='Photo' FROM photos WHERE shareable_id=photos.id"
     else
       execute <<SQL
 INSERT INTO photos