mysql2-cs-bind 0.0.5 → 0.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: d3495f65b800c8cddbb748e628a64ed8fca1d9d33766cd1196ed124c87c2b998
+  data.tar.gz: 66d1445f6104b171ec1cb72661f33d75f010a79a557bad875d3d836303d54ed5
+SHA512:
+  metadata.gz: 210e1bdf190d73617d5e3df68ecae830acf14d7f78a459c8d1cbbbf514ec4245d87713a38dc7358b9e34a1608d819d243dccdf78c5ed2586d2ccbc991aa53731
+  data.tar.gz: '058ca605f2586f0e3e23a37797f571386792ea8e44145dc4e301ce2de1009d8a4439fb7d8f2f43624bc90faf1b1ff00470971b8e9cb52966ae907cb05a95d476'

data/README.md

@@ -1,6 +1,6 @@
-# mysql-cs-bind
+# mysql2-cs-bind
 
-'mysql-cs-bind' is extension of 'mysql2', to add method of client-side variable binding (pseudo prepared statement).
+'mysql2-cs-bind' is extension of 'mysql2', to add method of client-side variable binding (pseudo prepared statement).
 
 ## Installation
 

data/lib/mysql2-cs-bind.rb

@@ -1,14 +1,11 @@
+# frozen_string_literal: true
+
 require 'mysql2'
 
 class Mysql2::Client
 
-  def xquery(sql, *args)
-    options = if args.size > 0 and args[-1].is_a?(Hash)
-                args.pop
-              else
-                {}
-              end
-    if args.size < 1
+  def xquery(sql, *args, **options)
+    if args.empty?
       query(sql, options)
     else
       query(Mysql2::Client.pseudo_bind(sql, args), options)
@@ -24,22 +21,39 @@ class Mysql2::Client
       placeholders.push(pos)
       search_pos = pos + 1
     end
-    values = values.flatten(1) if placeholders.length == values.flatten(1).length
-    raise ArgumentError, "mismatch between placeholders number and values arguments" if placeholders.length != values.length
+
+    if placeholders.length != values.length &&
+       placeholders.length != (values = values.flatten(1)).length
+      raise ArgumentError, "mismatch between placeholders number and values arguments"
+    end
 
     while pos = placeholders.pop()
       rawvalue = values.pop()
-      if rawvalue.nil?
-        sql[pos] = 'NULL'
-      elsif rawvalue.respond_to?(:strftime)
-        sql[pos] = "'" + rawvalue.strftime('%Y-%m-%d %H:%M:%S') + "'"
-      elsif rawvalue.is_a?(Array)
-        sql[pos] = rawvalue.map{|v| "'" + Mysql2::Client.escape(v.to_s) + "'" }.join(",")
+      if rawvalue.is_a?(Array)
+        sql[pos] = rawvalue.map{|v| quote(v) }.join(",")
       else
-        sql[pos] = "'" + Mysql2::Client.escape(rawvalue.to_s) + "'"
+        sql[pos] = quote(rawvalue)
       end
     end
     sql
   end
 
+  private
+
+  def self.quote(rawvalue)
+    case rawvalue
+    when nil
+      'NULL'
+    when true
+      'TRUE'
+    when false
+      'FALSE'
+    else
+      if rawvalue.respond_to?(:strftime)
+        "'#{rawvalue.strftime('%Y-%m-%d %H:%M:%S')}'"
+      else
+        "'#{Mysql2::Client.escape(rawvalue.to_s)}'"
+      end
+    end
+  end
 end

data/mysql2-cs-bind.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "mysql2-cs-bind"
-  gem.version       = "0.0.5"
+  gem.version       = "0.1.1"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.homepage      = "https://github.com/tagomoris/mysql2-cs-bind"
@@ -14,11 +14,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency "mysql2"  
+  gem.required_ruby_version = ">= 2.0.0"
+
+  gem.add_runtime_dependency "mysql2"
 
   # tests
-  gem.add_development_dependency "mysql2"
-  gem.add_development_dependency 'eventmachine'
   gem.add_development_dependency 'rake-compiler', "~> 0.7.7"
   gem.add_development_dependency 'rake', '0.8.7' # NB: 0.8.7 required by rake-compiler 0.7.9
   gem.add_development_dependency 'rspec', '2.10.0'

data/spec/mysql2/client_spec.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 require 'spec_helper'
+require 'time'
 
 describe Mysql2::Client do
   before(:each) do
@@ -20,7 +21,7 @@ describe Mysql2::Client do
       @klass.pseudo_bind("SELECT x,y,z FROM x WHERE x=?", [1]).should eql("SELECT x,y,z FROM x WHERE x='1'")
       @klass.pseudo_bind("SELECT x,y,z FROM x WHERE x=? AND y=?", [1, 'X']).should eql("SELECT x,y,z FROM x WHERE x='1' AND y='X'")
     end
