dohmysql 0.2.13 → 0.2.15

data/lib/doh/mysql/handle.rb

@@ -1,6 +1,6 @@
 require 'mysql2'
 require 'doh/array_to_hash'
-require 'doh/log/stub'
+require 'doh/mysql/logger'
 require 'doh/mysql/error'
 require 'doh/mysql/typed_row_builder'
 require 'doh/mysql/writable_row'
@@ -18,14 +18,14 @@ class Handle
     @config = config
     log_config = @config.dup
     log_config.delete(:password)
-    dohlog.info("creating connection with config: #{log_config}")
+    DohDb.logger.call('connection', "creating connection with config: #{log_config}")
     @mysqlh = Mysql2::Client.new(@config)
-    dohlog.info("new connection created: id #{@mysqlh.thread_id}")
+    DohDb.logger.call('connection', "new connection created: id #{@mysqlh.thread_id}")
   end
 
   def close
     unless closed?
-      dohlog.info("closing connection: id #{@mysqlh.thread_id}")
+      DohDb.logger.call('connection', "closing connection: id #{@mysqlh.thread_id}")
       @mysqlh.close
       @mysqlh = nil
     end
@@ -38,14 +38,14 @@ class Handle
   def query(statement)
     generic_query(statement)
     retval = @mysqlh.affected_rows
-    dohlog.info("affected #{retval} rows")
+    DohDb.logger.call('result', "affected #{retval} rows")
     retval
   end
 
   def update(statement)
     generic_query(statement)
     retval = @mysqlh.affected_rows
-    dohlog.info("updated #{retval} rows")
+    DohDb.logger.call('result', "updated #{retval} rows")
     retval
   end
 
@@ -63,7 +63,7 @@ class Handle
   def insert(statement)
     generic_query(statement)
     retval = @mysqlh.last_id
-    dohlog.info("insert_id was #{retval}")
+    DohDb.logger.call('result', "insert_id was #{retval}")
     retval
   end
 
@@ -83,7 +83,7 @@ class Handle
   # It calls to_s on the statement object to facilitate the use of sql builder objects.
   def select(statement, row_builder = nil)
     result_set = generic_query(statement)
-    dohlog.info("selected #{result_set.size} rows")
+    DohDb.logger.call('result', "selected #{result_set.size} rows")
     rows = get_row_builder(row_builder).build_rows(result_set)
     rows
   end
@@ -167,10 +167,10 @@ class Handle
 private
   def generic_query(statement)
     sqlstr = statement.to_s
-    dohlog.info(sqlstr)
+    DohDb.logger.call('query', sqlstr)
     @mysqlh.query(sqlstr)
   rescue Exception => excpt
-    dohlog.error("caught exception during query: #{sqlstr}", excpt)
+    DohDb.logger.call('error', "caught exception #{excpt.message} during query: #{sqlstr}")
     raise
   end
 

data/lib/doh/mysql/logger.rb

@@ -0,0 +1,16 @@
+module DohDb
+
+class StubLogger
+  def self.call(group, msg); end
+end
+
+@logger = StubLogger
+def self.logger
+  @logger
+end
+
+def self.set_logger(logger)
+  @logger = logger
+end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohmysql
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.15
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohroot
@@ -44,6 +44,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.7
+- !ruby/object:Gem::Dependency
+  name: dohlog
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +132,7 @@ files:
 - lib/doh/mysql/handle.rb
 - lib/doh/mysql/hash_row.rb
 - lib/doh/mysql/load_sql.rb
+- lib/doh/mysql/logger.rb
 - lib/doh/mysql/metadata_util.rb
 - lib/doh/mysql/migrate/analyzer.rb
 - lib/doh/mysql/migrate/options.rb