Allow TinyTDS/DBLIB mode to pass down :host/:port config options. Pre…

…pare for 3.0.13 release.
C3 · Apr 15, 2011 · ffab38d · ffab38d
1 parent e739fba
commit ffab38d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,9 @@
 
+* 3.0.13 *
+
+* Allow TinyTDS/DBLIB mode to pass down :host/:port config options.
+
+
 * 3.0.12 *
 
 * Bug fix for previous TinyTDS lost connections.

diff --git a/activerecord-sqlserver-adapter.gemspec b/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.12"
+  s.version       = "3.0.13"
   s.summary       = "SQL Server 2005 and 2008 Adapter For ActiveRecord."
   s.description   = "SQL Server 2005 and 2008 Adapter For ActiveRecord"
 

diff --git a/lib/active_record/connection_adapters/sqlserver_adapter.rb b/lib/active_record/connection_adapters/sqlserver_adapter.rb
@@ -165,7 +165,7 @@ class SQLServerAdapter < AbstractAdapter
       include Sqlserver::Errors
 
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '3.0.12'.freeze
+      VERSION                     = '3.0.13'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+"?(\d{4}|\w+)"?/
       SUPPORTED_VERSIONS          = [2005,2008,2010,2011].freeze
 
@@ -365,6 +365,8 @@ def connect
                         encoding = config[:encoding].present? ? config[:encoding] : nil
                         TinyTds::Client.new({ 
                           :dataserver    => config[:dataserver],
+                          :host          => config[:host],
+                          :port          => config[:port],
                           :username      => config[:username],
                           :password      => config[:password],
                           :database      => config[:database],