table_saw 3.0.0 → 3.2.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,13 +20,9 @@ module TableSaw
       def quoted_columns
         TableSaw.schema_cache.columns_hash(table_name)
           .each_key
-          .map { |name| connection.quote_column_name(name) }
+          .map { |name| TableSaw.connection.quote_column_name(name) }
           .join(', ')
       end
-
-      def connection
-        TableSaw.schema_cache.connection
-      end
     end
   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,9 @@ module TableSaw
           .join(', ')
       end
 
-      def connection
-        TableSaw.schema_cache.connection
-      end
-
       def quote_value(column, value)
-        type = connection.lookup_cast_type_from_column(column)
-        connection.quote(type.serialize(type.deserialize(value)))
+        type = TableSaw.connection.lookup_cast_type_from_column(column)
+        TableSaw.connection.quote(type.serialize(type.deserialize(value)))
       end
     end
   end

data/lib/table_saw/queries/foreign_key_relationships.rb

@@ -36,7 +36,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.schema_cache.connection.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.0.0'
+  VERSION = '3.2.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.1'
   spec.metadata['rubygems_mfa_required'] = 'true'
 
-  spec.add_dependency 'activerecord', '>= 5.2'
+  spec.add_dependency 'activerecord', '>= 6.1'
   spec.add_dependency 'pg'
   spec.add_dependency 'thor'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_saw
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Hamed Asghari
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 2024-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -79,10 +79,13 @@ files:
 - 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
 - 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
@@ -121,14 +124,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Create a postgres dump file from a subset of tables

data/lib/table_saw/connection.rb

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