simple-sql 0.5.31 → 0.5.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7490b50fc301d6e1a8c424e46a21f4a5cb97767ca2a99c7bdeed94b7c499a0d6
-  data.tar.gz: 3e1ec456a008d2abee6260b84beb1c17ca4b5934c1b934f00298ad6263b0f849
+  metadata.gz: fb4af8eb0802b84e83370417d134ff18f82c812dbd9a053853739d9570f92a95
+  data.tar.gz: 0b023420320187d12f32cb6e1a4a093775a5bd2849015443768b0177392729fb
 SHA512:
-  metadata.gz: 5c4ff2ac25d314393ff79a5f8ff3171508b05f30a99f37d1681a5b4af0fe3f07f247623321e235fc70de4d384d8e994935fc69eaf592c41b8459ceb0c875adf7
-  data.tar.gz: e59f00c7d6a3f00d1f4c2ca101985e8a01b453cc80b774f5f95b867eebea3e1dddf70a341fd4bf8904e497b19738d58e2a66d20a08372a138bf2302d918af1cb
+  metadata.gz: 996461571d090b5cf7589dfc6f1d12925b11b54d047fc2ec2395bbb6a2d75e583a7f82d0cc92985982891d3254e3e26a83260f6a38be5bee0eac5872effb4609
+  data.tar.gz: 57decbf1a834422bdfc2987056c3fa37f04988de7059ed8c6eb8aa64ffc16c445a19f1dc9e91f880eac8a2ea7e8772dcfb8b1aeaf43b57ca7f13d4662ceaf177

data/.ruby-version

@@ -0,0 +1 @@
+2.7

data/VERSION

@@ -1 +1 @@
-0.5.31
+0.5.32

data/lib/simple/sql/helpers/encoder.rb

@@ -8,11 +8,27 @@ module Simple::SQL::Helpers::Encoder
 
   def encode_arg(connection, arg)
     return arg unless arg.is_a?(Array)
+    return "{}" if arg.empty?
 
-    if arg.first.is_a?(String)
-      "{#{arg.map { |a| "\"#{connection.escape(a)}\"" }.join(',')}}"
+    encoded_ary = encode_array(connection, arg)
+    "{" + encoded_ary.join(",") + "}"
+  end
+
+  def encode_array(connection, ary)
+    case ary.first
+    when String
+      ary.map do |str|
+        str = connection.escape(str)
+
+        # These fixes have been discovered during tests. see spec/simple/sql/conversion_spec.rb
+        str = str.gsub("\"", "\\\"")
+        str = str.gsub("''", "'")
+        "\"#{str}\""
+      end
+    when Integer
+      ary
     else
-      "{#{arg.join(',')}}"
+      raise ArgumentError, "Don't know how to encode array of #{ary.first.class}"
     end
   end
 end

data/lib/simple/sql/version.rb

@@ -5,6 +5,7 @@ module Simple
 
       def version(name)
         spec = Gem.loaded_specs[name]
+        return "unreleased" unless spec
         version = spec.version.to_s
         version += "+unreleased" if unreleased?(spec)
         version

data/spec/simple/sql/conversion_spec.rb

@@ -23,6 +23,7 @@ describe "Simple::SQL conversions" do
       expects "foo,\"bar}", "SELECT $1::varchar", "foo,\"bar}"
       expects ["one", "two", "3.5", "foo,\"bar}"], "SELECT ARRAY['one', 'two', '3.5', 'foo,\"bar}']"
       expects ["foo", "foo,bar}"], "SELECT $1::varchar[]", ["foo", "foo,bar}"]
+      expects "foo'bar", 'SELECT $1', "foo'bar"
     end
 
     it "parses JSON as expected" do
@@ -42,13 +43,15 @@ describe "Simple::SQL conversions" do
     it "converts hstore" do
       expects({ a: "1", b: "3" }, "SELECT 'a=>1,b=>3'::hstore")
     end
-
-    xit "fails sometimes w/ malformed array literal, pt. 1" do
-      expects  0, 'SELECT $1::varchar[]', [ "foo", 'foo,"bar}' ]
-    end
-
-    xit "fails sometimes w/ malformed array literal, pt. 2" do
-      expects  0, 'SELECT $1::varchar[]', [ "foo", 'foo,"bar}' ]
+  end
+  
+  describe "arra conversions" do
+    it "works with strings" do
+      expects  [ "foo", "bar" ], 'SELECT $1::varchar[]', [ "foo", "bar" ]
+
+      # test escaping
+      expects  [ "foo", "foo'bar\"baz" ], 'SELECT $1::varchar[]', [ "foo", "foo'bar\"baz" ]
+      expects  [ ], 'SELECT $1::varchar[]', []
     end
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: simple-sql
 version: !ruby/object:Gem::Version
-  version: 0.5.31
+  version: 0.5.32
 platform: ruby
 authors:
 - radiospiel
 - mediapeers GmbH
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_array_parser
@@ -185,6 +185,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".tm_properties"
 - Gemfile
 - Makefile
@@ -271,7 +272,7 @@ files:
 homepage: http://github.com/radiospiel/simple-sql
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -286,8 +287,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: SQL with a simple interface
 test_files: