table_saw 2.9.0 → 3.0.0

data/gemfiles/activerecord_6.1.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    table_saw (2.9.0)
+    table_saw (3.0.0)
       activerecord (>= 5.2)
       pg
       thor
@@ -9,127 +9,139 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.1.0)
-      actionview (= 6.1.0)
-      activesupport (= 6.1.0)
+    actionpack (6.1.7.3)
+      actionview (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.1.0)
-      activesupport (= 6.1.0)
+    actionview (6.1.7.3)
+      activesupport (= 6.1.7.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (6.1.0)
-      activesupport (= 6.1.0)
-    activerecord (6.1.0)
-      activemodel (= 6.1.0)
-      activesupport (= 6.1.0)
-    activesupport (6.1.0)
+    activemodel (6.1.7.3)
+      activesupport (= 6.1.7.3)
+    activerecord (6.1.7.3)
+      activemodel (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
+    activesupport (6.1.7.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    appraisal (2.3.0)
+    appraisal (2.4.1)
       bundler
       rake
       thor (>= 0.14.0)
-    ast (2.4.1)
+    ast (2.4.2)
     builder (3.2.4)
     coderay (1.1.3)
-    combustion (1.3.1)
+    combustion (1.3.7)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.2.2)
     crass (1.0.6)
-    database_cleaner (1.8.5)
-    diff-lcs (1.4.4)
-    docile (1.3.4)
-    erubi (1.10.0)
-    i18n (1.8.5)
+    database_cleaner (2.0.2)
+      database_cleaner-active_record (>= 2, < 3)
+    database_cleaner-active_record (2.1.0)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    erubi (1.12.0)
+    i18n (1.13.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.8.0)
+    json (2.6.3)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     method_source (1.0.0)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    minitest (5.18.0)
+    nokogiri (1.15.2-x86_64-darwin)
+      racc (~> 1.4)
+    parallel (1.23.0)
+    parser (3.2.2.1)
       ast (~> 2.4.1)
-    pg (1.2.3)
-    pry (0.13.1)
+    pg (1.5.3)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    racc (1.6.2)
+    rack (2.2.7)
+    rack-test (2.1.0)
+      rack (>= 1.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (6.1.0)
-      actionpack (= 6.1.0)
-      activesupport (= 6.1.0)
+    rails-html-sanitizer (1.5.0)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (6.1.7.3)
+      actionpack (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       method_source
-      rake (>= 0.8.7)
+      rake (>= 12.2)
       thor (~> 1.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.3)
-    regexp_parser (2.0.3)
-    rexml (3.2.4)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    regexp_parser (2.8.0)
+    rexml (3.2.5)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.1)
-    rubocop (0.93.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.51.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
-      rexml
-      rubocop-ast (>= 0.6.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.3.0)
-      parser (>= 2.7.1.5)
-    rubocop-rspec (1.44.1)
-      rubocop (~> 0.87)
-      rubocop-ast (>= 0.7.1)
-    ruby-progressbar (1.11.0)
-    scenic (1.5.4)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.1)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.23.1)
+      rubocop (~> 1.33)
+    rubocop-rspec (2.22.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
+    scenic (1.7.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    simplecov (0.20.0)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.2)
-    thor (1.0.1)
-    tzinfo (2.0.4)
+    simplecov_json_formatter (0.1.4)
+    thor (1.2.2)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.4.2)
+    unicode-display_width (2.4.2)
+    zeitwerk (2.6.8)
 
 PLATFORMS
-  x86_64-darwin-20
+  x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
@@ -137,14 +149,14 @@ DEPENDENCIES
   appraisal
   bundler (~> 2.0)
   combustion (~> 1.3)
-  database_cleaner (~> 1.7)
+  database_cleaner (~> 2)
   pry
-  rake (~> 13.0)
+  rake (= 13.0.3)
   rspec (~> 3.0)
-  rubocop-rspec (~> 1.33)
+  rubocop-rspec (~> 2.3)
   scenic (~> 1.5)
   simplecov (~> 0.16)
   table_saw!
 
 BUNDLED WITH
-   2.2.3
+   2.4.13

data/gemfiles/activerecord_7.0.0.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "bundler", "~> 2.0"
+gem "combustion", "~> 1.3"
+gem "database_cleaner", "~> 2"
+gem "pry"
+gem "rake", "13.0.3"
+gem "rspec", "~> 3.0"
+gem "rubocop-rspec", "~> 2.3"
+gem "scenic", "~> 1.5"
+gem "simplecov", "~> 0.16"
+gem "activerecord", "~> 7.0", "< 7.1"
+
+gemspec path: "../"

data/gemfiles/activerecord_7.0.0.gemfile.lock

@@ -0,0 +1,162 @@
+PATH
+  remote: ..
+  specs:
+    table_saw (3.0.0)
+      activerecord (>= 5.2)
+      pg
+      thor
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (7.0.5)
+      actionview (= 7.0.5)
+      activesupport (= 7.0.5)
+      rack (~> 2.0, >= 2.2.4)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (7.0.5)
+      activesupport (= 7.0.5)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activemodel (7.0.5)
+      activesupport (= 7.0.5)
+    activerecord (7.0.5)
+      activemodel (= 7.0.5)
+      activesupport (= 7.0.5)
+    activesupport (7.0.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    appraisal (2.4.1)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.2)
+    builder (3.2.4)
+    coderay (1.1.3)
+    combustion (1.3.7)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+      thor (>= 0.14.6)
+    concurrent-ruby (1.2.2)
+    crass (1.0.6)
+    database_cleaner (2.0.2)
+      database_cleaner-active_record (>= 2, < 3)
+    database_cleaner-active_record (2.1.0)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    erubi (1.12.0)
+    i18n (1.13.0)
+      concurrent-ruby (~> 1.0)
+    json (2.6.3)
+    loofah (2.21.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    method_source (1.0.0)
+    minitest (5.18.0)
+    nokogiri (1.15.2-x86_64-darwin)
+      racc (~> 1.4)
+    parallel (1.23.0)
+    parser (3.2.2.1)
+      ast (~> 2.4.1)
+    pg (1.5.3)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    racc (1.6.2)
+    rack (2.2.7)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.5.0)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (7.0.5)
+      actionpack (= 7.0.5)
+      activesupport (= 7.0.5)
+      method_source
+      rake (>= 12.2)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
+    rainbow (3.1.1)
+    rake (13.0.3)
+    regexp_parser (2.8.0)
+    rexml (3.2.5)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.51.0)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.2.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.1)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.23.1)
+      rubocop (~> 1.33)
+    rubocop-rspec (2.22.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
+    scenic (1.7.0)
+      activerecord (>= 4.0.0)
+      railties (>= 4.0.0)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    thor (1.2.2)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.4.2)
+    zeitwerk (2.6.8)
+
+PLATFORMS
+  x86_64-darwin-22
+  x86_64-linux
+
+DEPENDENCIES
+  activerecord (~> 7.0, < 7.1)
+  appraisal
+  bundler (~> 2.0)
+  combustion (~> 1.3)
+  database_cleaner (~> 2)
+  pry
+  rake (= 13.0.3)
+  rspec (~> 3.0)
+  rubocop-rspec (~> 2.3)
+  scenic (~> 1.5)
+  simplecov (~> 0.16)
+  table_saw!
+
+BUNDLED WITH
+   2.4.13

