aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeb Bacon <seb.bacon@gmail.com>2011-07-25 09:31:56 +0100
committerRobin Houston <robin.houston@gmail.com>2011-07-26 16:27:28 +0100
commitf74954ae7b4e21a5c4d0c82340967cba73da90c6 (patch)
treef3289eb530d1e442061de09436e63b3ff973f8f5
parentce2bd095d9c40e073f08f63102786ddb62203eac (diff)
Don't bother stripping whitespace when checking old requests: it's an expensive operation with a relatively small benefit.
-rw-r--r--app/models/info_request.rb9
1 files changed, 1 insertions, 8 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 3d8069d67..f296c0ad1 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -347,14 +347,7 @@ public
# XXX this *should* also check outgoing message joined to is an initial
# request (rather than follow up)
def InfoRequest.find_by_existing_request(title, public_body_id, body)
- # XXX can add other databases here which have regexp_replace
- if ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
- # Exclude spaces from the body comparison using regexp_replace
- return InfoRequest.find(:first, :conditions => [ "title = ? and public_body_id = ? and regexp_replace(outgoing_messages.body, '[[:space:]]', '', 'g') = regexp_replace(?, '[[:space:]]', '', 'g')", title, public_body_id, body ], :include => [ :outgoing_messages ] )
- else
- # For other databases (e.g. SQLite) not the end of the world being space-sensitive for this check
- return InfoRequest.find(:first, :conditions => [ "title = ? and public_body_id = ? and outgoing_messages.body = ?", title, public_body_id, body ], :include => [ :outgoing_messages ] )
- end
+ return InfoRequest.find(:first, :conditions => [ "title = ? and public_body_id = ? and outgoing_messages.body = ?", title, public_body_id, body ], :include => [ :outgoing_messages ] )
end
def find_existing_outgoing_message(body)