dohmysql 0.2.23 → 0.2.24

data/bin/makedb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
-require 'doh/app/init_from_pwd'
-require 'doh/options'
-require 'doh/mysql/database_creator'
+require 'dohutil/app/init_from_pwd'
+require 'dohroot/options'
+require 'dohmysql/database_creator'
 
 opts = Doh::Options.new(
 {'drop_first' => [false, "-z", "--drop_first", "if true, will drop the database or tables before creating"] \

data/bin/migrate

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
-require 'doh/app/cli'
-require 'doh/mysql/migrate/runner'
-require 'doh/mysql/migrate/analyzer'
-require 'doh/mysql/migrate/options'
+require 'dohutil/app/cli'
+require 'dohmysql/migrate/runner'
+require 'dohmysql/migrate/analyzer'
+require 'dohmysql/migrate/options'
+
 module DohDb
 module Migrate
 

data/lib/{doh/mysql → dohmysql}/abstract_row.rb

@@ -1,4 +1,4 @@
-require 'doh/core_ext/force_deep_copy'
+require 'dohutil/core_ext/force_deep_copy'
 
 module DohDb
 

data/lib/{doh/mysql → dohmysql}/cache_connector.rb

@@ -1,5 +1,5 @@
 require 'dohlog'
-require 'doh/mysql/handle'
+require 'dohmysql/handle'
 
 module DohDb
 

data/lib/{doh/mysql → dohmysql}/current_date.rb

@@ -1,5 +1,5 @@
-require 'doh/current_date'
-require 'doh/mysql/db_date'
+require 'dohutil/current_date'
+require 'dohmysql/db_date'
 
 module DohDb
 

data/lib/{doh/mysql → dohmysql}/database_creator.rb

@@ -1,8 +1,8 @@
-require 'doh/core_ext/dir'
-require 'doh/mysql/handle'
-require 'doh/mysql/load_sql'
+require 'dohutil/core_ext/dir'
+require 'dohmysql/handle'
+require 'dohmysql/load_sql'
 require 'yaml'
-require 'doh/mysql/file_util'
+require 'dohmysql/file_util'
 
 module DohDb
 

data/lib/{doh/mysql → dohmysql}/db_date.rb

@@ -1,4 +1,4 @@
-require 'doh/core_ext/datewithtime'
+require 'dohutil/core_ext/datewithtime'
 
 module DohDb
 

data/lib/{doh/mysql → dohmysql}/handle.rb

@@ -1,12 +1,12 @@
 require 'mysql2'
-require 'doh/array_to_hash'
-require 'doh/mysql/logger'
-require 'doh/mysql/error'
-require 'doh/mysql/typed_row_builder'
-require 'doh/mysql/writable_row'
-require 'doh/mysql/hash_row'
-require 'doh/mysql/smart_row'
-require 'doh/mysql/to_sql'
+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
@@ -214,6 +214,8 @@ private
   end
 
   def insert_hashes_helper(hashes, table, keyword, quote_strings)
+    return if hashes.empty?
+
     valuestrs = []
     keys = hashes[0].keys
     keystr = get_key_insert_str(keys)

data/lib/{doh/mysql → dohmysql}/load_sql.rb

@@ -1,4 +1,4 @@
-require 'doh/mysql/connector_instance'
+require 'dohmysql/connector_instance'
 require 'open3'
 
 module DohDb

data/lib/{doh/mysql → dohmysql}/metadata_util.rb

@@ -1,4 +1,4 @@
-require 'doh/mysql/connector_instance'
+require 'dohmysql/connector_instance'
 
 module DohDb
 

data/lib/{doh/mysql → dohmysql}/migrate/analyzer.rb

@@ -1,5 +1,5 @@
-require 'doh/mysql/migrate/runner'
-require 'doh/mysql/database_creator'
+require 'dohmysql/migrate/runner'
+require 'dohmysql/database_creator'
 require 'open3'
 
 module DohDb

data/lib/{doh/mysql → dohmysql}/migrate/runner.rb

@@ -1,4 +1,4 @@
-require 'doh/mysql/load_sql'
+require 'dohmysql/load_sql'
 
 module DohDb
 

data/lib/{doh/mysql → dohmysql}/raw_row_builder.rb

@@ -1,4 +1,4 @@
-require 'doh/mysql/readonly_row'
+require 'dohmysql/readonly_row'
 
 module DohDb
 

data/lib/{doh/mysql → dohmysql}/readonly_row.rb

@@ -1,4 +1,4 @@
-require 'doh/mysql/abstract_row'
+require 'dohmysql/abstract_row'
 
 module DohDb
 

data/lib/{doh/mysql → dohmysql}/smart_row.rb

@@ -1,4 +1,4 @@
-require 'doh/mysql/abstract_row'
+require 'dohmysql/abstract_row'
 
 module DohDb
 

data/lib/{doh/mysql → dohmysql}/typed_row_builder.rb

@@ -1,4 +1,4 @@
-require 'doh/mysql/readonly_row'
+require 'dohmysql/readonly_row'
 
 module DohDb
 

data/lib/{doh/mysql → dohmysql}/writable_row.rb

@@ -1,5 +1,5 @@
-require 'doh/core_ext/string'
-require 'doh/mysql/abstract_row'
+require 'dohutil/core_ext/string'
+require 'dohmysql/abstract_row'
 require 'set'
 
 module DohDb

data/lib/dohmysql.rb

@@ -0,0 +1,5 @@
+require 'dohmysql/cache_connector'
+require 'dohmysql/connector_instance'
+require 'dohmysql/handle'
+require 'dohmysql/to_sql'
+require 'dohmysql/db_date'

data/test/cache_connector.dt.rb

@@ -1,4 +1,4 @@
-require 'doh/mysql/cache_connector'
+require 'dohmysql/cache_connector'
 require_relative 'helpers'
 
 module DohDb

data/test/connector_instance.dt.rb

@@ -1,4 +1,4 @@
-require 'doh/mysql/connector_instance'
+require 'dohmysql/connector_instance'
 require_relative 'helpers'
 
 module DohDb

data/test/db_date.dt.rb

@@ -1,5 +1,5 @@
-require 'doh/mysql/db_date'
-require 'doh/mysql/to_sql'
+require 'dohmysql/db_date'
+require 'dohmysql/to_sql'
 
 module DohDb
 

data/test/handle.dt.rb

@@ -1,5 +1,5 @@
 require_relative 'helpers'
-require 'doh/mysql/handle'
+require 'dohmysql/handle'
 
 module DohDb
 
@@ -52,17 +52,16 @@ class Test_Handle < DohTest::TestGroup
     dbh = get_dbh
     dbh.query("CREATE TEMPORARY TABLE #{tbl} (value INT KEY)")
     hash1 = {'value' => 1}
-    hash2 = {'value' => 2}
-    hash3 = {'value' => 3}
-    hash4 = {'value' => 4}
     assert_equal(0, dbh.insert_hash(hash1, tbl))
     assert_equal(0, dbh.insert_ignore_hash(hash1, tbl))
-    assert_equal(1, dbh.select_field("SELECT COUNT(*) from #{tbl}"))
-    assert_equal(0, dbh.insert_hashes([hash2, hash3, hash4], tbl))
-    assert_equal(4, dbh.select_field("SELECT COUNT(*) from #{tbl}"))
     assert_raises(Mysql2::Error) { dbh.insert_hash(hash1, tbl) }
   end
 
+  def test_insert_hashes
+    dbh = get_dbh
+    dbh.insert_hashes([], '')
+ end
+
   def test_bad_handle_reconnect
     dbh = get_dbh
     begin

data/test/helpers.rb

@@ -16,13 +16,13 @@ module InternalTestHelpers
   end
 
   def get_dbh
-    require 'doh/mysql/handle'
+    require 'dohmysql/handle'
     DohDb::Handle.new(dbcfg)
   end
 
   def init_global_connector
-    require 'doh/mysql/connector_instance'
-    require 'doh/mysql/cache_connector'
+    require 'dohmysql/connector_instance'
+    require 'dohmysql/cache_connector'
     DohDb.set_connector_instance(DohDb::CacheConnector.new(dbcfg))
   end
 end

data/test/metadata_util.dt.rb

@@ -1,5 +1,5 @@
 require_relative 'helpers'
-require 'doh/mysql/metadata_util'
+require 'dohmysql/metadata_util'
 
 module DohDb
 

data/test/readonly_row.dt.rb

@@ -1,4 +1,4 @@
-require 'doh/mysql/readonly_row'
+require 'dohmysql/readonly_row'
 
 module DohDb
 

data/test/to_sql.dt.rb

@@ -1,4 +1,4 @@
-require 'doh/mysql/to_sql'
+require 'dohmysql/to_sql'
 
 module DohDb
 

data/test/writable_row.dt.rb

@@ -1,4 +1,4 @@
-require 'doh/mysql/writable_row'
+require 'dohmysql/writable_row'
 
 module DohDb
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohmysql
 version: !ruby/object:Gem::Version
-  version: 0.2.23
+  version: 0.2.24
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohroot
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: dohutil
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,7 +91,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.1.11
 - !ruby/object:Gem::Dependency
   name: dohtest
   requirement: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.15
+        version: 0.1.19
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.15
+        version: 0.1.19
 description: wrapper classes around low level mysql gem to provide a better interface
 email:
 - devinfo@atpsoft.com
@@ -120,30 +120,30 @@ extra_rdoc_files:
 files:
 - bin/makedb
 - bin/migrate
-- lib/doh/mysql/abstract_row.rb
-- lib/doh/mysql/cache_connector.rb
-- lib/doh/mysql/connector_instance.rb
-- lib/doh/mysql/connector_util.rb
-- lib/doh/mysql/current_date.rb
-- lib/doh/mysql/database_creator.rb
-- lib/doh/mysql/db_date.rb
-- lib/doh/mysql/error.rb
-- lib/doh/mysql/file_util.rb
-- 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
-- lib/doh/mysql/migrate/runner.rb
-- lib/doh/mysql/raw_row_builder.rb
-- lib/doh/mysql/readonly_row.rb
-- lib/doh/mysql/smart_row.rb
-- lib/doh/mysql/to_sql.rb
-- lib/doh/mysql/typed_row_builder.rb
-- lib/doh/mysql/writable_row.rb
-- lib/doh/mysql.rb
+- lib/dohmysql/abstract_row.rb
+- lib/dohmysql/cache_connector.rb
+- lib/dohmysql/connector_instance.rb
+- lib/dohmysql/connector_util.rb
+- lib/dohmysql/current_date.rb
+- lib/dohmysql/database_creator.rb
+- lib/dohmysql/db_date.rb
+- lib/dohmysql/error.rb
+- lib/dohmysql/file_util.rb
+- lib/dohmysql/handle.rb
+- lib/dohmysql/hash_row.rb
+- lib/dohmysql/load_sql.rb
+- lib/dohmysql/logger.rb
+- lib/dohmysql/metadata_util.rb
+- lib/dohmysql/migrate/analyzer.rb
+- lib/dohmysql/migrate/options.rb
+- lib/dohmysql/migrate/runner.rb
+- lib/dohmysql/raw_row_builder.rb
+- lib/dohmysql/readonly_row.rb
+- lib/dohmysql/smart_row.rb
+- lib/dohmysql/to_sql.rb
+- lib/dohmysql/typed_row_builder.rb
+- lib/dohmysql/writable_row.rb
+- lib/dohmysql.rb
 - test/cache_connector.dt.rb
 - test/connector_instance.dt.rb
 - test/db_date.dt.rb

data/lib/doh/mysql.rb

@@ -1,5 +0,0 @@
-require 'doh/mysql/cache_connector'
-require 'doh/mysql/connector_instance'
-require 'doh/mysql/handle'
-require 'doh/mysql/to_sql'
-require 'doh/mysql/db_date'