Support DSN'less connections. Resolves ticket 38.

rails-sqlserver · Sep 14, 2010 · a99c5f9 · a99c5f9 · roelofb · Sep 20, 2010
1 parent ed79da8
commit a99c5f9
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/lib/active_record/connection_adapters/sqlserver_adapter.rb b/lib/active_record/connection_adapters/sqlserver_adapter.rb
@@ -353,7 +353,15 @@ def connect
         @connection = case @connection_options[:mode]
                       when :odbc
                         odbc = ['::ODBC','::ODBC_UTF8','::ODBC_NONE'].detect{ |odbc_ns| odbc_ns.constantize rescue nil }.constantize
-                        odbc.connect(config[:dsn], config[:username], config[:password]).tap do |c|
+                        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 }
+                          end
+                          odbc::Database.new.drvconnect(driver)
+                        else
+                          odbc.connect config[:dsn], config[:username], config[:password]
+                        end.tap do |c|
                           if c.respond_to?(:use_time)
                             c.use_time = true
                             c.use_utc = ActiveRecord::Base.default_timezone == :utc