merged conflicts

diogob · Jan 3, 2013 · df0cd0d · df0cd0d
2 parents 82f22b9 + 7bc55ae
commit df0cd0d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/activerecord-postgres-hstore.rb b/lib/activerecord-postgres-hstore.rb
@@ -1,4 +1,11 @@
-require "activerecord-postgres-hstore/railties"
+require 'active_support'
+if defined? Rails
+  require "activerecord-postgres-hstore/railties"
+else
+  ActiveSupport.on_load :active_record do
+    require "activerecord-postgres-hstore/activerecord"
+  end
+end
 require "activerecord-postgres-hstore/string"
 require "activerecord-postgres-hstore/hash"
 require "activerecord-postgres-hstore/coder"
diff --git a/lib/activerecord-postgres-hstore/activerecord.rb b/lib/activerecord-postgres-hstore/activerecord.rb
@@ -66,7 +66,7 @@ def destroy_keys! attribute, *keys
       destroy_keys(attribute, *keys).save
     end
 
-    if defined?(Rails) && Rails.version < '3.1.0'
+    if defined? Rails and Rails.version < '3.1.0'
     # This method is replaced for Rails 3 compatibility.
     # All I do is add the condition when the field is a hash that converts the value
     # to hstore format.