verified that DATABASE_URL now works as expected (even with JDBC props)

e.g. `rake db:version DATABASE_URL="mysql://localhost/rails32?prepared_statements=true&cachePrepStmts=true&cacheResultSetMetadata=true&profileSQL=true"`

Author: kares

lib/arjdbc/tasks/databases.rake

@@ -1,7 +1,7 @@
 raise "ArJdbc needs rake 0.9.x or newer" unless Rake.const_defined?(:VERSION)
 
 Rake::DSL.module_eval do
-  
+
   def redefine_task(*args, &block)
     if Hash === args.first
       task_name = args.first.keys[0]
@@ -10,9 +10,9 @@ Rake::DSL.module_eval do
       task_name = args.first; old_prereqs = []
       # args[0] = { task_name => old_prereqs }
     end
-    
+
     full_name = Rake::Task.scope_name(Rake.application.current_scope, task_name)
-    
+
     if old_task = Rake.application.lookup(task_name)
       old_comment = old_task.full_comment
       old_prereqs = old_task.prerequisites.dup if old_prereqs
@@ -25,59 +25,57 @@ Rake::DSL.module_eval do
     else
       # raise "could not find rake task with (full) name '#{full_name}'"
     end
-    
+
     new_task = task(*args, &block)
     new_task.comment = old_comment # if old_comment
     new_task.actions.concat(old_actions) if old_actions
     new_task.prerequisites.concat(old_prereqs) if old_prereqs
     new_task
   end
-  
+
 end
 
 namespace :db do
 
   def rails_env
     defined?(Rails.env) ? Rails.env : ( RAILS_ENV || 'development' )
   end
-  
+
   def adapt_jdbc_config(config)
     return config unless config['adapter']
     config.merge 'adapter' => config['adapter'].sub(/^jdbc/, '')
   end
-  
+
   if defined? ActiveRecord::Tasks::DatabaseTasks # 4.0
-    
+
     def current_config(options = {})
       ActiveRecord::Tasks::DatabaseTasks.current_config(options)
     end
-    
+
   else # 3.x / 2.3
-        
+
     def current_config(options = {}) # not on 2.3
       options = { :env => rails_env }.merge! options
       if options[:config]
         @current_config = options[:config]
       else
-        @current_config ||= 
-          if ENV['DATABASE_URL']
-            database_url_config
-          else
-            ActiveRecord::Base.configurations[options[:env]]
-          end
+        @current_config ||= ENV['DATABASE_URL'] ?
+          database_url_config : ActiveRecord::Base.configurations[options[:env]]
       end
     end
 
     def database_url_config(url = ENV['DATABASE_URL'])
+      # NOTE: ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver
+      # since AR 4.0 that is handled by DatabaseTasks - only care about 2.3/3.x :
       unless defined? ActiveRecord::Base::ConnectionSpecification::Resolver
-        raise "ENV['DATABASE_URL'] not support on AR #{ActiveRecord::VERSION::STRING}"
+        raise "DATABASE_URL not supported on ActiveRecord #{ActiveRecord::VERSION::STRING}"
       end
-      @database_url_config ||=
-        ActiveRecord::Base::ConnectionSpecification::Resolver.new(url, {}).spec.config.stringify_keys
+      resolver = ActiveRecord::Base::ConnectionSpecification::Resolver.new(url, {})
+      resolver.spec.config.stringify_keys
     end
-    
+
   end
-  
+
 end
 
 require 'arjdbc/tasks/database_tasks'