data/lib/table_saw/create_dump_file.rb

@@ -19,7 +19,7 @@ module TableSaw
 
     # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
     def call
-      File.delete(file) if File.exist?(file)
+      FileUtils.rm_f(file)
       FileUtils.mkdir_p(File.dirname(file))
 
       alter_constraints_deferrability

data/lib/table_saw/dependency_graph/add_directive.rb

@@ -6,7 +6,7 @@ module TableSaw
       attr_reader :table_name, :partial, :has_many
       attr_accessor :ids
 
-      def initialize(table_name, ids: [], partial: true, has_many: [])
+      def initialize(table_name, ids: [], partial: true, has_many: {})
         @table_name = table_name
         @ids = ids
         @partial = partial

data/lib/table_saw/dependency_graph/build_has_many_query.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module TableSaw
+  module DependencyGraph
+    class BuildHasManyQuery
+      QUERY = <<~SQL.squish
+        select %{primary_key} from %{table} where %{clause} and %{polymorphic}
+      SQL
+
+      attr_reader :manifest, :directive, :foreign_key
+
+      def initialize(manifest, directive, foreign_key)
+        @manifest = manifest
+        @directive = directive
+        @foreign_key = foreign_key
+      end
+
+      def call
+        build_base_query
+          .then { |query| append_scope(query) }
+          .then { |query| append_limit(query) }
+      end
+
+      private
+
+      # rubocop:disable Metrics/AbcSize
+      def build_base_query
+        format(QUERY, primary_key: TableSaw.schema_cache.primary_keys(foreign_key.from_table),
+                      table: foreign_key.from_table,
+                      clause: TableSaw::Queries::SerializeSqlInClause.new(foreign_key.from_table,
+                                                                          foreign_key.column.primary_key,
+                                                                          directive.ids).call,
+                      polymorphic: foreign_key.type_condition)
+      end
+      # rubocop:enable Metrics/AbcSize
+
+      def append_scope(query)
+        return query unless has_many&.scope
+
+        [query, has_many.scope].join(' and ')
+      end
+
+      def append_limit(query)
+        return query unless has_many&.limit
+
+        [query, "limit #{has_many.limit}"].join(' ')
+      end
+
+      def has_many
+        directive.has_many[foreign_key.from_table] ||
+          manifest.has_many.fetch(directive.table_name, {})[foreign_key.from_table]
+      end
+    end
+  end
+end

data/lib/table_saw/dependency_graph/has_many_directives.rb

@@ -3,10 +3,6 @@
 module TableSaw
   module DependencyGraph
     class HasManyDirectives
