table_saw 3.1.0 → 3.3.0

data/lib/table_saw/configuration.rb

@@ -6,7 +6,7 @@ module TableSaw
     attr_accessor :dbname, :host, :port, :user, :password, :manifest, :output, :format
 
     def connection
-      { dbname: dbname, host: host, port: port, user: user, password: password }
+      { adapter: 'postgresql', database: dbname, host:, port:, username: user, password: }
     end
 
     def url=(value)

data/lib/table_saw/create_dump_file.rb

@@ -51,9 +51,9 @@ module TableSaw
 
         Array(formatter.header).each { |line| write_to_file(line) }
 
-        TableSaw::Connection.with do |conn|
-          conn.copy_data "COPY (#{table.copy_statement}) TO STDOUT", formatter.coder do
-            while (row = conn.get_copy_data)
+        TableSaw.connection_pool.with_connection do |conn|
+          conn.raw_connection.copy_data "COPY (#{table.copy_statement}) TO STDOUT", formatter.coder do
+            while (row = conn.raw_connection.get_copy_data)
               write_to_file formatter.dump_row(row)
             end
           end

data/lib/table_saw/dependency_graph/belongs_to_directives.rb

@@ -37,7 +37,7 @@ module TableSaw
       def query_result(foreign_key)
         return [] unless directive.selectable?
 
-        TableSaw::Connection.exec(
+        TableSaw.connection.exec_query(
           format(QUERY, column: foreign_key.column.primary_key, table_name: directive.table_name,
                         clause: TableSaw::Queries::SerializeSqlInClause.new(directive.table_name,
                                                                             directive.primary_key,

data/lib/table_saw/dependency_graph/build.rb

@@ -33,7 +33,7 @@ module TableSaw
         if record
           dir.partial? ? record.fetch_associations(dir) : []
         else
-          TableSaw::DependencyGraph::DumpTable.new(manifest: manifest, name: dir.table_name, partial: dir.partial?)
+          TableSaw::DependencyGraph::DumpTable.new(manifest:, name: dir.table_name, partial: dir.partial?)
             .tap { |table| records[dir.table_name] = table }.fetch_associations(dir)
         end
       end
@@ -41,7 +41,7 @@ module TableSaw
       def select_ids(table)
         return [] unless table.partial?
 
-        TableSaw::Connection.exec(table.query).map { |row| row[TableSaw.schema_cache.primary_keys(table.name)] }
+        TableSaw.connection.exec_query(table.query).map { |row| row[TableSaw.schema_cache.primary_keys(table.name)] }
       end
     end
   end

data/lib/table_saw/dependency_graph/dump_table.rb

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

data/lib/table_saw/dependency_graph/has_many_directives.rb

@@ -40,7 +40,7 @@ module TableSaw
       def query_result(foreign_key)
         return [] unless directive.selectable?
 
-        TableSaw::Connection.exec(
+        TableSaw.connection.exec_query(
           TableSaw::DependencyGraph::BuildHasManyQuery.new(manifest, directive, foreign_key).call
         )
       end

data/lib/table_saw/formats/copy.rb

@@ -20,7 +20,7 @@ module TableSaw
       def quoted_columns
         TableSaw.schema_cache.columns_hash(table_name)
           .each_key
-          .map { |name| TableSaw::Connection.adapter.quote_column_name(name) }
+          .map { |name| TableSaw.connection.quote_column_name(name) }
           .join(', ')
       end
     end

data/lib/table_saw/formats/insert.rb

@@ -22,7 +22,7 @@ module TableSaw
       private
 
       def prepared_statement
-        @prepared_statement ||= TableSaw::Queries::PreparedInsertStatement.new(table_name, options: options).call
+        @prepared_statement ||= TableSaw::Queries::PreparedInsertStatement.new(table_name, options:).call
       end
     end
   end

data/lib/table_saw/manifest.rb

@@ -66,7 +66,7 @@ module TableSaw
     def self.instance
       raise ArgumentError, 'Could not find manifest file' unless File.exist?(TableSaw.configuration.manifest)
 
-      new(YAML.safe_load(File.read(TableSaw.configuration.manifest)))
+      new(YAML.safe_load_file(TableSaw.configuration.manifest))
     end
 
     attr_reader :config

data/lib/table_saw/queries/execute_insert_statement.rb

@@ -22,13 +22,13 @@ module TableSaw
           .join(', ')
       end
 
-      def adapter
-        TableSaw::Connection.adapter
-      end
-
       def quote_value(column, value)
-        type = adapter.lookup_cast_type_from_column(column)
-        adapter.quote(type.serialize(type.deserialize(value)))
+        type = if ActiveRecord.version >= Gem::Version.create('8.1.0')
+                 column.fetch_cast_type(TableSaw.connection)
+               else
+                 TableSaw.connection.lookup_cast_type_from_column(column)
+               end
+        TableSaw.connection.quote(type.serialize(type.deserialize(value)))
       end
     end
   end

data/lib/table_saw/queries/foreign_key_relationships.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'table_saw/foreign_key'
-require 'set'
 
 module TableSaw
   module Queries
@@ -36,7 +35,7 @@ module TableSaw
       private
 
       def result
-        @result ||= TableSaw::Connection.exec(QUERY)
+        @result ||= TableSaw.connection.exec_query(QUERY)
       end
     end
   end

data/lib/table_saw/queries/materialized_views.rb

@@ -6,7 +6,7 @@ module TableSaw
       QUERY = 'select matviewname from pg_matviews order by matviewname'
 
       def call
-        TableSaw::Connection.exec(QUERY).map { |row| row['matviewname'] }
+        TableSaw.connection.exec_query(QUERY).map { |row| row['matviewname'] }
       end
     end
   end

data/lib/table_saw/queries/prepared_insert_statement.rb

@@ -32,7 +32,7 @@ module TableSaw
 
       def column_names
         TableSaw.schema_cache.columns(table_name)
-          .map { |column| TableSaw::Connection.adapter.quote_column_name(column.name) }
+          .map { |column| TableSaw.connection.quote_column_name(column.name) }
           .join(', ')
       end
 

data/lib/table_saw/queries/serial_sequences.rb

@@ -18,7 +18,7 @@ module TableSaw
       SerialSequence = Struct.new(:name, :table, :column)
 
       def call
-        TableSaw::Connection.exec(QUERY).each_with_object({}) do |row, memo|
+        TableSaw.connection.exec_query(QUERY).each_with_object({}) do |row, memo|
           memo[row['table']] = SerialSequence.new(row['sequence'], row['table'], row['column'])
         end
       end

data/lib/table_saw/queries/serialize_sql_in_clause.rb

@@ -23,13 +23,9 @@ module TableSaw
 
       def serialized_values
         values.map do |value|
-          connection.quote_default_expression(value, db_column)
+          TableSaw.connection.quote_default_expression(value, db_column)
         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 = '3.1.0'
+  VERSION = '3.3.0'
 end

data/lib/table_saw.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
+require 'active_record'
+require 'active_support/core_ext/string'
+
 require 'table_saw/configuration'
-require 'table_saw/connection'
 require 'table_saw/dependency_graph'
 require 'table_saw/information_schema'
 require 'table_saw/manifest'
@@ -29,6 +31,20 @@ module TableSaw
   end
 
   def self.schema_cache
-    TableSaw::Connection.adapter.schema_cache
+    connection.schema_cache
+  end
+
+  def self.connection_pool
+    ActiveRecord::Base.connection_pool
+  end
+
+  # :nocov:
+  def self.connection
+    if ActiveRecord.gem_version < Gem::Version.new('7.2.0')
+      connection_pool.connection
+    else
+      connection_pool.lease_connection
+    end
   end
+  # :nocov:
 end

data/table_saw.gemspec

@@ -23,10 +23,10 @@ Gem::Specification.new do |spec|
   spec.executables   = ['table-saw']
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 3.0'
+  spec.required_ruby_version = '>= 3.2'
   spec.metadata['rubygems_mfa_required'] = 'true'
 
-  spec.add_dependency 'activerecord', '>= 6.0'
+  spec.add_dependency 'activerecord', '>= 7.1'
   spec.add_dependency 'pg'
   spec.add_dependency 'thor'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: table_saw
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Hamed Asghari
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +51,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - hasghari@gmail.com
 executables:
@@ -75,16 +73,15 @@ files:
 - bin/console
 - bin/setup
 - exe/table-saw
-- gemfiles/activerecord_6.1.0.gemfile
-- gemfiles/activerecord_6.1.0.gemfile.lock
-- gemfiles/activerecord_7.0.0.gemfile
-- gemfiles/activerecord_7.0.0.gemfile.lock
-- gemfiles/activerecord_7.1.0.gemfile
-- gemfiles/activerecord_7.1.0.gemfile.lock
+- gemfiles/activerecord_7.2.0.gemfile
+- gemfiles/activerecord_7.2.0.gemfile.lock
+- gemfiles/activerecord_8.0.0.gemfile
+- gemfiles/activerecord_8.0.0.gemfile.lock
+- gemfiles/activerecord_8.1.0.gemfile
+- gemfiles/activerecord_8.1.0.gemfile.lock
 - lib/table_saw.rb
 - lib/table_saw/associations.rb
 - lib/table_saw/configuration.rb
-- lib/table_saw/connection.rb
 - lib/table_saw/create_dump_file.rb
 - lib/table_saw/dependency_graph.rb
 - lib/table_saw/dependency_graph/add_directive.rb
@@ -115,7 +112,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -123,15 +119,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.17
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Create a postgres dump file from a subset of tables
 test_files: []

data/gemfiles/activerecord_6.1.0.gemfile.lock

@@ -1,169 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    table_saw (3.1.0)
-      activerecord (>= 6.0)
-      pg
-      thor
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (6.1.7.6)
-      actionview (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
-      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.7.6)
-      activesupport (= 6.1.7.6)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (6.1.7.6)
-      activesupport (= 6.1.7.6)
-    activerecord (6.1.7.6)
-      activemodel (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
-    activesupport (6.1.7.6)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    appraisal (2.5.0)
-      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.14.1)
-      concurrent-ruby (~> 1.0)
-    json (2.7.1)
-    language_server-protocol (3.17.0.3)
-    loofah (2.22.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
-    method_source (1.0.0)
-    minitest (5.20.0)
-    nokogiri (1.15.5-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.15.5-x86_64-linux)
-      racc (~> 1.4)
-    parallel (1.24.0)
-    parser (3.2.2.4)
-      ast (~> 2.4.1)
-      racc
-    pg (1.5.4)
-    pry (0.14.2)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    racc (1.7.3)
-    rack (2.2.8)
-    rack-test (2.1.0)
-      rack (>= 1.3)
-    rails-dom-testing (2.2.0)
-      activesupport (>= 5.0.0)
-      minitest
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
-      loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    railties (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
-      method_source
-      rake (>= 12.2)
-      thor (~> 1.0)
-    rainbow (3.1.1)
-    rake (13.0.3)
-    regexp_parser (2.8.3)
-    rexml (3.2.6)
-    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.6)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    rubocop (1.59.0)
-      json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
-      parallel (~> 1.10)
-      parser (>= 3.2.2.4)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.19.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.24.0)
-      rubocop (~> 1.33)
-    rubocop-rspec (2.25.0)
-      rubocop (~> 1.40)
-      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.3.0)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
-    zeitwerk (2.6.12)
-
-PLATFORMS
-  x86_64-darwin-22
-  x86_64-linux
-
-DEPENDENCIES
-  activerecord (~> 6.1, < 6.2)
-  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/gemfiles/activerecord_7.0.0.gemfile.lock

@@ -1,169 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    table_saw (3.1.0)
-      activerecord (>= 6.0)
-      pg
-      thor
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (7.0.8)
-      actionview (= 7.0.8)
-      activesupport (= 7.0.8)
-      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.8)
-      activesupport (= 7.0.8)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (7.0.8)
-      activesupport (= 7.0.8)
-    activerecord (7.0.8)
-      activemodel (= 7.0.8)
-      activesupport (= 7.0.8)
-    activesupport (7.0.8)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    appraisal (2.5.0)
-      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.14.1)
-      concurrent-ruby (~> 1.0)
-    json (2.7.1)
-    language_server-protocol (3.17.0.3)
-    loofah (2.22.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
-    method_source (1.0.0)
-    minitest (5.20.0)
-    nokogiri (1.15.5-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.15.5-x86_64-linux)
-      racc (~> 1.4)
-    parallel (1.24.0)
-    parser (3.2.2.4)
-      ast (~> 2.4.1)
-      racc
-    pg (1.5.4)
-    pry (0.14.2)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    racc (1.7.3)
-    rack (2.2.8)
-    rack-test (2.1.0)
-      rack (>= 1.3)
-    rails-dom-testing (2.2.0)
-      activesupport (>= 5.0.0)
-      minitest
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
-      loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    railties (7.0.8)
-      actionpack (= 7.0.8)
-      activesupport (= 7.0.8)
-      method_source
-      rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
-    rainbow (3.1.1)
-    rake (13.0.3)
-    regexp_parser (2.8.3)
-    rexml (3.2.6)
-    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.6)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    rubocop (1.59.0)
-      json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
-      parallel (~> 1.10)
-      parser (>= 3.2.2.4)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.19.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.24.0)
-      rubocop (~> 1.33)
-    rubocop-rspec (2.25.0)
-      rubocop (~> 1.40)
-      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.3.0)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
-    zeitwerk (2.6.12)
-
-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