Merge branch 'master' into openstreetbugs

[rails.git] / app / models / acl.rb

diff --git a/app/models/acl.rb b/app/models/acl.rb
index 5fb99b9e5bfd7bbfeb0f93a3c64da86ee19846f9..3ff19d35f6d8374bba709485641b3080ae62d595 100644 (file)
--- 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)
 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)
       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
       return self.find(:all, options)
     end
   end

+
+private
+
+  def self.inet_aton
+    if self.connection.adapter_name == "MySQL"
+      "inet_aton(?)"
+    else
+      "?"
+    end
+  end

 end
 end