simple-sql 0.5.30 → 0.5.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4df3c3c433daf56581fb5120228b52b17f7c008e92580443fa0a71c9825092b6
-  data.tar.gz: e7df0fe593ca46a2d8ad317288e88e8a3d016cb5ca0f903b2c8ee07864517c0f
+  metadata.gz: 0b6a39a5150718d4ebd5526cdd8b0647e9740c2665b773eb09d7fb628635b61d
+  data.tar.gz: 23a1ca7c2f038d6a54de9c8d2ce57cf8c36449cf9e51cc707247f1198244031a
 SHA512:
-  metadata.gz: 2f2fa917d404f44f6f58ecdda70d512cd1a0610fcbfbde9a73aef4cf5f60a42a1df33168053f130370822128d0836901a6786d44fa68a780d416583b15ee3a54
-  data.tar.gz: 5ab5429b72e22ffe4b2f3441747e84032e400b55680bb0975cf5f6938fbcde82243799c069af52d4e19a26fc35d8bc7bbafe8352590c20359ee66e57841973af
+  metadata.gz: ee190d57adc21f5db218a2898740d1dbb43139621873bce77c1d31a9432b158a4ef9cefbd03f41b7b834a537faa6d96d258a9e7fa35df49ced1711a2a18d8359
+  data.tar.gz: d88531b52001784cf314c41ee7b993d496a552d6c3e47617ff56a0e758f7dd4ea7241a7b1e449c4678af202bcf7192b71f8a2c031cb06b929327d96e4b9d4941

data/.ruby-version

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

data/VERSION

@@ -1 +1 @@
-0.5.30
+0.5.35

data/config/database.yml

@@ -2,7 +2,8 @@ defaults: &defaults
   adapter: postgresql
   encoding: utf8
   host: '127.0.0.1'
-  # username: postgres
+  username: admin
+  password: admin
   pool: 5
   timeout: 5000
 

data/lib/simple/sql/connection/scope.rb

@@ -84,6 +84,7 @@ class Simple::SQL::Connection::Scope
     dupe.instance_variable_set :@page, @page
     dupe.instance_variable_set :@order_by_fragment, @order_by_fragment
     dupe.instance_variable_set :@limit, @limit
+    dupe.instance_variable_set :@offset, @offset
     dupe
   end
 

data/lib/simple/sql/connection/scope/count_by_groups.rb

@@ -21,7 +21,13 @@ class Simple::SQL::Connection::Scope
     sql = order_by(nil).to_sql(pagination: false)
 
     cost = @connection.estimate_cost "SELECT MIN(#{sql_fragment}) FROM (#{sql}) sq", *args
-    raise "enumerate_groups(#{sql_fragment.inspect}) takes too much time. Make sure to create a suitable index" if cost > 10_000
+
+    # cost estimates are good, but are hard to check against a hard coded value.
+    # see https://issues.mediafellows.com/issues/75232
+    #
+    # if cost > 10_000
+    #   raise "enumerate_groups(#{sql_fragment.inspect}) takes too much time. Make sure to create a suitable index"
+    # end
 
     groups = []
     var_name = "$#{@args.count + 1}"

data/lib/simple/sql/connection/scope/order.rb

@@ -3,8 +3,16 @@ class Simple::SQL::Connection::Scope
     duplicate.send(:order_by!, sql_fragment)
   end
 
-  def limit(count)
-    duplicate.send(:limit!, count)
+  def limit(limit)
+    raise ArgumentError, "limit must be >= 0" unless limit >= 0
+
+    duplicate.send(:limit!, limit)
+  end
+
+  def offset(offset)
+    raise ArgumentError, "offset must be >= 0" unless offset >= 0
+
+    duplicate.send(:offset!, offset)
   end
 
   private
@@ -21,10 +29,16 @@ class Simple::SQL::Connection::Scope
     self
   end
 
+  def offset!(offset)
+    @offset = offset
+    self
+  end
+
   # called from to_sql
   def apply_order_and_limit(sql)
     sql = "#{sql} ORDER BY #{@order_by_fragment}" if @order_by_fragment
     sql = "#{sql} LIMIT #{@limit}" if @limit
+    sql = "#{sql} OFFSET #{@offset}" if @offset
 
     sql
   end

data/lib/simple/sql/connection/scope/pagination.rb

@@ -3,6 +3,9 @@
 class Simple::SQL::Connection::Scope
   # Set pagination
   def paginate(per:, page:)
+    raise ArgumentError, "per must be > 0" unless per > 0
+    raise ArgumentError, "page must be > 0" unless page > 0
+
     duplicate.send(:paginate!, per: per, page: page)
   end
 
@@ -23,8 +26,7 @@ class Simple::SQL::Connection::Scope
   def apply_pagination(sql, pagination:)
     return sql unless pagination == :auto && @per && @page
 
-    raise ArgumentError, "per must be > 0" unless @per > 0
-    raise ArgumentError, "page must be > 0" unless @page > 0
+    raise ArgumentError, "You cannot mix 'paginate' and 'offset'/'limit'" if @offset || @limit
 
     "#{sql} LIMIT #{@per} OFFSET #{(@page - 1) * @per}"
   end

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/monkey_patches.rb

@@ -2,12 +2,14 @@
 
 module Simple::SQL::MonkeyPatches
   def self.warn(msg)
+    return if ENV["SIMPLE_SQL_SILENCE"] == "1"
+
     @@warned ||= {}
     return if @@warned[msg]
 
     @@warned[msg] = true
 
-    STDERR.puts "== monkeypatch warning: #{msg}"
+    STDERR.puts "== monkeypatch warning: #{msg} (set SIMPLE_SQL_SILENCE=1 to disable)"
   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/scripts/benchmark1.rb

@@ -0,0 +1,29 @@
+require "benchmark"
+require "simple-sql"
+
+ENV["DATABASE_URL"] = "postgres://admin:admin@localhost/um_development"
+
+Simple::SQL.connect
+# require 'stackprof'# added
+
+Benchmark.bmbm do |x|
+  x.report("1000x Simple::SQL HStore performance for 100 users") do
+    1000.times { Simple::SQL.all("SELECT id, meta_data FROM users limit 100") }
+  end
+
+  x.report("1000x Simple::SQL HStore::varchar performance for 100 users") do
+    1000.times { Simple::SQL.all("SELECT id, meta_data::varchar FROM users limit 100") }
+  end
+
+  x.report("1000x Simple::SQL HStore as jsonb performance for 100 users") do
+    1000.times { Simple::SQL.all("SELECT id, to_jsonb(meta_data) FROM users limit 100") }
+  end
+
+  x.report("1000x Simple::SQL timestamp performance for 100 users") do
+    1000.times { Simple::SQL.all("SELECT id, created_at FROM users limit 100") }
+  end
+
+  x.report("1000x Simple::SQL timestamp::varchar performance for 100 users") do
+    1000.times { Simple::SQL.all("SELECT id, created_at::varchar FROM users limit 100") }
+  end
+end

data/simple-sql.gemspec

@@ -33,16 +33,16 @@ Gem::Specification.new do |gem|
   # during tests we check the SIMPLE_SQL_ACTIVERECORD_SPECS environment setting.
   # Run make tests to run all tests
   if ENV["SIMPLE_SQL_ACTIVERECORD_SPECS"]
-    gem.add_dependency 'activerecord', '> 4.2', *(ENV["SIMPLE_SQL_ACTIVERECORD_SPECS"].split(","))
+    gem.add_dependency 'activerecord', '>= 5.2.4.5', *(ENV["SIMPLE_SQL_ACTIVERECORD_SPECS"].split(","))
   else
-    gem.add_dependency 'activerecord', '> 4.2', '< 7'
+    gem.add_dependency 'activerecord', '>= 5.2.4.5', '< 6.1'
   end
 
   # optional gems (required by some of the parts)
 
   # development gems
   gem.add_development_dependency 'pg', '0.20'
-  gem.add_development_dependency 'rake', '~> 11'
+  gem.add_development_dependency 'rake', '>= 12.3.3'
   gem.add_development_dependency 'rspec', '~> 3.7'
   gem.add_development_dependency 'rubocop', '~> 0.61.1'
   gem.add_development_dependency 'simplecov', '~> 0'

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.30
+  version: 0.5.35
 platform: ruby
 authors:
 - radiospiel
 - mediapeers GmbH
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-25 00:00:00.000000000 Z
+date: 2021-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_array_parser
@@ -91,22 +91,22 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.2.4.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.2.4.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -125,16 +125,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -185,6 +185,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".tm_properties"
 - Gemfile
 - Makefile
@@ -234,6 +235,7 @@ files:
 - lib/simple/sql/table_print.rb
 - lib/simple/sql/version.rb
 - log/.gitkeep
+- scripts/benchmark1.rb
 - scripts/release
 - scripts/release.rb
 - scripts/stats
@@ -271,7 +273,7 @@ files:
 homepage: http://github.com/radiospiel/simple-sql
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -286,8 +288,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: