table_saw 2.5.0 → 2.9.0

data/lib/table_saw/information_schema.rb

@@ -2,14 +2,10 @@
 
 module TableSaw
   class InformationSchema
-    %i(belongs_to constraint_names has_many).each do |method_name|
-      define_method method_name do
-        foreign_key_relationships.public_send method_name
-      end
+    def constraint_names
+      foreign_key_relationships.constraint_names
     end
 
-    private
-
     def foreign_key_relationships
       @foreign_key_relationships ||= TableSaw::Queries::ForeignKeyRelationships.new
     end

data/lib/table_saw/manifest.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'yaml'
+require 'table_saw/associations'
 
 module TableSaw
   class Manifest
@@ -46,7 +47,8 @@ module TableSaw
     end
 
     def variables
-      config.fetch('variables', {})
+      vars = config.fetch('variables', {})
+      vars.merge(TableSaw.configuration.variables.slice(*vars.keys))
     end
 
     def tables
@@ -58,5 +60,13 @@ module TableSaw
     def has_many
       @has_many ||= config.fetch('has_many', {})
     end
+
+    def foreign_keys
+      @foreign_keys ||= config.fetch('foreign_keys', [])
+    end
+
+    def associations
+      @associations ||= TableSaw::Associations.new(self)
+    end
   end
 end

data/lib/table_saw/queries/execute_insert_statement.rb

@@ -18,16 +18,17 @@ module TableSaw
 
       def values
         TableSaw.schema_cache.columns(statement.table_name).zip(row)
-          .map { |column, value| connection.quote(connection.type_cast_from_column(column, value)) }
+          .map { |column, value| quote_value(column, value) }
           .join(', ')
       end
 
-      def schema_cache
-        TableSaw.schema_cache
+      def connection
+        TableSaw.schema_cache.connection
       end
 
-      def connection
-        schema_cache.connection
+      def quote_value(column, value)
+        type = connection.lookup_cast_type_from_column(column)
+        connection.quote(type.serialize(type.deserialize(value)))
       end
     end
   end

data/lib/table_saw/queries/foreign_key_relationships.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'table_saw/foreign_key'
+require 'set'
+
 module TableSaw
   module Queries
     class ForeignKeyRelationships
@@ -16,24 +19,20 @@ module TableSaw
         where tc.constraint_type = 'FOREIGN KEY'
       SQL
 
-      def belongs_to
-        @belongs_to ||= result.each_with_object(Hash.new { |h, k| h[k] = {} }) do |row, memo|
-          memo[row['from_table']][row['from_column']] = row['to_table']
-        end
-      end
-
-      def has_many
-        @has_many ||= result.each_with_object(Hash.new { |h, k| h[k] = [] }) do |row, memo|
-          memo[row['to_table']].push([row['from_table'], row['from_column']])
-        end
-      end
-
       def constraint_names
         @constraint_names ||= result.each_with_object(Hash.new { |h, k| h[k] = [] }) do |row, memo|
           memo[row['from_table']].push(row['constraint_name'])
         end
       end
 
+      def foreign_keys
+        @foreign_keys ||= result.map do |row|
+          TableSaw::ForeignKey.new(name: row['constraint_name'],
+                                   from_table: row['from_table'], from_column: row['from_column'],
+                                   to_table: row['to_table'], to_column: row['to_column'])
+        end
+      end
+
       private
 
       def result

data/lib/table_saw/queries/prepared_insert_statement.rb

@@ -23,7 +23,7 @@ module TableSaw
       end
 
       def sql
-        [prepare_statement, conflict_statement].compact.join(' ') + ';'
+        "#{[prepare_statement, conflict_statement].compact.join(' ')};"
       end
 
       def column_types

data/lib/table_saw/queries/serialize_sql_in_clause.rb

@@ -23,7 +23,7 @@ module TableSaw
 
       def serialized_values
         values.map do |value|
-          connection.quote(connection.type_cast_from_column(db_column, value))
+          connection.quote_default_expression(value, db_column)
         end
       end
 

data/lib/table_saw/version.rb

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

data/table_saw.gemspec

@@ -23,15 +23,17 @@ Gem::Specification.new do |spec|
   spec.executables   = ['table-saw']
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.6'
+
   spec.add_dependency 'activerecord', '>= 5.2'
   spec.add_dependency 'pg'
   spec.add_dependency 'thor'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'combustion', '~> 1.1'
+  spec.add_development_dependency 'combustion', '~> 1.3'
   spec.add_development_dependency 'database_cleaner', '~> 1.7'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.33'
   spec.add_development_dependency 'scenic', '~> 1.5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_saw
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Hamed Asghari
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
-description: 
+description:
 email:
 - hasghari@gmail.com
 executables:
@@ -186,12 +186,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
+- ".tool-versions"
+- Appraisals
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -201,7 +203,12 @@ files:
 - bin/console
 - bin/setup
 - exe/table-saw
+- gemfiles/activerecord_6.0.0.gemfile
+- gemfiles/activerecord_6.0.0.gemfile.lock
+- gemfiles/activerecord_6.1.0.gemfile
+- gemfiles/activerecord_6.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
@@ -211,6 +218,7 @@ files:
 - lib/table_saw/dependency_graph/build.rb
 - lib/table_saw/dependency_graph/dump_table.rb
 - lib/table_saw/dependency_graph/has_many_directives.rb
+- lib/table_saw/foreign_key.rb
 - lib/table_saw/formats.rb
 - lib/table_saw/formats/base.rb
 - lib/table_saw/formats/copy.rb
@@ -230,7 +238,7 @@ homepage: https://github.com/hasghari/table_saw
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -238,15 +246,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Create a postgres dump file from a subset of tables
 test_files: []

data/.travis.yml

@@ -1,24 +0,0 @@
----
-sudo: false
-env:
-  global:
-    - CC_TEST_REPORTER_ID=5432d4e95a7749f237cf9e659c44ba28c5c91fa65436b15c5bc849d6d9ebc049
-language: ruby
-cache: bundler
-rvm:
-  - 2.5.5
-  - 2.6.5
-  - 2.7.0
-before_install: gem install bundler -v 2.0.1
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-script:
-  - bundle exec rspec
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
-addons:
-  postgresql: "9.6"
-services:
-  - postgresql