-      QUERY = <<~SQL
-        select %{primary_key} from %{table} where %{clause} and %{polymorphic}
-      SQL
-
       attr_reader :manifest, :directive
 
       def initialize(manifest, directive)
@@ -34,25 +30,20 @@ module TableSaw
       def valid_associations
         associations.select do |fk|
           next false if directive.partial? && TableSaw.schema_cache.primary_keys(fk.from_table).nil?
-          next true if directive.has_many.include?(fk.from_table)
+          next true if directive.has_many.key?(fk.from_table)
 
-          manifest.has_many.fetch(directive.table_name, []).include?(fk.from_table)
+          manifest.has_many.fetch(directive.table_name, {}).key?(fk.from_table)
         end
       end
+      # rubocop:enable Metrics/AbcSize
 
       def query_result(foreign_key)
         return [] unless directive.selectable?
 
         TableSaw::Connection.exec(
-          format(QUERY, primary_key: TableSaw.schema_cache.primary_keys(foreign_key.from_table),
-                        table: foreign_key.from_table,
-                        clause: TableSaw::Queries::SerializeSqlInClause.new(foreign_key.from_table,
-                                                                            foreign_key.column.primary_key,
-                                                                            directive.ids).call,
-                        polymorphic: foreign_key.type_condition)
+          TableSaw::DependencyGraph::BuildHasManyQuery.new(manifest, directive, foreign_key).call
         )
       end
-      # rubocop:enable Metrics/AbcSize
     end
   end
 end

data/lib/table_saw/dependency_graph.rb

@@ -3,5 +3,6 @@
 require 'table_saw/dependency_graph/add_directive'
 require 'table_saw/dependency_graph/belongs_to_directives'
 require 'table_saw/dependency_graph/build'
+require 'table_saw/dependency_graph/build_has_many_query'
 require 'table_saw/dependency_graph/dump_table'
 require 'table_saw/dependency_graph/has_many_directives'

data/lib/table_saw/foreign_key.rb

@@ -3,7 +3,7 @@
 module TableSaw
   class ForeignKey
     class Column
-      REGEX = /(\w+)(?::(\w+)\((\w+)\))?/.freeze
+      REGEX = /(\w+)(?::(\w+)\((\w+)\))?/
 
       attr_reader :value
 

data/lib/table_saw/manifest.rb

@@ -5,6 +5,35 @@ require 'table_saw/associations'
 
 module TableSaw
   class Manifest
+    class HasManyEntry
+      def self.build(config)
+        config.each_with_object({}) do |(table, options), memo|
+          case table
+          when String
+            memo[table] = new(table, options)
+          when Hash
+            table, options = table.first
+            memo[table] = new(table, options)
+          end
+        end
+      end
+
+      attr_reader :table, :options
+
+      def initialize(table, options)
+        @table = table
+        @options = options || {}
+      end
+
+      def scope
+        options['scope']
+      end
+
+      def limit
+        options['limit']
+      end
+    end
+
     class Table
       attr_reader :variables, :config
 
@@ -30,7 +59,7 @@ module TableSaw
       end
 
       def has_many
-        config.fetch('has_many', [])
+        config.fetch('has_many', {}).then { |config| HasManyEntry.build(config) }
       end
     end
 
@@ -48,7 +77,7 @@ module TableSaw
 
     def variables
       vars = config.fetch('variables', {})
-      vars.merge(TableSaw.configuration.variables.slice(*vars.keys))
+      VariableInterpolation.call(vars.merge(TableSaw.configuration.variables.slice(*vars.keys)))
     end
 
     def tables
@@ -58,7 +87,9 @@ module TableSaw
     end
 
     def has_many
-      @has_many ||= config.fetch('has_many', {})
+      @has_many ||= config.fetch('has_many', {}).transform_values do |value|
+        HasManyEntry.build(value)
+      end
     end
 
     def foreign_keys

data/lib/table_saw/variable_interpolation.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module TableSaw
+  class VariableInterpolation
+    def self.call(variables)
+      new(variables).call
+    end
+
+    attr_reader :input
+
+    def initialize(input)
+      @input = input
+    end
+
+    def call
+      input.transform_values do |value|
+        next value unless value.is_a?(String)
+
+        interpolate_variables(value, input)
+      end
+    end
+
+    private
+
+    def interpolate_variables(string, variables)
+      string.gsub(/%{(\w+)}/) do |match|
+        variable_name = ::Regexp.last_match(1)
+        if variables.key?(variable_name)
+          nested_value = interpolate_variables(variables[variable_name], variables)
+          interpolate_variables(nested_value, variables)
+        else
+          match
+        end
+      end
+    end
+  end
+end

data/lib/table_saw/version.rb

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

data/lib/table_saw.rb

@@ -7,6 +7,7 @@ require 'table_saw/information_schema'
 require 'table_saw/manifest'
 require 'table_saw/queries'
 require 'table_saw/formats'
+require 'table_saw/variable_interpolation'
 
 module TableSaw
   def self.configuration