table_saw 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50acf974664b7ae8917c8fc20aded1f23d2fcf8125534b4c8b498a08da7cb63b
-  data.tar.gz: bbe5f9639f59cdef8b60054528786b83e88e81aa4d10a142032fb8d3342a968e
+  metadata.gz: 0fe94c6f653348bda1f6a069925e802d271e251d09be82b0e817d758296e5bf6
+  data.tar.gz: 9a6ea705f4cde2aa3c3750c28cc66ccf7a28358e113bf930151c9877e9cacb35
 SHA512:
-  metadata.gz: 55665d3b16286ac9c726d39f2008e5f075e3e5a64d85a351cb1bf33a61fccb649895d83719889fe3fb0fce2ae9f624cfb84cf5920814edb6691e4db2d5b12183
-  data.tar.gz: 13510d5e13ee27ca84b99e7c82bfc2709a21460d652eeb153458dcfe4157fa8ee4c285f1165244c21f807567686ec42b7a44b7edace6eb011f6e034872fa0ea7
+  metadata.gz: d01a1f66e7c418e8ab3f01c1ab65e6cd4f3439e00edaa9f0e39cfa144e5cbe2d8d1a7e32cf359ab228bc40bef722e5d218619dbc8d462f1115bd0e4922ba430f
+  data.tar.gz: f02f30fb42c96cf3a4b87a155c6a727ce703d9788e78df6aeba01f20e524309c18741c3a87ed83c3ef42983b0f3bfa7211357c934f9edbc0b64cacbf2fd715ad

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    table_saw (2.1.0)
+    table_saw (2.2.0)
+      activerecord (>= 5.2)
       pg
       thor
 
@@ -46,7 +47,7 @@ GEM
     diff-lcs (1.3)
     docile (1.3.1)
     erubi (1.8.0)
-    i18n (1.6.0)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.2)
     json (2.2.0)
@@ -55,7 +56,7 @@ GEM
       nokogiri (>= 1.5.9)
     method_source (0.9.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
+    minitest (5.13.0)
     nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
     parallel (1.17.0)
@@ -122,7 +123,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 5.2)
   bundler (~> 2.0)
   combustion (~> 1.1)
   database_cleaner (~> 1.7)

data/lib/table_saw/connection.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'pg'
+require 'active_record'
+require 'active_record/connection_adapters/postgresql_adapter'
 
 module TableSaw
   module Connection
@@ -19,5 +21,10 @@ module TableSaw
         conn.exec(sql)
       end
     end
+
+    def self.adapter
+      @adapter ||=
+        ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.new(nil, nil, TableSaw.configuration.connection, {})
+    end
   end
 end

data/lib/table_saw/dependency_graph/belongs_to_directives.rb

@@ -11,7 +11,7 @@ module TableSaw
 
       def call
         associations.map do |from_column, to_table|
-          TableSaw::DependencyGraph::AddDirective.new(to_table, ids: ids[from_column].to_a, partial: directive.partial?)
+          TableSaw::DependencyGraph::AddDirective.new(to_table, ids: ids[from_column], partial: directive.partial?)
         end
       end
 
@@ -22,18 +22,20 @@ module TableSaw
       end
 
       def ids
-        @ids ||= query_result.each_with_object(Hash.new { |h, k| h[k] = Set.new }) do |row, memo|
-          associations.each_key { |key| memo[key].add row[key] unless row[key].nil? }
+        @ids ||= associations.each_key.each_with_object({}) do |column, memo|
+          memo[column] = query_result(column).map { |row| row[column] }
         end
       end
 
-      def query_result
+      def query_result(column)
         return [] unless directive.selectable?
 
         TableSaw::Connection.exec(
-          format('select %{columns} from %{table_name} where %{primary_key} in (%{ids})',
-                 primary_key: directive.primary_key, columns: associations.keys.join(','),
-                 table_name: directive.table_name, ids: directive.ids.join(','))
+          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
+          )
         )
       end
     end

data/lib/table_saw/dependency_graph/dump_table.rb

@@ -14,7 +14,9 @@ module TableSaw
 
       def copy_statement
         if partial
-          "select * from #{name} where #{primary_key} in (#{ids.to_a.join(',')})"
+          format 'select * from %{name} where %{clause}',
+                 name: name, clause: TableSaw::Queries::SerializeSqlInClause.new(name, primary_key, ids.to_a).call
+
         else
           "select * from #{name}"
         end

data/lib/table_saw/dependency_graph/has_many_directives.rb

@@ -41,9 +41,11 @@ module TableSaw
         return [] unless directive.selectable?
 
         TableSaw::Connection.exec(
-          format('select %{primary_key} from %{table} where %{column} in (%{ids})',
-                 primary_key: TableSaw.information_schema.primary_keys[table], table: table, column: column,
-                 ids: directive.ids.join(','))
+          format(
+            'select %{primary_key} from %{table} where %{clause}',
+            primary_key: TableSaw.information_schema.primary_keys[table], table: table,
+            clause: TableSaw::Queries::SerializeSqlInClause.new(table, column, directive.ids).call
+          )
         )
       end
     end

data/lib/table_saw/queries.rb

@@ -4,4 +4,5 @@ require 'table_saw/queries/foreign_key_relationships'
 require 'table_saw/queries/materialized_views'
 require 'table_saw/queries/primary_keys'
 require 'table_saw/queries/serial_sequences'
+require 'table_saw/queries/serialize_sql_in_clause'
 require 'table_saw/queries/table_columns'

data/lib/table_saw/queries/serialize_sql_in_clause.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module TableSaw
+  module Queries
+    class SerializeSqlInClause
+      attr_reader :table_name, :column, :values
+
+      def initialize(table_name, column, values)
+        @table_name = table_name
+        @column = column
+        @values = values
+      end
+
+      def call
+        "#{column} in (#{serialized_values.join(', ')})"
+      end
+
+      private
+
+      def db_column
+        @db_column ||= connection.columns(table_name).find { |c| c.name == column }
+      end
+
+      def serialized_values
+        values.map do |value|
+          connection.quote(connection.type_cast_from_column(db_column, value))
+        end
+      end
+
+      def connection
+        TableSaw::Connection.adapter
+      end
+    end
+  end
+end

data/lib/table_saw/version.rb

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

data/table_saw.gemspec

@@ -23,10 +23,10 @@ Gem::Specification.new do |spec|
   spec.executables   = ['table-saw']
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'activerecord', '>= 5.2'
   spec.add_dependency 'pg'
   spec.add_dependency 'thor'
 
-  spec.add_development_dependency 'activerecord', '~> 5.2'
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'combustion', '~> 1.1'
   spec.add_development_dependency 'database_cleaner', '~> 1.7'

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: table_saw
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Hamed Asghari
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-02 00:00:00.000000000 Z
+date: 2019-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -218,6 +218,7 @@ files:
 - lib/table_saw/queries/materialized_views.rb
 - lib/table_saw/queries/primary_keys.rb
 - lib/table_saw/queries/serial_sequences.rb
+- lib/table_saw/queries/serialize_sql_in_clause.rb
 - lib/table_saw/queries/table_columns.rb
 - lib/table_saw/version.rb
 - table_saw.gemspec