mysql2wrapper 0.0.1 → 0.0.2

data/.gitignore

@@ -1,5 +1,7 @@
+.DS_Store
 *.gem
 *.rbc
+*.lock
 .bundle
 .config
 coverage

data/Gemfile.lock

@@ -1,17 +1,13 @@
 PATH
   remote: .
   specs:
-    mysql2wrapper (0.0.1)
-      batchbase (= 0.0.2)
+    mysql2wrapper (0.0.2)
       mysql2 (= 0.3.11)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    batchbase (0.0.2)
-      sys-proctable (= 0.9.1)
     mysql2 (0.3.11)
-    sys-proctable (0.9.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,6 +1,10 @@
-mysql2wrapper
+#mysql2wrapper
 =============
 
 very simple mysql2 wrapper.
 it's ore ore library!
 
+## TODO
+
+ActiveSupportのHashWithIndifferentAccess的なものをかませるか？
+

data/example/sample.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'mysql2wrapper'
 require 'logger'
+require 'pp'
 
 #
 # HACKME サンプルをちょっとはマシに書く、、、、
@@ -21,10 +22,19 @@ client = Mysql2wrapper::Client.new(db_config,logger)
 #client = Mysql2wrapper::Client.new(db_config,nil)
 
 query = '
-DROP TABLE IF EXISTS `hoges`'
+DROP TABLE IF EXISTS `test01`'
 client.query query
 query = '
-CREATE TABLE IF NOT EXISTS `hoges` (
+CREATE TABLE IF NOT EXISTS `test01` (
+  `id` int(11) NOT NULL auto_increment,
+  `value1` int(11) NOT NULL,
+  `created_at` datetime NOT NULL,
+  `updated_at` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;'
+client.query query
+query = '
+CREATE TABLE IF NOT EXISTS `test02` (
   `id` int(11) NOT NULL auto_increment,
   `value1` int(11) NOT NULL,
   `created_at` datetime NOT NULL,
@@ -33,22 +43,24 @@ CREATE TABLE IF NOT EXISTS `hoges` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;'
 client.query query
 
-logger.info "hoge has #{client.count 'hoges'}rows"
-client.query "INSERT INTO hoges (value1,created_at)VALUES(#{Time.now.to_i},NOW())"
-logger.info "hoge has #{client.count 'hoges'}rows"
+p client.tables
+
+logger.info "test01 has #{client.count 'test01'}rows"
+client.query "INSERT INTO test01 (value1,created_at)VALUES(#{Time.now.to_i},NOW())"
+logger.info "test01 has #{client.count 'test01'}rows"
 
 begin
   # トランザクションはブロックを渡す（ARと同じく）
   client.transaction do
-    logger.info "hoge has #{client.count 'hoges'}rows"
-   client.query "INSERT INTO hoges (value1,created_at)VALUES(#{Time.now.to_i},NOW())"
+    logger.info "test01 has #{client.count 'test01'}rows"
+   client.query "INSERT INTO test01 (value1,created_at)VALUES(#{Time.now.to_i},NOW())"
     client.query query
-    logger.info "hoge has #{client.count 'hoges'}rows"
+    logger.info "test01 has #{client.count 'test01'}rows"
     raise 'error' # call ROLLBACK
   end
 rescue
 end
-logger.info "hoge has #{client.count 'hoges'}rows"
+logger.info "test01 has #{client.count 'test01'}rows"
 
 # ハッシュを引数にしたインサートの発行
 @i = 0
@@ -56,22 +68,24 @@ hash = {
   :value1=>proc{@i+=1}, # procを引数にもできる
   :created_at=>'now()'.to_func
 }
-client.insert('hoges',hash)
+client.insert('test01',hash)
 logger.info "affected_rows:#{client.affected_rows}"
-logger.info "hoge has #{client.count 'hoges'}rows"
+logger.info "test01 has #{client.count 'test01'}rows"
 
 # 配列を引数にしたインサートの発行
 ar = []
 20.times{ar << hash}
-client.insert('hoges',ar)
+client.insert('test01',ar)
 logger.info "affected_rows:#{client.affected_rows}" # Client#affected_rowsでマルチプルインサートのトータルインサート数が取れる
-logger.info "hoge has #{client.count 'hoges'}rows"
+logger.info "test01 has #{client.count 'test01'}rows"
 
 # ハッシュを引数にしたアップデート
-client.update 'hoges',{:value1=>3},'id = 1'
-logger.info "hoge has #{client.count 'hoges'}rows"
+client.update 'test01',{:value1=>3},'id = 1'
+logger.info "test01 has #{client.count 'test01'}rows"
 # 全行アップデートをしたなら第三引数でMysql2wrapper::Client::UpdateAllClassを引数にしないとダメ
-client.update 'hoges',{:value1=>3},Mysql2wrapper::Client::UpdateAllClass
+client.update 'test01',{:value1=>3},Mysql2wrapper::Client::UpdateAllClass
 # clientインスタンスにショートカットあり
-client.update 'hoges',{:value1=>4},client.update_all_flag
-logger.info "hoge has #{client.count 'hoges'}rows"
+client.update 'test01',{:value1=>4},client.update_all_flag
+logger.info "test01 has #{client.count 'test01'}rows"
+
+pp client.table_informations

data/example/sample_table_information.rb

@@ -0,0 +1,40 @@
+require 'rubygems'
+require 'mysql2wrapper'
+require 'logger'
+require 'pp'
+
+#
+# データベース内のテーブル情報を所定の書式で出力サンプル
+#
+
+logger = Logger.new(STDOUT)
+# フォーマッターを変える
+#logger.formatter = Kanamei::LogFormatter.formatter
+db_yml_path = File::dirname(__FILE__) + '/../config/database.yml'
+logger.info db_yml_path
+
+# 第3引数は複数DB接続が無いならば指定不要
+db_config = Mysql2wrapper::Client.config_from_yml(db_yml_path,'test')
+
+client = Mysql2wrapper::Client.new(db_config,logger)
+# ログ出力しないなら第二引数をnilで
+#client = Mysql2wrapper::Client.new(db_config,nil)
+
+client.table_informations.each do |table|
+  puts "/*"
+  puts "[table]"
+  puts table['TABLE_NAME']
+  puts table['TABLE_COMMENT']
+  puts "[columns]"
+  table['COLUMNS'].each do |col|
+    puts "#{col['COLUMN_NAME']}:#{col['COLUMN_COMMENT']}"
+  end
+  puts "[indexes]"
+  table['INDEXES'].each do |col|
+    puts "#{col['INDEX_NAME']}:#{col['INDEX_COMMENT']}"
+  end
+  puts "[history]"
+  puts "*/"
+  puts table['CREATE TABLE']
+end
+

data/lib/mysql2wrapper.rb

@@ -1,4 +1,5 @@
 require "mysql2wrapper/version"
+require "mysql2wrapper/core_ext"
 require "mysql2wrapper/client"
 
 class String

data/lib/mysql2wrapper/client.rb

@@ -4,7 +4,7 @@ require 'yaml'
 require 'mysql2'
 
 class Mysql2wrapper::Client
-  attr_accessor :config, :client, :logger
+  attr_accessor :config, :client, :logger, :last_query
   attr_reader :affected_rows
 
   # 全行更新用のフラグ表現クラス
@@ -19,7 +19,12 @@ class Mysql2wrapper::Client
   def initialize(config,_logger=Logger.new(STDOUT))
     self.logger = _logger
     if self.logger
-      self.logger.info "mysql2 client created with #{config.inspect}"
+      # TODO パスワードの隠し
+      config_c = config.clone
+      if config_c[:password].present?
+        config_c[:password] = '****'
+      end
+      self.logger.info "mysql2 client created with #{config_c.inspect}"
     end
     self.client = Mysql2::Client.new(config)
     self.config = config
@@ -52,15 +57,36 @@ class Mysql2wrapper::Client
     "#{self.config.inspect}\n#{self.client.pretty_inspect}"
   end
 
-  def query(str,color=QUERY_BASE_COLOR)
-    res = self.class.query(self.client,str,self.logger,color)
+  def query(str_query,color=QUERY_BASE_COLOR)
+    begin
+      case str_query
+      when /^SET /,'COMMIT','ROLLBACK'
+      else
+        self.last_query = str_query
+      end
+    rescue ArgumentError => e
+      # バイナリが絡むとstr_queryに正規表現とかかけられない
+      # invalid sequence エラーになる
+      self.last_query = str_query
+    end
+    res = self.class.query(self.client,str_query,self.logger,color)
     @affected_rows = self.client.affected_rows
     res
   end
 
+  # HACKME
+  # トランザクションのネストをどう考えるか
+  # このライブラリを使うシチュエーションってのは
+  # トランザクションのネストを許さない場合ってな気がするので
+  # 一応エラーを上げるようにしてますが、、、、
   def transaction(&proc)
     raise ArgumentError, "No block was given" unless block_given?
     #query "SET AUTOCOMMIT=0;",QUERY_SPECIAL_COLOR
+    if @__inside_transaction
+      # HACHME エラーの種別の検討
+      raise StandardError, 'can not nest transaction!!!!'
+    end
+    @__inside_transaction = true
     query "BEGIN",QUERY_SPECIAL_COLOR
     begin
       yield
@@ -68,6 +94,8 @@ class Mysql2wrapper::Client
     rescue => e
       query "ROLLBACK",QUERY_SPECIAL_COLOR
       raise e
+    ensure
+      @__inside_transaction = false
     end
   end
 
@@ -79,8 +107,12 @@ class Mysql2wrapper::Client
     config = new_config
   end
 
-  def count(table_name,key_name='*')
-    query("SELECT COUNT(#{escape(key_name)}) AS cnt FROM #{escape(table_name)}").first['cnt']
+  def count(table_name,where=nil,key_name='*')
+    query = "SELECT COUNT(#{escape(key_name)}) AS cnt FROM #{escape(table_name)}"
+    if where
+      query = "#{query} #{parse_where where}"
+    end
+    query(query).first['cnt']
   end
 
   def close
@@ -104,10 +136,11 @@ class Mysql2wrapper::Client
   #
   def update(table_name,hash,where)
     case where
-    when String
-      where = "WHERE #{where}"
+    when '',nil
+      raise ArgumentError, 'can not set blank or nil on where with update(you shoule use UpdateAllClass with where)'
     when UpdateAllClass.class
-      where = ''
+      where = nil
+    when String,Hash
     else
       raise ArgumentError, "where must be String or UpdateAll"
     end
@@ -115,10 +148,50 @@ class Mysql2wrapper::Client
       hash.map do |key,value|
         "`#{escape(key.to_s)}` = #{proceed_value(value)}"
       end.join(',')
-    }" + where
+    }"
+    if where
+      query = "#{query} #{parse_where where}"
+    end
     self.query(query)
   end
 
+  def select(table_name,select,where=nil)
+    query = "SELECT #{select} FROM `#{escape table_name}`"
+    if where
+      query = "#{query} #{parse_where(where)}"
+    end
+    query query
+  end
+
+  def parse_where(v)
+    case v
+    when String
+      if v.size > 0
+        "WHERE #{v}"
+      else
+        ''
+      end
+    when Hash
+      "WHERE #{
+        v.map do |key,value|
+          case value
+          when nil
+            "`#{escape(key.to_s)}` IS NULL"
+          when Array
+            # ここ、、、自動で条件を抜くってのもできるけど、、、、まぁそれで意図しない結果になるより
+            # エラーを上げるほうが妥当だろうて
+            raise "at least one value needs for #{key.to_s} (can not call in statement with no value)" if value.size == 0
+            "`#{escape(key.to_s)}` in (#{value.map{|o|proceed_value(o)}.join(',')})"
+          else
+            "`#{escape(key.to_s)}` = #{proceed_value(value)}"
+          end
+        end.join(' AND ')
+      }"
+    else
+      raise 'can set String or Hash on where'
+    end
+  end
+
   def update_all_flag
     self.class::UPDATE_ALL
   end
@@ -139,19 +212,21 @@ class Mysql2wrapper::Client
       "'#{value.strftime("%Y-%m-%d %H:%M:%S")}'"
     when Date
       "'#{value.strftime("%Y-%m-%d")}'"
-    else
-      s = value
-      s = s.to_s unless s.kind_of?(String)
-      if s.respond_to?(:function_sql?) && s.function_sql?
+    when String
+      if value.respond_to?(:function_sql?) && value.function_sql?
         "#{value.to_s}"
       else
-        "'#{escape(value.to_s)}'"
+        value = escape(value)
+        #value = value.encode('utf-8', {:invalid => :replace, :undef => :replace})
+        "'#{value}'"
       end
+    else
+      "'#{escape(value.to_s)}'"
     end
   end
 
   def insert(table_name,data,multiple_insert_by=MULTIPLE_INSERT_DEFAULT)
-    @affected_rows = 0 # 一応リセットしとくか、、、
+    @affected_rows = 0 # 一応リセット
     affected_rows_total = 0
     query = "INSERT INTO `#{escape(table_name)}`"
     _datas = data.clone
@@ -166,7 +241,6 @@ class Mysql2wrapper::Client
 
     return nil if _datas.size == 0
 
-    # TODO affected_rows by multiple
     _datas.each_slice(multiple_insert_by).each do |rows|
       query = <<"EOS"
 INSERT INTO `#{escape(table_name)}`
@@ -182,6 +256,7 @@ VALUES
   end.join(',')
 }
 EOS
