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

Gem mysql2 + port for test environment

Browse source
This commit is contained in:
ms32035 2014-03-13 23:50:46 +01:00
parent 3d33881897
commit e5c2cac42a
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/models/agent.rb
View file

@ -128,8 +128,7 @@ class Agent < ActiveRecord::Base
if keep_events_for == 0
events.update_all :expires_at => nil
else
#events.update_all "expires_at = DATE_ADD(`created_at`, INTERVAL #{keep_events_for.to_i} DAY)"
events.update_all "expires_at = " + rdbms_date_add("created_at","DAY",keep_events_for.to_i)
events.update_all "expires_at = " + rdbms_date_add("created_at", "DAY", keep_events_for.to_i)
end
end

1
config/database.yml
View file

@ -21,6 +21,7 @@ test:
socket: <%= ENV['DATABASE_SOCKET'] || ["/var/run/mysqld/mysqld.sock", "/opt/local/var/run/mysql5/mysqld.sock", "/tmp/mysql.sock"].find{ |path| File.exist? path } %>
encoding: <%= ENV['DATABASE_ENCODING'] || "utf8" %>
reconnect: <%= ENV['DATABASE_RECONNECT'] || "true" %>
port: <%= ENV['DATABASE_PORT'] || "" %>
pool: <%= ENV['DATABASE_POOL'] || "5" %>
production:

2
lib/rdbms_functions.rb
View file

@ -2,7 +2,7 @@ module RDBMSFunctions
def rdbms_date_add(source, unit, amount)
adapter_type = connection.adapter_name.downcase.to_sym
case adapter_type
when :mysql
when :mysql, :mysql2
"DATE_ADD(`#{source}`, INTERVAL #{amount} #{unit})"
when :postgresql
"(#{source} + INTERVAL '#{amount} #{unit}')"