activerecord-mimer 0.0.1 → 0.0.2

data/lib/active_record/connection_adapters/mimer_adapter.rb

@@ -11,16 +11,27 @@ begin
       # Establishes a connection to the database that's used by all Active Record objects
       def self.mimer_connection(config) # :nodoc:
         config = config.symbolize_keys      
+
+        username = config[:username] ? config[:username].to_s : nil
+        password = config[:password] ? config[:password].to_s : nil
+        
         if config.has_key?(:dsn)
           dsn = config[:dsn]
+          conn = ODBC::connect(dsn, username, password)
+          conn.autocommit = true
+          ConnectionAdapters::MimerAdapter.new(conn, [dsn, username, password],logger)
         else
-          raise ActiveRecordError, "No data source name (DSN) specified."
+          driver = config[:driver] ? config[:driver].to_s : "mimer_odbc"
+          unless config.has_key?(:db)
+            raise "No database provided"
+          end
+          db = config[:db].to_s
+          protocol = config[:protocol] ? config[:protocol].to_s : "TCP"
+          host = config[:host] ? config[:host].to_s : "localhost"
+          conn = ODBC::Database.new.drvconnect("DRIVER=#{driver};DATABASE=#{db};UID=#{username};PWD=#{password};PROTOCOL=#{protocol};NODE=#{host}")
+          conn.autocommit = true
+          ConnectionAdapters::MimerAdapter.new(conn, [nil, username, password, db, host, driver, protocol],logger)
         end
-        username = config[:username] ? config[:username].to_s : nil
-        password = config[:password] ? config[:password].to_s : nil
-        conn = ODBC::connect(dsn, username, password)
-        conn.autocommit = true
-        ConnectionAdapters::MimerAdapter.new(conn, [dsn, username, password],logger)
       end
     end
 

data/test/basic_test.rb

@@ -11,7 +11,6 @@ ActiveRecord::Base.establish_connection(:adapter=>'mimer',
                                         :username=>'test_ar',
                                         :password=>'test_ar')
 
-
 ActiveRecord::Schema.define do
   drop_table :authors rescue nil
   

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: activerecord-mimer
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2006-11-08 00:00:00 +01:00
+  version: 0.0.2
+date: 2006-11-09 00:00:00 +01:00
 summary: Mimer support for ActiveRecord.
 require_paths: 
 - lib