lib/database_url.rb in database_url-0.1.1 vs lib/database_url.rb in database_url-0.1.2

@@ -4,10 +4,16 @@
 require 'cgi'
 
 module DatabaseUrl
   class << self
     def to_active_record_hash(url = nil)
-      to_hash ACTIVE_RECORD_FIELD_MAP, url
+      result_hash = to_hash ACTIVE_RECORD_FIELD_MAP, url
+
+      if result_hash[:adapter] == 'mysql2'
+        result_hash[:username] = result_hash.delete(:user)
+      end
+
+      result_hash
     end
 
     def to_active_record_url(hash)
       to_url ACTIVE_RECORD_FIELD_MAP, hash
     end