moved require of database driver out of railtie so support non-rails …

…environments
diogob · Jan 3, 2013 · 3170c2c · 3170c2c
1 parent 87b7be2
commit 3170c2c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/lib/activerecord-postgres-hstore.rb b/lib/activerecord-postgres-hstore.rb
@@ -1,4 +1,11 @@
 require 'active_support'
+
+if RUBY_PLATFORM == "jruby"
+  require 'activerecord-jdbcpostgresql-adapter'
+else
+  require 'pg'
+end
+
 if defined? Rails
   require "activerecord-postgres-hstore/railties"
 else

diff --git a/lib/activerecord-postgres-hstore/railties.rb b/lib/activerecord-postgres-hstore/railties.rb
@@ -2,12 +2,6 @@
 require 'rails/generators'
 require 'rails/generators/migration'
 
-if RUBY_PLATFORM == "jruby"
-  require 'activerecord-jdbcpostgresql-adapter'
-else
-  require 'pg'
-end
-
 # = Hstore Railtie
 #
 # Creates a new railtie for 2 reasons: