minus5_mssql 0.2.0 → 0.2.1

data/lib/minus5_mssql/adapter.rb

@@ -46,7 +46,6 @@ module Minus5
       def execute(sql)
         @connection.execute(sql)
       rescue TinyTds::Error => e
-        print "execute error #{e}\n"
         connect
         execute(sql)
       end
@@ -75,7 +74,7 @@ module Minus5
           return results if results[0].kind_of?(Hash)
           data = {} #parent indexed by primary_key
           results[0].each{ |row| data[row[options[:primary_key]]] = row }
-          options[:relations].each_with_index do |relation, index|index
+          options[:relations].each_with_index do |relation, index|
             result = results[index+1] #child result
             result.each do |row|
               #find parent row by foreign key and insert child row in collection
@@ -109,21 +108,42 @@ module Minus5
             create table #{schema}.#{table} (#{columns_def})
         SQL
       end
-      private
 
+      def host
+        return @params[:host]
+      end
+      private
+      
       def connect
-        #print "connecting to #{@params[:host]} "
+        if mirror_defined? 
+          unless (connect! rescue false)
+            to_mirror 
+            connect!
+          end
+        else
+          connect!
+        end
+      end
+
+      #raises error on failed connection
+      def connect!
         @connection = TinyTds::Client.new(@params)
-        #print "successful\n"
-      rescue TinyTds::Error => e
-        raise unless @params[:mirror_host]
-        #print "#{e.to_s}\n"
-        to_mirror
-        connect
+        on_connect
+        true
+      end
+
+      def on_connect
+        execute "set ANSI_NULLS on"
+        execute "set ANSI_WARNINGS on"
+      end
+
+      def mirror_defined?
+        !@params[:mirror_host].nil?
       end
 
       # Switch host and mirror_host in @params
       def to_mirror
+        return unless mirror_defined?
         host = @params[:host]
         @params[:host] = @params[:mirror_host]
         @params[:mirror_host] = host

data/test/test_db_mirroring.rb

@@ -44,13 +44,16 @@ class DbMirroring < Test::Unit::TestCase
     end
   end
 
-  def test_read
+  def test_mirror_failovering
     rows = @reader.read
+    first_server = server_name
     data_test rows
-    pp rows
     @reader.failover
     rows = @reader.read
+    second_server = server_name
     data_test rows
+    assert second_server != first_server
+    print "\nfailovering from #{first_server} to #{second_server}\n"
   end
 
   def data_test(rows)
@@ -61,6 +64,10 @@ class DbMirroring < Test::Unit::TestCase
 
   private
 
+  def server_name
+    @reader.select_value "select @@servername"
+  end
+
   def setup_table
     @reader.execute "
     if not exists(select * from sys.objects where name = 'people')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: minus5_mssql
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Igor Anic
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-05 00:00:00 +02:00
+date: 2011-07-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency