simple-sql 0.5.27 → 0.5.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd927c6b8b525593892421de3ce43fefa20d036c3d3eaf3ee3f0bbb863108deb
-  data.tar.gz: 2765ce9e6f3e86801074b014f142a607673f04692c6b0d8d3424c024066f25c9
+  metadata.gz: fb4af8eb0802b84e83370417d134ff18f82c812dbd9a053853739d9570f92a95
+  data.tar.gz: 0b023420320187d12f32cb6e1a4a093775a5bd2849015443768b0177392729fb
 SHA512:
-  metadata.gz: b4737e323e981525a17129dfdfd1e5a8076e99350ae0f758d6e5d53386ecd57e8d1c66766dbf8ded98b6fdf14ca25ee5a2a616b6c3ae04b844917d71f2ad720a
-  data.tar.gz: 8a86b32006f6bf1713c71550ea4a32bf4c393558ec8d76738d9905cae114bb470404c5168c10b352b5394b2ea7230277b931089cea9f15110e04522cb279cd5c
+  metadata.gz: 996461571d090b5cf7589dfc6f1d12925b11b54d047fc2ec2395bbb6a2d75e583a7f82d0cc92985982891d3254e3e26a83260f6a38be5bee0eac5872effb4609
+  data.tar.gz: 57decbf1a834422bdfc2987056c3fa37f04988de7059ed8c6eb8aa64ffc16c445a19f1dc9e91f880eac8a2ea7e8772dcfb8b1aeaf43b57ca7f13d4662ceaf177

data/.ruby-version

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

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'byebug'
+gem 'pry-byebug'
 gem 'rubocop', '~> 0.57.2'
 
 # Specify your gem's dependencies in {gemname}.gemspec

data/Makefile

@@ -1,15 +1,15 @@
 tests: test4 test5 test6
 
 test4:
-	SIMPLE_SQL_ACTIVERECORD_SPECS="< 5" bundle
+	SIMPLE_SQL_ACTIVERECORD_SPECS="> 4,< 5" bundle
 	rspec
 
 test5:
-	SIMPLE_SQL_ACTIVERECORD_SPECS="< 6" bundle
+	SIMPLE_SQL_ACTIVERECORD_SPECS="> 5,< 6" bundle update activerecord
 	rspec
 
 test6:
-	SIMPLE_SQL_ACTIVERECORD_SPECS="< 7" bundle
+	SIMPLE_SQL_ACTIVERECORD_SPECS="> 6,< 7" bundle update activerecord
 	rspec
 
 stats:

data/VERSION

@@ -1 +1 @@
-0.5.27
+0.5.32

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

@@ -12,6 +12,7 @@ require_relative "sql/config"
 require_relative "sql/logging"
 require_relative "sql/connection"
 require_relative "sql/table_print"
+require_relative "sql/monkey_patches"
 
 module Simple
   # The Simple::SQL module

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/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/helpers/immutable.rb

@@ -1,152 +1,10 @@
+require "simple-immutable"
+
 module Simple
   module SQL
     module Helpers
+      # for backwards compatibility
+      Immutable = ::Simple::Immutable
     end
   end
 end
-
-class Simple::SQL::Helpers::Immutable
-  SELF = self
-
-  # turns an object, which can be a hash or array of hashes, arrays, and scalars
-  # into an object which you can use to access with dot methods.
-  def self.create(object, max_depth = 5)
-    case object
-    when Array
-      raise ArgumentError, "Object nested too deep (or inner loop?)" if max_depth < 0
-
-      object.map { |obj| create obj, max_depth - 1 }
-    when Hash
-      new(object)
-    else
-      object
-    end
-  end
-
-  private
-
-  def initialize(hsh)
-    @hsh = hsh
-  end
-
-  def method_missing(sym, *args, &block)
-    if args.empty? && !block
-      begin
-        value = @hsh.fetch(sym.to_sym) { @hsh.fetch(sym.to_s) }
-        return SELF.create(value)
-      rescue KeyError
-        # STDERR.puts "Missing attribute #{sym} for Immutable w/#{@hsh.inspect}"
-        nil
-      end
-    end
-
-    super
-  end
-
-  public
-
-  def respond_to_missing?(method_name, include_private = false)
-    @hsh.key?(method_name.to_sym) ||
-      @hsh.key?(method_name.to_s) ||
-      super
-  end
-
-  def inspect
-    "<Immutable: #{@hsh.inspect}>"
-  end
-
-  def respond_to?(sym)
-    super || @hsh.key?(sym.to_s) || @hsh.key?(sym.to_sym)
-  end
-
-  def ==(other)
-    @hsh == other
-  end
-end
-
-if $PROGRAM_NAME == __FILE__
-
-  # rubocop:disable Metrics/AbcSize
-
-  require "test-unit"
-
-  class Simple::SQL::Helpers::Immutable::TestCase < Test::Unit::TestCase
-    Immutable = ::Simple::SQL::Helpers::Immutable
-
-    def hsh
-      {
-        a: "a-value",
-        "b": "b-value",
-        "child": {
-          name: "childname",
-          grandchild: {
-            name: "grandchildname"
-          }
-        },
-        "children": [
-          "anna",
-          "arthur",
-          {
-            action: {
-              keep_your_mouth_shut: true
-            }
-          }
-        ]
-      }
-    end
-
-    def immutable
-      Immutable.create hsh
-    end
-
-    def test_hash_access
-      assert_equal "a-value", immutable.a
-      assert_equal "b-value", immutable.b
-    end
-
-    def test_comparison
-      immutable = Immutable.create hsh
-
-      assert_equal immutable, hsh
-      assert_not_equal({}, immutable)
-    end
-
-    def test_child_access
-      child = immutable.child
-      assert_kind_of(Immutable, child)
-      assert_equal "childname", immutable.child.name
-      assert_equal "grandchildname", immutable.child.grandchild.name
-    end
-
-    def test_array_access
-      assert_kind_of(Array, immutable.children)
-      assert_equal 3, immutable.children.length
-      assert_equal "anna", immutable.children[0]
-
-      assert_kind_of(Immutable, immutable.children[2])
-      assert_equal true, immutable.children[2].action.keep_your_mouth_shut
-    end
-
-    def test_base_class
-      assert_nothing_raised do
-        immutable.object_id
-      end
-    end
-
-    def test_missing_keys
-      assert_raise(NoMethodError) do
-        immutable.foo
-      end
-    end
-
-    def test_skip_when_args_or_block
-      assert_raise(NoMethodError) do
-        immutable.a(1, 2, 3)
-      end
-      assert_raise(NoMethodError) do
-        immutable.a { :dummy }
-      end
-    end
-  end
-
-end

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

@@ -1,4 +1,5 @@
 require_relative "./immutable"
+require "simple/immutable"
 
 module Simple::SQL::Helpers::RowConverter
   SELF = self
@@ -57,7 +58,7 @@ module Simple::SQL::Helpers::RowConverter
   end
 
   class ImmutableConverter < TypeConverter #:nodoc:
-    Immutable = ::Simple::SQL::Helpers::Immutable
+    Immutable = ::Simple::Immutable
 
     def build_row_in_target_type(hsh)
       Immutable.create hsh

data/lib/simple/sql/monkey_patches.rb

@@ -0,0 +1,49 @@
+# This file contains some monkey patches
+
+module Simple::SQL::MonkeyPatches
+  def self.warn(msg)
+    @@warned ||= {}
+    return if @@warned[msg]
+
+    @@warned[msg] = true
+
+    STDERR.puts "== monkeypatch warning: #{msg}"
+  end
+end
+
+case ActiveRecord.gem_version.to_s
+when /^4/
+  :nop
+when /^5.2/
+  unless defined?(ActiveRecord::ConnectionAdapters::ConnectionPool::Reaper)
+    raise "Make sure to properly require active-record first"
+  end
+
+  # Rails5 introduced a Reaper which starts a Thread which checks for unused connections. However,
+  # these threads are never cleaned up. This monkey patch disables the creation of those threads
+  # in the first place, consequently preventing leakage of threads.
+  #
+  # see see https://github.com/rails/rails/issues/33600 and related commits and issues.
+  class ActiveRecord::ConnectionAdapters::ConnectionPool::Reaper
+    def run
+      return unless frequency && frequency > 0
+      Simple::SQL::MonkeyPatches.warn "simple-sql disables reapers for all connection pools, see https://github.com/rails/rails/issues/33600"
+    end
+  end
+
+when /^6/
+  unless defined?(ActiveRecord::ConnectionAdapters::ConnectionPool::Reaper)
+    raise "Make sure to properly require active-record first"
+  end
+
+  # Rails6 fixes the issue w/reapers leaking threads; by properly cleaning up these threads
+  # (or  so one hopes after looking at connection_pool.rb). However, in the interest of simple-sql
+  # being more or less ActiveRecord agnostic we disable reaping here as well. (Also, that code
+  # looks pretty complex to me).
+  class ActiveRecord::ConnectionAdapters::ConnectionPool::Reaper
+    def run
+      return unless frequency && frequency > 0
+      Simple::SQL::MonkeyPatches.warn "simple-sql disables reapers for all connection pools, see https://github.com/rails/rails/issues/33600"
+    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/simple-sql.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'expectation', '~> 1'
 
   gem.add_dependency 'digest-crc', '~> 0'
+  gem.add_dependency 'simple-immutable', '~> 1.0'
 
   # during tests we check the SIMPLE_SQL_ACTIVERECORD_SPECS environment setting.
   # Run make tests to run all tests

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

data/spec/simple/sql/each_spec.rb

@@ -61,7 +61,7 @@ describe "Simple::SQL.each" do
 
       expect(received.first.id).to eq(1)
       expect(received[1].dupe).to eq(2)
-      expect(received.map(&:class).uniq).to eq([Simple::SQL::Helpers::Immutable])
+      expect(received.map(&:class).uniq).to eq([Simple::Immutable])
     end
   end
 end

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ end
 ENV["RACK_ENV"] = "test"
 ENV["RAILS_ENV"] = "test"
 
-require "byebug"
+require "pry-byebug"
 require "rspec"
 
 Dir.glob("./spec/support/**/*.rb").sort.each { |path| load path }

data/spec/support/001_database.rb

@@ -1,5 +1,9 @@
 # connect to the database and setup the schema
 require "active_record"
+
+# it is important to require simple-sql here to activate monkey patches
+require "simple-sql"
+
 require "yaml"
 abc = YAML.load_file("config/database.yml")
 ActiveRecord::Base.establish_connection(abc["test"])

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: simple-sql
 version: !ruby/object:Gem::Version
-  version: 0.5.27
+  version: 0.5.32
 platform: ruby
 authors:
 - radiospiel
 - mediapeers GmbH
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_array_parser
@@ -73,6 +73,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simple-immutable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +185,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".tm_properties"
 - Gemfile
 - Makefile
@@ -212,6 +227,7 @@ files:
 - lib/simple/sql/helpers/immutable.rb
 - lib/simple/sql/helpers/row_converter.rb
 - lib/simple/sql/logging.rb
+- lib/simple/sql/monkey_patches.rb
 - lib/simple/sql/result.rb
 - lib/simple/sql/result/association_loader.rb
 - lib/simple/sql/result/records.rb
@@ -256,7 +272,7 @@ files:
 homepage: http://github.com/radiospiel/simple-sql
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -271,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: