dohmysql 0.2.21 → 0.2.22

data/lib/doh/mysql/cache_connector.rb

@@ -27,7 +27,7 @@ class CacheConnector
 private
   def close_handle(msg)
     return unless @handle
-    dohlog.debug("closing previous database connection - #{msg}")
+    DohDb.logger.call('debug', "closing previous database connection - #{msg}")
     @handle.close
     @handle = nil
   end

data/lib/doh/mysql/handle.rb

@@ -18,6 +18,7 @@ class Handle
     @config = config
     @testing_rollback = false
     log_config = @config.dup
+    @config[:reconnect] = true if !@config.keys.include?(:reconnect)
     log_config.delete(:password)
     DohDb.logger.call('connection', "creating connection with config: #{log_config}")
     @mysqlh = Mysql2::Client.new(@config)
@@ -26,9 +27,12 @@ class Handle
 
   def close
     unless closed?
-      DohDb.logger.call('connection', "closing connection: id #{@mysqlh.thread_id}")
-      @mysqlh.close
-      @mysqlh = nil
+      begin
+        DohDb.logger.call('connection', "closing connection: id #{@mysqlh.thread_id}")
+        @mysqlh.close
+      ensure
+        @mysqlh = nil
+      end
     end
   end
 
@@ -182,6 +186,7 @@ private
     @mysqlh.query(sqlstr)
   rescue Exception => excpt
     DohDb.logger.call('error', "caught exception #{excpt.message} during query: #{sqlstr}")
+    close
     raise
   end
 

data/test/connector_instance.dt.rb

@@ -17,7 +17,6 @@ class Test_ConnectorInstance < DohTest::TestGroup
     assert_equal(nil, Doh.db.select_optional_field("SELECT money FROM #{tbl} WHERE id = 7"))
     assert_raises(UnexpectedQueryResult) {Doh.db.select_field("SELECT money FROM #{tbl} WHERE id = 7")}
     assert_equal(1, Doh.db.update_row("UPDATE #{tbl} SET money = 10.95 WHERE id = 1"))
-    assert_raises(Mysql2::Error){Doh.db.query("some invalid sql here")}
     # TODO: re-enable
     # assert(DohTest::pop_error)
     assert_raises(UnexpectedQueryResult) {Doh.db.update_row("UPDATE #{tbl} SET money = 10.95 WHERE id = 7")}
@@ -27,6 +26,7 @@ class Test_ConnectorInstance < DohTest::TestGroup
     assert_equal(1, onerow['id'])
     rows = Doh.db.select("SELECT * FROM #{tbl}")
     rows.each {|row| assert(row['id'] != 0)}
+    assert_raises(Mysql2::Error){Doh.db.query("some invalid sql here")}
   end
 end
 

data/test/handle.dt.rb

@@ -53,8 +53,17 @@ class Test_Handle < DohTest::TestGroup
     dbh.query("CREATE TEMPORARY TABLE #{tbl} (value INT KEY)")
     hash1 = {'value' => 1}
     assert_equal(0, dbh.insert_hash(hash1, tbl))
-    assert_raises(Mysql2::Error) { dbh.insert_hash(hash1, tbl) }
     assert_equal(0, dbh.insert_ignore_hash(hash1, tbl))
+    assert_raises(Mysql2::Error) { dbh.insert_hash(hash1, tbl) }
+  end
+
+  def test_bad_handle_reconnect
+    dbh = get_dbh
+    begin
+      Timeout.timeout(0.001) { Doh.db.select_field("SELECT SLEEP(1), 0 FROM mysql.user GROUP BY 2") }
+    rescue => _
+    end
+    assert_equal(3, Doh.db.select_field("SELECT 3 FROM mysql.user GROUP BY 1"))
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohmysql
 version: !ruby/object:Gem::Version
-  version: 0.2.21
+  version: 0.2.22
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohroot