GitHub-Mirror/huginn
2
0
Fork 0
mirror of https://github.com/Fishwaldo/huginn.git synced 2025-03-15 19:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Protect the latest event from automatic deletion when using MySQL" (#1993)

Browse source
This commit is contained in:
Andrew Cantino 2017-05-01 14:17:42 +12:00 • committed by GitHub
parent 05f63d32a0
commit 9ad4741212
2 changed files with 3 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/models/event.rb
View file

@ -28,15 +28,6 @@ class Event < ActiveRecord::Base
where("expires_at IS NOT NULL AND expires_at < ?", Time.now)
}
case ActiveRecord::Base.connection
when ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter
# Protect the Event table from InnoDB's AUTO_INCREMENT Counter
# Initialization by always keeping the latest event.
scope :to_expire, -> { expired.where.not(id: maximum(:id)) }
else
scope :to_expire, -> { expired }
end
scope :with_location, -> {
where.not(lat: nil).where.not(lng: nil)
}
@ -81,11 +72,9 @@ class Event < ActiveRecord::Base
# Look for Events whose `expires_at` is present and in the past. Remove those events and then update affected Agents'
# `events_counts` cache columns. This method is called by bin/schedule.rb periodically.
def self.cleanup_expired!
transaction do
affected_agents = Event.to_expire.group("agent_id").pluck(:agent_id)
Event.to_expire.delete_all
Agent.where(id: affected_agents).update_all "events_count = (select count(*) from events where agent_id = agents.id)"
end
affected_agents = Event.expired.group("agent_id").pluck(:agent_id)
Event.expired.delete_all
Agent.where(:id => affected_agents).update_all "events_count = (select count(*) from events where agent_id = agents.id)"
end
protected

14
spec/models/event_spec.rb
View file

@ -118,20 +118,6 @@ describe Event do
Event.cleanup_expired!
expect(Event.find_by_id(event.id)).not_to be_nil
end
it "always keeps the latest Event regardless of its expires_at value only if the database is MySQL" do
Event.delete_all
event1 = agents(:jane_weather_agent).create_event expires_at: 1.minute.ago
event2 = agents(:bob_weather_agent).create_event expires_at: 1.minute.ago
Event.cleanup_expired!
case ActiveRecord::Base.connection
when ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter
expect(Event.all.pluck(:id)).to eq([event2.id])
else
expect(Event.all.pluck(:id)).to be_empty
end
end
end
describe "after destroy" do