simple-sql 0.5.27 → 0.5.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd927c6b8b525593892421de3ce43fefa20d036c3d3eaf3ee3f0bbb863108deb
-  data.tar.gz: 2765ce9e6f3e86801074b014f142a607673f04692c6b0d8d3424c024066f25c9
+  metadata.gz: f29429815715916d62f0f03dc831d97e0e0312152f431a49c092a09f1bd48d9e
+  data.tar.gz: d02ced1cda31cdca64bbe1f43035cf628d40b80b20c1782bb16e44aee5f15ea8
 SHA512:
-  metadata.gz: b4737e323e981525a17129dfdfd1e5a8076e99350ae0f758d6e5d53386ecd57e8d1c66766dbf8ded98b6fdf14ca25ee5a2a616b6c3ae04b844917d71f2ad720a
-  data.tar.gz: 8a86b32006f6bf1713c71550ea4a32bf4c393558ec8d76738d9905cae114bb470404c5168c10b352b5394b2ea7230277b931089cea9f15110e04522cb279cd5c
+  metadata.gz: 1f5c9709450f03cd4b7f8691738f182667b5b53a90fc5e22b4ef00a6c7778bbd7f6f78f153839205e5ecea8a14be9beb84da3d9857e418fc09a7d5f0248881e2
+  data.tar.gz: 6ab77cad786ea2f2d2f2b6bea6d49e5b2e76e3bfa5ed15b9d856dd5b8852b2d1c376b841f5c5c78f1b92964dd0c90f87f89247a0879cf8581f5ccd2a647cbdba

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

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

@@ -1,152 +1,8 @@
 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,56 @@
+# This file contains some monkey patches
+
+module Simple::SQL::MonkeyPatches
+  def self.warn(msg)
+    @@warned ||= {}
+    return if @@warned[msg]
+
+    @@warned[msg] = true
+
+    msg = <<~MSG
+      == patching notice: ======================================================================================
+      Note that simple-sql changes the behaviour of underlying gems in subtle ways:
+      #{msg}
+      ==========================================================================================================
+    MSG
+
+    STDERR.puts 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 "disable Reaper for all ActiveRecord 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 "disable Reaper for all ActiveRecord connection pools, see https://github.com/rails/rails/issues/33600"
+    end
+  end
+end

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/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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-sql
 version: !ruby/object:Gem::Version
-  version: 0.5.27
+  version: 0.5.28
 platform: ruby
 authors:
 - radiospiel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2020-03-04 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
@@ -212,6 +226,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