table_saw 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 858ba4566ea024a132f1f674faaabecafd97938d930329f552a2bd86530e46c7
-  data.tar.gz: 5cada2de36a7790563ec3347a7af8b52d3e70722387b13258b11c78b33798015
+  metadata.gz: bfb7db9a15aed357484e10dabd9687a4b06fa2f8871bbff409c2dd54e7172cb3
+  data.tar.gz: ae37d05b97291739a83964d6e7b2c741cafbf7579087bb5c9e5721c0f08efd78
 SHA512:
-  metadata.gz: '036185f2584a299a98439068e1cef0dcbd5229b0fb81768029e92beb3f4e724865379dea00a84a169eeedddcbf99262ef7bb1fafaf0646310f8424669a79a4bd'
-  data.tar.gz: db613c022e74e739c9109b3c5d25ba3e12682083446df5aac6c84cdf2f4216298e55edbd618e95b5c541c614a558497a09433af6afe4db87f632d5ea5c374241
+  metadata.gz: 60c64ddc7485a42fd359de58e6c0cbcaff2a05747ad03998e7ee9774e28d02864025a99f4513f8f63320364a8b00034771c4b946ce776f07e66ebd3dd232d2a3
+  data.tar.gz: 2b754503fa0039d4192e73c006e5fac4abde173dc26b2625242260f54e215e57f31f2a3ca9455e35bbd743b5b051b7ba6e68987fec9e06aa1a37a0b52136a469

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    table_saw (2.3.0)
+    table_saw (2.4.0)
       activerecord (>= 5.2)
       pg
       thor
@@ -9,35 +9,34 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
+    actionpack (6.0.1)
+      actionview (= 6.0.1)
+      activesupport (= 6.0.1)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.0.1)
+      activesupport (= 6.0.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
-      arel (>= 9.0)
-    activesupport (5.2.3)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activemodel (6.0.1)
+      activesupport (= 6.0.1)
+    activerecord (6.0.1)
+      activemodel (= 6.0.1)
+      activesupport (= 6.0.1)
+    activesupport (6.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (9.0.0)
+      zeitwerk (~> 2.2)
     ast (2.4.0)
     builder (3.2.3)
     coderay (1.1.2)
-    combustion (1.1.0)
+    combustion (1.1.2)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
@@ -46,18 +45,18 @@ GEM
     database_cleaner (1.7.0)
     diff-lcs (1.3)
     docile (1.3.1)
-    erubi (1.8.0)
+    erubi (1.9.0)
     i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.2)
     json (2.2.0)
-    loofah (2.3.1)
+    loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (0.9.2)
     mini_portile2 (2.4.0)
     minitest (5.13.0)
-    nokogiri (1.10.5)
+    nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
     parallel (1.17.0)
     parser (2.6.3.0)
@@ -72,14 +71,14 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.1)
+      actionpack (= 6.0.1)
+      activesupport (= 6.0.1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
     rake (10.5.0)
     rspec (3.8.0)
@@ -113,11 +112,12 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    thor (0.19.4)
+    thor (0.20.3)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unicode-display_width (1.6.0)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby

data/lib/table_saw/connection.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-require 'pg'
 require 'active_record'
+
+require 'active_record/connection_adapters/abstract/connection_pool'
 require 'active_record/connection_adapters/postgresql_adapter'
 
 module TableSaw
@@ -9,11 +10,7 @@ module TableSaw
     def self.with
       raise ArgumentError, 'requires a block' unless block_given?
 
-      yield raw
-    end
-
-    def self.raw
-      @raw ||= PG::Connection.new(TableSaw.configuration.connection)
+      yield adapter.raw_connection
     end
 
     def self.exec(sql)
@@ -23,8 +20,11 @@ module TableSaw
     end
 
     def self.adapter
-      @adapter ||=
-        ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.new(nil, nil, TableSaw.configuration.connection, {})
+      @adapter ||= begin
+        config = TableSaw.configuration.connection
+        conn = ::PG::Connection.new(config)
+        ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.new(conn, nil, config, {})
+      end
     end
   end
 end

data/lib/table_saw/dependency_graph/belongs_to_directives.rb

@@ -27,6 +27,7 @@ module TableSaw
         end
       end
 
+      # rubocop:disable Metrics/AbcSize
       def query_result(column)
         return [] unless directive.selectable?
 
@@ -34,10 +35,13 @@ module TableSaw
           format(
             'select distinct %{column} from %{table_name} where %{clause} and %{column} is not null',
             primary_key: directive.primary_key, column: column, table_name: directive.table_name,
-            clause: TableSaw::Queries::SerializeSqlInClause.new(directive.table_name, column, directive.ids).call
+            clause: TableSaw::Queries::SerializeSqlInClause.new(directive.table_name,
+                                                                directive.primary_key,
+                                                                directive.ids).call
           )
         )
       end
+      # rubocop:enable Metrics/AbcSize
     end
   end
 end

data/lib/table_saw/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TableSaw
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: table_saw
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Hamed Asghari