Merge branch 'master' of github.com:rails-sqlserver/activerecord-sqlserver-adapter

Author: metaskills

CHANGELOG

@@ -1,4 +1,9 @@
 
+* 3.0.2
+
+* Fix DSN'less code. [Erik Bryn]
+
+
 * 3.0.1
 
 * Support DSN'less connections. Resolves ticket 38. 

README.rdoc

@@ -150,13 +150,24 @@ If you’d like to contribute a feature or bugfix, thanks! To make sure your fix
 
 Many many people have contributed. If you do not see your name here and it should be let us know. Also, many thanks go out to those that have pledged financial contributions.
 
-* Ken Collins
-* Murray Steele
-* Shawn Balestracci
-* Joe Rafaniello
-* Tom Ward
-
-
+=== Contributers
+Up-to-date list of contributors: http://github.com/rails-sqlserver/activerecord-sqlserver-adapter/contributors
+
+* metaskills (Ken Collins)
+* h-lame (Murray Steele)
+* vegantech
+* cjheath (Clifford Heath)
+* jrafanie (Joe Rafaniello)
+* nerdrew (Andrew Ryan)
+* snowblink (Jonathan Lim)
+* koppen (Jakob Skjerning)
+* ebryn (Erik Bryn)
+* adzap (Adam Meehan)
+* neomindryan (Ryan Findley)
+* jeremydurham (Jeremy Durham)
+
+=== Donators
+http://pledgie.com/campaigns/11630
 
 == License
 

activerecord-sqlserver-adapter.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
   s.name          = "activerecord-sqlserver-adapter"
-  s.version       = "3.0.1"
+  s.version       = "3.0.2"
   s.summary       = "SQL Server 2005 and 2008 Adapter For ActiveRecord."
   s.description   = "SQL Server 2005 and 2008 Adapter For ActiveRecord"
 

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -181,7 +181,7 @@ class SQLServerAdapter < AbstractAdapter
       include Sqlserver::Errors
 
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '3.0.1'.freeze
+      VERSION                     = '3.0.2'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+(\d{4})/
       SUPPORTED_VERSIONS          = [2005,2008].freeze
 
@@ -356,7 +356,7 @@ def connect
                         if config[:dsn].include?(';')
                           driver = odbc::Driver.new.tap do |d|
                             d.name = config[:dsn_name] || 'Driver1'
-                            driver.attrs = dsn.split(';').map{ |atr| atr.split('=') }.reject{ |kv| kv.size != 2 }.inject({}){ |h,kv| k,v = kv ; h[k] = v ; h }
+                            d.attrs = config[:dsn].split(';').map{ |atr| atr.split('=') }.reject{ |kv| kv.size != 2 }.inject({}){ |h,kv| k,v = kv ; h[k] = v ; h }
                           end
                           odbc::Database.new.drvconnect(driver)
                         else