Merge pull request #35 from eneagoe/master

Fix for #31
Casecommons · May 9, 2012 · aefc0df · aefc0df
2 parents c17f0f0 + 0156347
commit aefc0df
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/lib/pg_search/multisearch.rb b/lib/pg_search/multisearch.rb
@@ -4,11 +4,11 @@ module Multisearch
 INSERT INTO :documents_table (searchable_type, searchable_id, content, created_at, updated_at)
   SELECT :model_name AS searchable_type,
          :model_table.id AS searchable_id,
-         :current_time AS created_at,
-         :current_time AS updated_at,
          (
            :content_expressions
-         ) AS content
+         ) AS content,
+         :current_time AS created_at,
+         :current_time AS updated_at
   FROM :model_table
 SQL
 

diff --git a/spec/pg_search/multisearch_spec.rb b/spec/pg_search/multisearch_spec.rb
@@ -37,11 +37,11 @@
 INSERT INTO #{PgSearch::Document.quoted_table_name} (searchable_type, searchable_id, content, created_at, updated_at)
   SELECT #{connection.quote(model.name)} AS searchable_type,
          #{model.quoted_table_name}.id AS searchable_id,
-         #{connection.quote(connection.quoted_date(now))} AS created_at,
-         #{connection.quote(connection.quoted_date(now))} AS updated_at,
          (
            coalesce(#{model.quoted_table_name}.title, '')
-         ) AS content
+         ) AS content,
+         #{connection.quote(connection.quoted_date(now))} AS created_at,
+         #{connection.quote(connection.quoted_date(now))} AS updated_at
   FROM #{model.quoted_table_name}
 SQL
 
@@ -60,11 +60,11 @@
 INSERT INTO #{PgSearch::Document.quoted_table_name} (searchable_type, searchable_id, content, created_at, updated_at)
   SELECT #{connection.quote(model.name)} AS searchable_type,
          #{model.quoted_table_name}.id AS searchable_id,
-         #{connection.quote(connection.quoted_date(now))} AS created_at,
-         #{connection.quote(connection.quoted_date(now))} AS updated_at,
          (
            coalesce(#{model.quoted_table_name}.title, '') || ' ' || coalesce(#{model.quoted_table_name}.content, '')
-         ) AS content
+         ) AS content,
+         #{connection.quote(connection.quoted_date(now))} AS created_at,
+         #{connection.quote(connection.quoted_date(now))} AS updated_at
   FROM #{model.quoted_table_name}
 SQL