Merge 297aba9 into 2896ea4

geokit · Jul 27, 2015 · fb83c6d · fb83c6d
2 parents 2896ea4 + 297aba9
commit fb83c6d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/geokit-rails/acts_as_mappable.rb b/lib/geokit-rails/acts_as_mappable.rb
@@ -93,7 +93,10 @@ module ClassMethods
       # A proxy to an instance of a finder adapter, inferred from the connection's adapter.
       def adapter
         @adapter ||= begin
-          require File.join('geokit-rails', 'adapters', connection.adapter_name.downcase)
+          unless Adapters.const_defined?(connection.adapter_name.camelcase)
+            filename = connection.adapter_name.downcase
+            require File.join("geokit-rails", "adapters", filename)
+          end
           klass = Adapters.const_get(connection.adapter_name.camelcase)
           klass.load(self) unless klass.loaded
           klass.new(self)