diff options
author | Heiko Bernloehr <Heiko.Bernloehr@FreeIT.de> | 2017-03-08 20:52:50 +0100 |
---|---|---|
committer | Heiko Bernloehr <Heiko.Bernloehr@FreeIT.de> | 2017-03-08 20:52:50 +0100 |
commit | 1ad24d1c8f77d2b4b78f692a490e9581d5831df8 (patch) | |
tree | 84728e4bacced15db21390ea36fbeee13c1cf18f | |
parent | e58bba4f79ef3030751223fe3782c386beb4260c (diff) | |
download | ecs-1ad24d1c8f77d2b4b78f692a490e9581d5831df8.tar.gz ecs-1ad24d1c8f77d2b4b78f692a490e9581d5831df8.zip |
Change find expression to Arel syntax.
-rw-r--r-- | app/models/message.rb | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/app/models/message.rb b/app/models/message.rb index ed74835..742a9c1 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -127,13 +127,12 @@ class Message < ActiveRecord::Base # return first messages from fifo/lifo queue def self.fifo_lifo_rest(namespace, ressource, participant_id, options={:queue_type => :fifo}) - m=find(:all, :readonly => false, :lock => true, - :select => "messages.id", - :joins => [:ressource, { :membership_messages => { :membership => :participant } }], - :conditions => { :participants => { :id => participant_id }, - :ressources => { :namespace => namespace, :ressource => ressource } }, - :order => :messages.to_s+".id #{(options[:queue_type]==:fifo)?'ASC':'DESC'}") - if m.empty? then nil else find(m[0]) end + m = all.readonly(false).select(:id). + joins(:ressource, :membership_messages => { :membership => :participant }). + where(:participants => { :id => participant_id }, + :ressources => { :namespace => namespace, :ressource => ressource }). + order(:messages.to_s+".id " + ((options[:queue_type]==:fifo)?'ASC':'DESC')). + first end # get a record out of the message table |