Merge pull request afair#11 from gocardless/v0.5-rails-4.0-fixes

V0.5 rails 4.0 fixes
abak-press · Jun 9, 2014 · efe956d · efe956d
2 parents a939533 + 40abf5c
commit efe956d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/active_record/connection_adapters/postgresql/get_type_map.rb b/active_record/connection_adapters/postgresql/get_type_map.rb
@@ -3,7 +3,11 @@ module ActiveRecord
     module ConnectionAdapters
       module PostgreSQL
         def get_type_map
-          type_map
+          if Rails::VERSION::MAJOR == 4 && Rails::VERSION::MINOR == 0
+            ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::TYPE_MAP
+          else
+            type_map
+          end
         end
       end
     end

diff --git a/lib/postgresql_cursor.rb b/lib/postgresql_cursor.rb
@@ -8,5 +8,5 @@
 require 'active_record'
 require 'active_record/connection_adapters/postgresql_adapter'
 ActiveRecord::Base.extend(PostgreSQLCursor::ActiveRecord::SqlCursor)
-ActiveRecord::Relation.include(PostgreSQLCursor::ActiveRecord::Relation::CursorIterators)
-ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include(PostgreSQLCursor::ActiveRecord::ConnectionAdapters::PostgreSQLTypeMap)
+ActiveRecord::Relation.send(:include, PostgreSQLCursor::ActiveRecord::Relation::CursorIterators)
+ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send(:include, PostgreSQLCursor::ActiveRecord::ConnectionAdapters::PostgreSQLTypeMap)
diff --git a/lib/postgresql_cursor/active_record/connection_adapters/postgresql_type_map.rb b/lib/postgresql_cursor/active_record/connection_adapters/postgresql_type_map.rb
@@ -5,7 +5,11 @@ module ConnectionAdapters
       module PostgreSQLTypeMap
         # Returns the private "type_map" needed for the cursor operation
         def get_type_map # :nodoc:
-          type_map
+          if Rails::VERSION::MAJOR == 4 && Rails::VERSION::MINOR == 0
+            ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::TYPE_MAP
+          else
+            type_map
+          end
         end
       end
     end