From: Tom Hughes Date: Thu, 16 Apr 2009 20:40:32 +0000 (+0000) Subject: Cope with MySQL and Postgres. X-Git-Tag: live~7625^2~12 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bb7c4f93e239c6ff6155b09ffe72a090be3af4f0 Cope with MySQL and Postgres. --- diff --git a/app/models/acl.rb b/app/models/acl.rb index 5fb99b9e5..3ff19d35f 100644 --- a/app/models/acl.rb +++ b/app/models/acl.rb @@ -1,13 +1,23 @@ class Acl < ActiveRecord::Base def self.find_by_address(address, options) - self.with_scope(:find => {:conditions => ["inet_aton(?) & netmask = address", address]}) do + self.with_scope(:find => {:conditions => ["#{inet_aton} & netmask = address", address]}) do return self.find(:first, options) end end def self.find_all_by_address(address, options) - self.with_scope(:find => {:conditions => ["inet_aton(?) & netmask = address", address]}) do + self.with_scope(:find => {:conditions => ["#{inet_aton} & netmask = address", address]}) do return self.find(:all, options) end end + +private + + def self.inet_aton + if self.connection.adapter_name == "MySQL" + "inet_aton(?)" + else + "?" + end + end end