dohmysql 0.2.25 → 0.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1490c3c56af4f3950d52ae3401ac2c08f4f41c16
-  data.tar.gz: 29eaa21516dbcc06f66d9a0802761a634bda31d3
+  metadata.gz: 6e1e708e04dcc886dfa8bcbf687fd52ae312f1e4
+  data.tar.gz: 58820c6a5a7cf295376510ef6d147d85958a2b85
 SHA512:
-  metadata.gz: 27c4010a82bc5cfc5b7fcb8e67ab5ade62cf70744df5d8a79c237de58ce194dee279801ce83f61f504144e16992944c7b76c8b434269b942f02bf6fbc37df61e
-  data.tar.gz: 35ee860c5f4d64a5aa4fe93c4c472ee74c763671f2ab171bb744678b17d326755bad23f3e8ce52595bd7f39d358079d2253c8ee1cee90d727af7dce65192200d
+  metadata.gz: 4304cf8a3cd554f1bc100c92342bef2c60941ea5c549f96111a492611a4fc532baf718738d01723d21b55e976c24342c777446d3864848966816bd9d3e6c9831
+  data.tar.gz: b3fceedd0b817bb49c885e96a7cb15b88aea4e2c7284381de659d51a0c1b9bbf1d29bb7bab135255592584f5c2df41bc60053b685b022df8ebd0f4eaf9a4014d

data/lib/dohmysql/cache_connector.rb

@@ -9,6 +9,7 @@ class CacheConnector
   def initialize(config)
     @config = config
     @config[:timeout] ||= 1800
+    @handle = nil
   end
 
   def request_handle(database = nil)

data/lib/dohmysql/handle.rb

@@ -176,7 +176,7 @@ class Handle
         need_rollback = false
       end
     ensure
-      query("ROLLBACK") if need_rollback
+      close if need_rollback
     end
     retval
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohmysql
 version: !ruby/object:Gem::Version
-  version: 0.2.25
+  version: 0.2.26
 platform: ruby
 authors:
 - Makani Mason
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohroot
@@ -31,28 +31,28 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.11
+        version: 0.2.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.11
+        version: 0.2.14
 - !ruby/object:Gem::Dependency
   name: dohlog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.11
+        version: 0.1.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.11
+        version: 0.1.13
 - !ruby/object:Gem::Dependency
   name: dohtest
   requirement: !ruby/object:Gem::Requirement
@@ -118,7 +118,6 @@ files:
 - lib/dohmysql/error.rb
 - lib/dohmysql/file_util.rb
 - lib/dohmysql/handle.rb
-- lib/dohmysql/handle.rb.orig
 - lib/dohmysql/hash_row.rb
 - lib/dohmysql/load_sql.rb
 - lib/dohmysql/logger.rb
@@ -163,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: friendly mysql client interface

data/lib/dohmysql/handle.rb.orig