-      
+
     it "should raise ArgumentError if mismatch exists between placeholders and arguments" do
       expect {
         @klass.pseudo_bind("SELECT x,y,z FROM x", [1])
@@ -41,16 +42,23 @@ describe Mysql2::Client do
     end
 
     it "should replace placeholder with formatted timestamp string about Time object" do
-      require 'time'
       t = Time.strptime('2012/04/20 16:50:45', '%Y/%m/%d %H:%M:%S')
       @klass.pseudo_bind("UPDATE x SET y=? WHERE x=?", [t,1]).should eql("UPDATE x SET y='2012-04-20 16:50:45' WHERE x='1'")
     end
 
+    it "should replace placeholder with TRUE/FALSE about true/false" do
+      @klass.pseudo_bind("UPDATE x SET y=? WHERE x=?", [true,1]).should eql("UPDATE x SET y=TRUE WHERE x='1'")
+      @klass.pseudo_bind("UPDATE x SET y=? WHERE x=?", [false,1]).should eql("UPDATE x SET y=FALSE WHERE x='1'")
+    end
+
     it "should replace placeholder with value list about Array object" do
+      t = Time.strptime('2012/04/20 16:50:45', '%Y/%m/%d %H:%M:%S')
       @klass.pseudo_bind("SELECT x,y,z FROM x WHERE x in (?)", [[1,2,3]]).should eql("SELECT x,y,z FROM x WHERE x in ('1','2','3')")
       @klass.pseudo_bind("SELECT x,y,z FROM x WHERE x = ? and y in (?)", [1, [1, 2, 3]]).should eql("SELECT x,y,z FROM x WHERE x = '1' and y in ('1','2','3')")
       @klass.pseudo_bind("SELECT id FROM (SELECT 1 AS id) AS tbl WHERE id = ? OR id in (?)", [1, [2,3]]).should eql("SELECT id FROM (SELECT 1 AS id) AS tbl WHERE id = '1' OR id in ('2','3')")
       @klass.pseudo_bind("SELECT id FROM (SELECT 1 AS id) AS tbl WHERE id in (?) OR id = ?", [[1,2], 3]).should eql("SELECT id FROM (SELECT 1 AS id) AS tbl WHERE id in ('1','2') OR id = '3'")
+      @klass.pseudo_bind("SELECT x,y,z FROM x WHERE x = ? and y in (?)", [1, [true, nil]]).should eql("SELECT x,y,z FROM x WHERE x = '1' and y in (TRUE,NULL)")
+      @klass.pseudo_bind("SELECT x,y,z FROM x WHERE x = ? and y in (?)", [1, [t, nil]]).should eql("SELECT x,y,z FROM x WHERE x = '1' and y in ('2012-04-20 16:50:45',NULL)")
     end
   end
 
@@ -63,23 +71,16 @@ describe Mysql2::Client do
       }.to_not raise_exception(Mysql2::Error)
     end
 
-    it "should accept an options hash that inherits from Mysql2::Client.default_query_options" do
-      @client.xquery "SELECT ?", 1, :something => :else
-      @client.query_options.should eql(@client.query_options.merge(:something => :else))
-    end
-
     it "should return results as a hash by default" do
       @client.xquery("SELECT ?", 1).first.class.should eql(Hash)
     end
 
     it "should be able to return results as an array" do
       @client.xquery("SELECT ?", 1, :as => :array).first.class.should eql(Array)
-      @client.xquery("SELECT ?", 1).each(:as => :array)
-      @client.query("SELECT 1").first.should eql([1])
-      @client.query("SELECT '1'").first.should eql(['1'])
+      @client.xquery("SELECT ?", 1).each(:as => :array).first.class.should eql(Array)
       @client.xquery("SELECT 1", :as => :array).first.should eql([1])
-      @client.xquery("SELECT ?", 1).first.should eql(['1'])
-      @client.xquery("SELECT ?+1", 1).first.should eql([2.0])
+      @client.xquery("SELECT ?", 1, :as => :array).first.should eql(['1'])
+      @client.xquery("SELECT ?+1", 1, :as => :array).first.should eql([2.0])
     end
 
     it "should read multi style args" do
@@ -119,10 +120,4 @@ describe Mysql2::Client do
   it "should respond to escape" do
     Mysql2::Client.should respond_to(:escape)
   end
-
-  if RUBY_VERSION =~ /1.9/
-    it "should respond to #encoding" do
-      @client.should respond_to(:encoding)
-    end
-  end
 end

data/spec/mysql2/error_spec.rb

@@ -34,36 +34,4 @@ describe Mysql2::Error do
   it "should alias #message to #error" do
     @error.should respond_to(:error)
   end
-
-  if RUBY_VERSION =~ /1.9/
-    it "#message encoding should match the connection's encoding, or Encoding.default_internal if set" do
-      if Encoding.default_internal.nil?
-        @error.message.encoding.should eql(@client.encoding)
-        @error2.message.encoding.should eql(@client2.encoding)
-      else
-        @error.message.encoding.should eql(Encoding.default_internal)
-        @error2.message.encoding.should eql(Encoding.default_internal)
-      end
-    end
-
-    it "#error encoding should match the connection's encoding, or Encoding.default_internal if set" do
-      if Encoding.default_internal.nil?
-        @error.error.encoding.should eql(@client.encoding)
-        @error2.error.encoding.should eql(@client2.encoding)
-      else
-        @error.error.encoding.should eql(Encoding.default_internal)
-        @error2.error.encoding.should eql(Encoding.default_internal)
-      end
-    end
-
-    it "#sql_state encoding should match the connection's encoding, or Encoding.default_internal if set" do
-      if Encoding.default_internal.nil?
-        @error.sql_state.encoding.should eql(@client.encoding)
-        @error2.sql_state.encoding.should eql(@client2.encoding)
-      else
-        @error.sql_state.encoding.should eql(Encoding.default_internal)
-        @error2.sql_state.encoding.should eql(Encoding.default_internal)
-      end
-    end
-  end
 end

metadata

@@ -1,84 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: mysql2-cs-bind
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors:
 - TAGOMORI Satoshi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -86,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -94,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -102,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -115,7 +74,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -128,27 +87,25 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/tagomoris/mysql2-cs-bind
 licenses: []
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.21
-signing_key: 
-specification_version: 3
+rubygems_version: 3.3.0.dev
+signing_key:
+specification_version: 4
 summary: extension for mysql2 to add client-side variable binding
 test_files:
 - spec/mysql2/client_spec.rb