+
       self.query(query.chomp)
       affected_rows_total += self.client.affected_rows
     end
@@ -192,12 +267,52 @@ EOS
   # db_server_nameはDB名そのもの（複数DB対応）
   #
   def self.config_from_yml(yml_path,environment,db_server_name=nil)
+    raise "yaml not found(#{yml_path})" unless File.exists?(yml_path)
     db_config = YAML.load_file(yml_path)[environment]
     if db_server_name
-      db_config = self.make_config_key_symbol(db_config[db_server_name])
-    else
-      db_config = self.make_config_key_symbol(db_config)
+      db_config = db_config[db_server_name]
+    end
+    unless db_config
+      raise "can not get db_config with env:#{environment}#{db_server_name ? "/db_server:#{db_server_name}":''}"
+    end
+    self.make_config_key_symbol(db_config)
+  end
+
+  def tables
+    table_informations.map{|o|o['TABLE_NAME']}
+  end
+
+  def table_names
+    table_informations.map{|o|o['TABLE_NAME']}
+  end
+
+  def databases
+    query = 'show databases'
+    self.client.query(query).map{|ar|ar['Database']}
+  end
+
+  def table_informations
+    query = "select * from INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = '#{escape(self.config[:database])}' AND TABLE_TYPE = 'BASE TABLE'"
+    tables = self.client.query(query).to_a
+    tables.each do |table|
+      table['COLUMNS'] = table_information_schema('COLUMNS',table['TABLE_NAME'])
+      table['INDEXES'] = table_information_schema('STATISTICS',table['TABLE_NAME'])
+      query = "SHOW CREATE TABLE `#{escape(table['TABLE_NAME'])}`"
+      table['CREATE TABLE'] = self.client.query(query).first['Create Table']
     end
