Merge pull request #24 from zerebubuth/routing-merge

[rails.git] / config / initializers / postgresql_adapter.rb

diff --git a/config/initializers/postgresql_adapter.rb b/config/initializers/postgresql_adapter.rb
index 012e401d2436478ccbc4d07daefb777c3bc83dda..9dcc34fcc05e0706fb2400dec008068cff458b56 100644 (file)
--- a/config/initializers/postgresql_adapter.rb
+++ b/config/initializers/postgresql_adapter.rb
@@ -2,7 +2,7 @@ if defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
   module ActiveRecord
     module ConnectionAdapters
       class PostgreSQLAdapter
-        def initialize_type_map_with_enums
+        def initialize_type_map_with_enums(type_map)
           OID.alias_type "format_enum", "text"
           OID.alias_type "gpx_visibility_enum", "text"
           OID.alias_type "note_status_enum", "text"
@@ -11,7 +11,7 @@ if defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
           OID.alias_type "user_role_enum", "text"
           OID.alias_type "user_status_enum", "text"
 
-          initialize_type_map_without_enums
+          initialize_type_map_without_enums(type_map)
         end
 
         alias_method_chain :initialize_type_map, :enums