mysql2-cs-bind 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4407a9571990644923605f3e94e689cfa2f58a2b0ae65751df47fe504c9f87cc
-  data.tar.gz: 9e7f64a7e17c636b9da92d3a8849468b35519b7bf301bcda722e7664b0f39346
+  metadata.gz: d3495f65b800c8cddbb748e628a64ed8fca1d9d33766cd1196ed124c87c2b998
+  data.tar.gz: 66d1445f6104b171ec1cb72661f33d75f010a79a557bad875d3d836303d54ed5
 SHA512:
-  metadata.gz: 1635039201253b1d8b48251fef0e5acf02ea4ac8e379af39bf417b0f1ab83f1b9f2cfe4d5587006e3c8ca5b8dd817e19978698182778e45865ae620d02f8d7f4
-  data.tar.gz: 1dfec3139736b9de9d6bb61a76a53fcf72f2909ea16f79c6620d99ad55de045288cc6557cf04c70ecd6e48a662a4cc5154e74dd31e6cd0ab86992ba921619707
+  metadata.gz: 210e1bdf190d73617d5e3df68ecae830acf14d7f78a459c8d1cbbbf514ec4245d87713a38dc7358b9e34a1608d819d243dccdf78c5ed2586d2ccbc991aa53731
+  data.tar.gz: '058ca605f2586f0e3e23a37797f571386792ea8e44145dc4e301ce2de1009d8a4439fb7d8f2f43624bc90faf1b1ff00470971b8e9cb52966ae907cb05a95d476'

data/lib/mysql2-cs-bind.rb

@@ -4,13 +4,8 @@ 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)
@@ -26,8 +21,11 @@ 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()
@@ -43,16 +41,19 @@ class Mysql2::Client
   private
 
   def self.quote(rawvalue)
-    if rawvalue.nil?
+    case rawvalue
+    when nil
       'NULL'
-    elsif rawvalue == true
+    when true
       'TRUE'
-    elsif rawvalue == false
+    when false
       'FALSE'
-    elsif rawvalue.respond_to?(:strftime)
-      "'#{rawvalue.strftime('%Y-%m-%d %H:%M:%S')}'"
     else
-      "'#{Mysql2::Client.escape(rawvalue.to_s)}'"
+      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.1.0"
+  gem.version       = "0.1.1"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.homepage      = "https://github.com/tagomoris/mysql2-cs-bind"
@@ -19,7 +19,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "mysql2"
 
   # tests
-  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

@@ -21,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])
@@ -71,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
@@ -127,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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysql2-cs-bind
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-15 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.0.dev
 signing_key:
 specification_version: 4
 summary: extension for mysql2 to add client-side variable binding