-    db_config
+    tables
+  end
+
+  def table_information_schema(type,table_name)
+    query = "
+SELECT
+  *
+FROM
+  INFORMATION_SCHEMA.#{type}
+WHERE
+table_name = '#{escape(table_name)}' AND
+table_schema = '#{escape(self.config[:database])}'
+"
+      query(query).to_a
   end
 end

data/lib/mysql2wrapper/core_ext.rb

@@ -0,0 +1,17 @@
+
+class Array
+  def select_one_must(&proc)
+    result = self.select(&proc)
+    raise StandardError, 'no data selected' if result.size == 0
+    raise StandardError, "multiple data selected(#{result.size} datas)" if result.size > 1
+    result.first
+  end
+end
+
+module Mysql2
+  class Result
+    def select_one_must(&proc)
+      self.to_a.select_one_must(&proc)
+    end
+  end
+end

data/lib/mysql2wrapper/version.rb

@@ -1,3 +1,3 @@
 module Mysql2wrapper
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/test.rb

@@ -6,6 +6,7 @@ require 'test/unit'
 require 'Fileutils'
 require 'logger'
 
+TEST_IMAGE = File.expand_path(File.dirname(__FILE__))+ '/sample_datas/image.jpeg'
 #
 # localhostに以下のデータベースを作成しrootのパスワード無しでアクセスできるようにしておいてください
 #