@@ -1,257 +0,0 @@
-require 'mysql2'
-require 'dohutil/array_to_hash'
-require 'dohmysql/logger'
-require 'dohmysql/error'
-require 'dohmysql/typed_row_builder'
-require 'dohmysql/writable_row'
-require 'dohmysql/hash_row'
-require 'dohmysql/smart_row'
-require 'dohmysql/to_sql'
-Mysql2::Client.default_query_options[:cast_booleans] = true
-
-module DohDb
-
-class Handle
-  attr_reader :config, :mysqlh
-
-  def initialize(config)
-    @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)
-    DohDb.logger.call('connection', "new connection created: id #{@mysqlh.thread_id}")
-  end
-
-  def close
-    unless closed?
-      begin
-        DohDb.logger.call('connection', "closing connection: id #{@mysqlh.thread_id}")
-        @mysqlh.close
-      ensure
-        @mysqlh = nil
-      end
-    end
-  end
-
-  def closed?
-    @mysqlh.nil?
-  end
-
-  def query(statement)
-    generic_query(statement)
-    retval = @mysqlh.affected_rows
-    DohDb.logger.call('result', "affected #{retval} rows")
-    retval
-  end
-
-  def update(statement)
-    generic_query(statement)
-    retval = @mysqlh.affected_rows
-    DohDb.logger.call('result', "updated #{retval} rows")
-    retval
-  end
-
-  def update_row(statement)
-    retval = update(statement)
-    raise UnexpectedQueryResult, "updated #{retval} rows; expected 1" unless retval == 1
-    retval
-  end
-
-  def update_hash(hash, table, primary_key_value, primary_key_name)
-    items = hash.keys.collect {|key| key + ' = ' + hash[key].to_sql}
-    query("UPDATE #{table} SET #{items.join(', ')} WHERE #{primary_key_name} = #{primary_key_value.to_sql}")
-  end
-
-  def insert(statement)
-    generic_query(statement)
-    retval = @mysqlh.last_id
-    DohDb.logger.call('result', "insert_id was #{retval}")
-    retval
-  end
-
-  def insert_hash(hash, table, quote_strings = true)
-    insert_hash_helper(hash, table, 'INSERT', quote_strings)
-  end
-
-  def insert_hashes(hashes, table, quote_strings = true)
-    insert_hashes_helper(hashes, table, 'INSERT', quote_strings)
-  end
-
-  def insert_ignore_hash(hash, table, quote_strings = true)
-    insert_hash_helper(hash, table, 'INSERT IGNORE', quote_strings)
-  end
-
-  def insert_ignore_hashes(hash, table, quote_strings = true)
-    insert_hashes_helper(hash, table, 'INSERT IGNORE', quote_strings)
-  end
-
-  def replace_hash(hash, table, quote_strings = true)
-    insert_hash_helper(hash, table, 'REPLACE', quote_strings)
-  end
-
-  # The most generic form of select.
-  # 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)
-    DohDb.logger.call('result', "selected #{result_set.size} rows")
-    rows = get_row_builder(row_builder).build_rows(result_set)
-    rows
-  end
-
-  # Simple convenience wrapper around the generic select call.
-  # Throws an exception unless the result set is a single row.
-  # Returns the row selected.
-  def select_row(statement, row_builder = nil)
-    rows = select(statement, row_builder)
-    raise UnexpectedQueryResult, "selected #{rows.size} rows; expected 1" unless rows.size == 1
-    rows[0]
-  end
-
-  # Simple convenience wrapper around the generic select call.
-  # Throws an exception unless the result set is empty or a single row.
-  # Returns nil if the result set is empty, or the row selected.
-  def select_optional_row(statement, row_builder = nil)
-    rows = select(statement, row_builder)
-    raise UnexpectedQueryResult, "selected #{rows.size} rows; expected 0 or 1" if rows.size > 1
-    if rows.empty? then nil else rows[0] end
-  end
-
-  # Simple convenience wrapper around select_row.
-  # Returns the first (and typically, the only) field from the selected row.
-  def select_field(statement, row_builder = nil)
-    select_row(statement, row_builder).at(0)
-  end
-
-  # Simple convenience wrapper around select_optional_row.
-  # Returns the first (and typically, the only) field from the selected row, if any, or nil.
-  def select_optional_field(statement, row_builder = nil)
-    row = select_optional_row(statement, row_builder)
-    row && row.at(0)
-  end
-
-  # Rows in the result set must have 2 or more fields.
-  # If there are 2 fields, returns a hash where each key is the first field in the result set, and the value is the second field.
-  # If there are more than 2 fields, returns a hash where each key is the first field in the result set,
-  # and the value is the row itself, as a Hash, and without the field used as a key.
-  def select_transpose(statement, row_builder = nil)
-    rows = select(statement, row_builder)
-    return {} if rows.empty?
-    field_count = rows.first.size
-    if field_count < 2
-      raise UnexpectedQueryResult, "must select at least 2 fields in order to transpose"
-    elsif field_count == 2
-      Doh.array_to_hash(rows) { |row| [row.at(0), row.at(1)] }
-    else
-      key_field = rows.first.keys.first
-      Doh.array_to_hash(rows) do |row|
-        value = row.to_h
-        value.delete(key_field)
-        [row.at(0), value]
-      end
-    end
-  end
-
-  # Returns an array of arrays, where the individual arrays contain just the values from each database row -- they lack field names.
-  def select_values(statement, row_builder = nil)
-    select(statement, row_builder).collect { |row| row.values }
-  end
-
-  # Returns an array of the first (and typically, the only) field of every row in the result set.
-  def select_list(statement, row_builder = nil)
-    select(statement, row_builder).collect { |row| row.at(0) }
-  end
-
-  def transaction
-    query("START TRANSACTION")
-    need_rollback = true
-    begin
-      retval = yield(self)
-      if !@testing_rollback
-        query("COMMIT")
-        need_rollback = false
-      end
-    ensure
-      query("ROLLBACK") if need_rollback
-    end
-    retval
-  end
-
-  def test_transaction_rollback
-    begin
-      @testing_rollback = true
-      yield(self)
-    ensure
-      @testing_rollback = false
-    end
-  end
-private
-  def generic_query(statement)
-    sqlstr = statement.to_s
-    DohDb.logger.call('query', sqlstr)
-    @mysqlh.query(sqlstr)
-  rescue Exception => excpt
-    DohDb.logger.call('error', "caught exception #{excpt.message} during query: #{sqlstr}")
-    close
-    raise
-  end
-
-  def get_key_insert_str(keys)
-    "(`#{keys.join('`,`')}`)"
-  end
-
-  def insert_hash_helper(hash, table, keyword, quote_strings)
-    names = []
-    values = []
-    hash.each_pair do |key, value|
-      names.push(key)
-      values.push(if quote_strings || !value.is_a?(String) then value.to_sql else value end)
-    end
-
-    insert("#{keyword} INTO #{table} (`#{names.join('`,`')}`) VALUES (#{values.join(',')})")
-  end
-
-  def insert_hashes_helper(hashes, table, keyword, quote_strings)
-<<<<<<< HEAD:lib/dohmysql/handle.rb
-    return if hashes.empty?
-
-=======
->>>>>>> implement insert_hashes, mostly not-sharing with insert_hash for speed (3% or so decrease on unit test speeds when I had them shared):lib/doh/mysql/handle.rb
-    valuestrs = []
-    keys = hashes[0].keys
-    keystr = get_key_insert_str(keys)
-    hashes.each do |hash|
-      values = []
-      keys.each do |key|
-        value = hash[key]
-        values.push(if quote_strings || !value.is_a?(String) then value.to_sql else value end)
-      end
-      valuestrs.push("(#{values.join(',')})")
-    end
-
-    insert("#{keyword} INTO #{table} #{keystr} VALUES #{valuestrs.join(",")}")
-  end
-
-
-  def get_row_builder(row_builder = nil)
-    if row_builder.nil?
-      TypedRowBuilder.new
-    elsif row_builder == :read
-      TypedRowBuilder.new(ReadOnlyRow)
-    elsif row_builder == :hash
-      TypedRowBuilder.new(HashRow)
-    elsif row_builder == :write
-      TypedRowBuilder.new(WritableRow)
-    elsif row_builder == :smart
-      TypedRowBuilder.new(SmartRow)
-    elsif row_builder.respond_to?('build_rows')
-      row_builder
-    else
-      TypedRowBuilder.new(row_builder)
-    end
-  end
-end
-
-end