@@ -31,7 +32,7 @@ class TestMysql2wrapper < Test::Unit::TestCase
     query = '
 CREATE TABLE IF NOT EXISTS `test02` (
   `id` int(11) NOT NULL auto_increment,
-  `v_int1` int(11) NOT NULL,
+  `v_int1` int(11) NOT NULL COMMENT \'v_int1だよん\',
   `v_int2` int(11) NOT NULL,
   `v_int3` int(11),
   `v_int4` int(11),
@@ -52,13 +53,14 @@ CREATE TABLE IF NOT EXISTS `test02` (
   `v_time1` datetime NOT NULL,
   `v_time2` datetime,
   `v_time3` datetime,
+  `v_blob1` mediumblob,
   `created_at` datetime NOT NULL,
   `updated_at` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
-  PRIMARY KEY  (`id`)
+  PRIMARY KEY  (`id`),
+  KEY `idx_01` (`v_int1`) USING BTREE COMMENT \'idx_01 ダヨン\'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
     '
     client.query query
-
     client.close
   end
 
@@ -112,16 +114,40 @@ CREATE TABLE IF NOT EXISTS `#{table}` (
 
   def test_count
     client = get_client
-    assert_equal 0,client.count('test01','id')
-    query = "INSERT INTO test01 (v_int1,created_at)VALUES(#{Time.now.to_i},NOW())"
-    client.query query
-    assert_equal 1,client.count('test01','id')
-    query = "INSERT INTO test01 (v_int1,created_at)VALUES(#{Time.now.to_i},NOW())"
-    client.query query
-    assert_equal 2,client.count('test01','id')
+    assert_equal 0,client.count('test01',nil,'id')
+    assert_equal 0,client.count('test01')
+    client.insert('test01',{:v_int1=>11,:created_at=>'NOW()'.to_func})
+    assert_equal 1,client.count('test01')
+    client.insert('test01',{:v_int1=>11,:created_at=>'NOW()'.to_func})
+    assert_equal 2,client.count('test01',nil,'id')
+    assert_equal 2,client.count('test01',nil,'*')
+    assert_equal 2,client.count('test01')
+    client.insert('test01',{:v_int1=>11,:v_int2=>22,:created_at=>'NOW()'.to_func})
+    assert_equal 3,client.count('test01',{:v_int1=>11},'id')
+    assert_equal 3,client.count('test01',"v_int1 = 11",'id')
+    assert_equal 1,client.count('test01',{:v_int2=>22},'id')
+    assert_equal 1,client.count('test01',{:v_int1=>11,:v_int2=>22},'id')
+    assert_equal 1,client.count('test01',{:v_int1=>11,:v_int2=>22})
+    assert_equal 1,client.count('test01',"v_int1 = 11 AND v_int2 = 22",'id')
     client.close
   end
 
+  def test_last_query
+    client = get_client
+    query = "INSERT INTO test01 (v_int1,created_at)VALUES(123,NOW())"
+    client.query query
+    assert_equal query,client.last_query
+    begin
+      client.transaction do
+        client.query query
+        assert_equal query,client.last_query
+        raise 'hoho'
+      end
+    rescue => e
+      assert_equal query,client.last_query
+    end
+  end
+
   def test_select
     client = get_client
     assert_equal 0,client.count('test01','id')
@@ -135,8 +161,38 @@ CREATE TABLE IF NOT EXISTS `#{table}` (
     client.query query
     res = client.query "SELECT * FROM test01 WHERE id = 1"
     assert_equal 1, client.affected_rows
+    res = client.select "test01",'*',{:id=>1}
+    assert_equal 1, client.affected_rows
     res = client.query "SELECT * FROM test01"
     assert_equal 2, client.affected_rows
+
+    query = "INSERT INTO test01 (v_int1,v_int2,created_at)VALUES(123,234,NOW())"
+    client.query query
+    res = client.select "test01",'id',{:v_int1=>123,:v_int2=>234}
+    assert_equal 1, client.affected_rows
+    assert_equal 1, res.size
+    res = client.select "test01",'*',"v_int1 =123 AND v_int2 = 234"
+    assert_equal 1, client.affected_rows
+    assert_equal 1, res.size
+    res = client.select "test01",'id',{:v_int1=>123,:v_int2=>nil}
+    assert_equal 2, client.affected_rows
+    res = client.select "test01",'*',"v_int1=123 AND v_int2 IS NULL"
+    assert_equal 2, client.affected_rows
+
+
+    res = client.select "test01",'*',{:id=>[1]}
+    assert_equal 1, client.affected_rows
+    res = client.select "test01",'*',{:id=>[1,2]}
+    assert_equal 2, client.affected_rows
+    res = client.select "test01",'*',{:id=>[1,2,999]}
+    assert_equal 2, client.affected_rows
+    res = client.select "test01",'*',{:id=>[1,2,nil]}
+    assert_equal 2, client.affected_rows
+    res = client.select "test01",'*',{:id=>[1,2,'NOW()'.to_func]}
+    assert_equal 2, client.affected_rows
+    res = client.select "test01",'*',{:id=>[1,2,Time.now]}
+    assert_equal 2, client.affected_rows
+
     client.close
   end
 
@@ -147,16 +203,8 @@ CREATE TABLE IF NOT EXISTS `#{table}` (
     client.query query
     client.query query
 
-    res = client.query "SELECT * FROM test01 WHERE id = 1"
-    assert_equal 1, res.first['v_int1']
-    assert_equal nil, res.first['v_int2']
-    res = client.query "SELECT * FROM test01 WHERE id = 2"
-    assert_equal 1, res.first['v_int1']
-    assert_equal nil, res.first['v_int2']
-
     client.update 'test01',{:v_int1=>2},'id = 1'
     assert_equal 1, client.affected_rows
-
     res = client.query "SELECT * FROM test01 WHERE id = 1"
     assert_equal 2, res.first['v_int1']
     assert_equal nil, res.first['v_int2']
@@ -164,6 +212,8 @@ CREATE TABLE IF NOT EXISTS `#{table}` (
     assert_equal 1, res.first['v_int1']
     assert_equal nil, res.first['v_int2']
 
+    client.update 'test01',{:v_int2=>3},{:id=>3}
+    assert_equal 1, client.affected_rows
     client.update 'test01',{:v_int1=>3}, client.update_all_flag
 
     assert_equal 3, client.affected_rows
@@ -174,8 +224,19 @@ CREATE TABLE IF NOT EXISTS `#{table}` (
     assert_equal 3, res.first['v_int1']
     assert_equal nil, res.first['v_int2']
     client.update 'test01',{:v_int1=>3},Mysql2wrapper::Client::UPDATE_ALL
+    assert_equal 0, client.affected_rows # 更新行が無いので
+
+    client.update 'test01',{:v_int1=>4},{:v_int1=>2,:v_int2=>nil}
     assert_equal 0, client.affected_rows
-    client.update 'test01',{:v_int1=>4},client.update_all_flag
+    client.update 'test01',{:v_int1=>4},{:v_int1=>3,:v_int2=>nil}
+    assert_equal 2, client.affected_rows
+    client.update 'test01',{:v_int1=>4},{:v_int1=>3,:v_int2=>3}
+    assert_equal 1, client.affected_rows
+
+    client.update 'test01',{:v_int1=>5},{:v_int1=>[1,2,3,4],:v_int2=>3}
+    assert_equal 1, client.affected_rows
+
+    client.update 'test01',{:v_int1=>6},client.update_all_flag
     assert_equal 3, client.affected_rows
 
     client.close
@@ -189,9 +250,12 @@ CREATE TABLE IF NOT EXISTS `#{table}` (
     assert_raise(ArgumentError){
       client.update 'test01',{:v_int1=>3},nil
     }
+    assert_raise(ArgumentError){
+      client.update 'test01',{:v_int1=>3},''
+    }
 
     assert_raise(Mysql2::Error){
-      client.update 'test01',{:v_int1=>3},''
+      client.update 'test01',{:v_int5=>3},Mysql2wrapper::Client::UPDATE_ALL
     }
   end
 
@@ -206,6 +270,7 @@ CREATE TABLE IF NOT EXISTS `#{table}` (
     client.close
   end
 
+
   def test_tranasction_simple
     client = get_client
     insert(client)
@@ -270,6 +335,44 @@ CREATE TABLE IF NOT EXISTS `#{table}` (
     client2.close
   end
 
+  def test_tranasction_nest
+    client = get_client
+    assert_raise(StandardError) do
+      client.transaction do
+        client.transaction do
+        end
+      end
+    end
+  end
+
+  def test_blob
+    client = get_client
+    f = File.binread(TEST_IMAGE)
+    @i = 0
+    hash = {
+      :v_int1 => proc{ @i+=1 },
+      :v_int2 => 246,
+      :v_int3 => nil,
+      :v_str1=>"te'st日本語",
+      :v_str2=>"CONCAT('My','S','QL')".to_func,
+      :v_str3 => nil,
+      :v_bool1 => true,
+      :v_bool2 => false,
+      :v_bool3 => nil,
+      :v_date1 => Date.new(2000,1,2),
+      :v_date2 => nil,
+      :v_datetime1 => DateTime.new(2000,1,2,3,4,5),
+      :v_datetime2 => nil,
+      :v_time1 => Time.mktime(2000,1,2,3,4,5),
+      :v_time2 => nil,
+      :v_blob1 => f,
+      :created_at => 'NOW()'.to_func,
+    }
+    client.insert('test02',hash)
+    row = client.select('test02','*').first
+    assert_equal f, row['v_blob1']
+  end
+
   def test_insert
     client = get_client
     @i = 0
@@ -379,4 +482,149 @@ CREATE TABLE IF NOT EXISTS `#{table}` (
     assert_equal 2,client_master.count('tbl_master')
     assert_equal 1,client_slave.count('tbl_slave')
   end
+
+  def test_tables
+    client = get_client
+    assert_equal 2, client.tables.size
+    client.tables.each do |table_name|
+      assert %w|test01 test02|.include?(table_name)
+    end
+  end
+
+  def test_table_names
+    client = get_client
+    assert_equal 2, client.tables.size
+    client.tables.each do |table_name|
+      assert %w|test01 test02|.include?(table_name)
+    end
+  end
+
+  def test_config_from_yml
+  end
+
+  def test_table_informations
+    client = get_client
+    table_informations = client.table_informations
+    assert_equal 2, table_informations.size
+    table_informations.each do |hash|
+      assert %w|test01 test02|.include?(hash['TABLE_NAME'])
+      assert_not_nil hash['COLUMNS']
+      assert_not_nil hash['INDEXES']
+      assert_not_nil hash['CREATE TABLE']
+      case hash['TABLE_NAME']
+      when 'test02'
+        assert_equal 25, hash['COLUMNS'].size
+        assert_equal 2,  hash['INDEXES'].size
+      end
+    end
+  end
+
+  def test_databases
+    client = get_client
+    databases = client.databases
+    assert_equal true, databases.include?('information_schema')
+    assert_equal false,databases.include?('tbl_master')
+    assert_equal true, databases.include?('mysql2wrapper_test')
+    assert_equal true, databases.include?('mysql2wrapper_test_master')
+    assert_equal true, databases.include?('mysql2wrapper_test_slave')
+  end
+
+  def test_array_select_one_must
+    ar = [1,2,2,3]
+    assert_equal 1,ar.select_one_must{|o|o == 1}
+    assert_equal 3,ar.select_one_must{|o|o == 3}
+    assert_raise StandardError do
+      ar.select_one_must{|o|o == 2}
+    end
+    assert_raise StandardError do
+      ar.select_one_must{|o|o == 4}
+    end
+
+    ar = [{:id=>1,:i=>1},{:id=>2,:i=>2}]
+    assert_equal ({:id=>1,:i=>1}),ar.select_one_must{|o|o[:id] == 1}
+  end
+
+  def test_mysql2_result_select_one_must
+    client = get_client
+    client.insert('test01',{:id=>1,:v_int1=>1,:created_at=>'NOW()'.to_func})
+    client.insert('test01',{:id=>2,:v_int1=>2,:created_at=>'NOW()'.to_func})
+    client.insert('test01',{:id=>3,:v_int1=>2,:created_at=>'NOW()'.to_func})
+    client.insert('test01',{:id=>4,:v_int1=>3,:created_at=>'NOW()'.to_func})
+    rows = client.query('select * from test01')
+    assert_equal 1, rows.select_one_must{|o|o['id'] == 1}['v_int1']
+    assert_equal 2, rows.select_one_must{|o|o['id'] == 3}['v_int1']
+    assert_raise StandardError do
+      rows.select_one_must{|o|o['v_int1'] == 2}
+    end
+    assert_raise StandardError do
+      rows.select_one_must{|o|o['v_int1'] == 4}
+    end
+  end
+
+
+  #
+  # http://info.dwango.co.jp/rd/2010/01/mysql.html
+  #
+  def test_queue
+    sample_row_size = 1000
+    client = get_client
+    ar = []
+    sample_row_size.times do
+      ar << {:v_int1=>1,:created_at=>'NOW()'.to_func}
+    end
+    client.insert('test01',ar)
+
+    assert_equal sample_row_size, client.count('test01')
+
+    cnt = 0
+    12.times do
+      threads = []
+      (sample_row_size / 10).times do
+        threads << Thread.new do
+          Thread.pass
+          th_client = get_client
+          query = '
+UPDATE
+  test01
+SET
+  id = LAST_INSERT_ID(id),
+  v_int1 = 2
+WHERE
+  v_int1 = 1
+ORDER BY id
+LIMIT 1
+'
+          th_client.query(query)
+          query = 'SELECT LAST_INSERT_ID() as last_id'
+          processing_id = th_client.query(query).first['last_id']
+          #puts processing_id
+          if processing_id != 0
+            begin
+              th_client.transaction do
+                query = "UPDATE test01 SET v_int2 = v_int2 + 1 WHERE id = #{processing_id}"
+                th_client.query(query)
+              end
+            rescue
+            end
+            begin
+              th_client.transaction do
+                query = "UPDATE test01 SET v_int2 = v_int2 + 1 WHERE id = #{processing_id}"
+                th_client.query(query)
+                raise 'koko'
+              end
+            rescue
+            end
+            query = "UPDATE test01 SET v_int2 = v_int2 + 1 WHERE id = #{processing_id}"
+            th_client.query(query)
+            cnt += 1
+          end
+          th_client.close
+        end
+      end
+      threads.each do |th|
+        th.join
+      end
+    end
+    assert_equal sample_row_size, cnt
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysql2wrapper
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000 Z
+date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -42,11 +42,14 @@ files:
 - config/database.yml
 - config/database_multiple.yml
 - example/sample.rb
+- example/sample_table_information.rb
 - lib/mysql2wrapper.rb
 - lib/mysql2wrapper/client.rb
+- lib/mysql2wrapper/core_ext.rb
 - lib/mysql2wrapper/version.rb
 - mysql2wrapper.gemspec
 - test/by_hand.rb
+- test/sample_datas/image.jpeg
 - test/test.rb
 - test/test_helper.rb
 homepage: ''
@@ -75,6 +78,7 @@ specification_version: 3
 summary: oreore mysql2 wrapper class
 test_files:
 - test/by_hand.rb
+- test/sample_datas/image.jpeg
 - test/test.rb
 - test/test_helper.rb
 has_rdoc: