torque-postgresql 1.1.1 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b95a55ebfe82e5b96582da09307f1d45d62ba922
-  data.tar.gz: 38a068ec3fa7cc5aab2425a31e8ed37a49b15132
+SHA256:
+  metadata.gz: 302ae61bb97f2666a7c1ada70d7b3ff2a2c5e9dd5230438fe8746ddf5933dcb3
+  data.tar.gz: 96771655afc7ea3a863c1069783e42858e7e27539e98724eb428f0d8d759ceb5
 SHA512:
-  metadata.gz: b708c73cfcac1798474e35099570e4def16a6a51b2448ef34ce2ec5e97dd4c8d57f48fa51f18182f0405afa7eed1884b81846cb3b2e132b638c8711ee80dd72c
-  data.tar.gz: 7bab6bd30e0b3898826b20cce99ff629192ea62d772864e10a3fc141e86e5f3f27a0f9e459addc29a8a27bcbb7df17920831d0f7e7b01ac823d65f600b699530
+  metadata.gz: 4da7ce39ab52a21dc00a0b1922e02296f96ffb3c4b8fe3c9c8e590a25482a9d04c17ab348e7da00259e5ae4c53865b512740d21e8bdf1f60c069955f4e58350e
+  data.tar.gz: 5309c59fc60b31a0c4e37056e836951b4f9652104c757b687be9f5c93ddb8629ed0f5ad8de054dd84a5a7f5d4ec9b8527a767c6f6a8776527d91e94eb5cba15d

data/Rakefile

@@ -14,13 +14,16 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-desc 'Prints a schema dump of the test database'
-task :dump do |t|
+desc 'Initialize the local environment'
+task :environment do |t|
   lib  = File.expand_path('../lib', __FILE__)
   spec = File.expand_path('../spec', __FILE__)
   $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
   $LOAD_PATH.unshift(spec) unless $LOAD_PATH.include?(spec)
+end
 
+desc 'Prints a schema dump of the test database'
+task dump: :environment do |t|
   require 'byebug'
   require 'spec_helper'
   ActiveRecord::SchemaDumper.dump

data/lib/torque/postgresql/associations/association_scope.rb

@@ -20,7 +20,6 @@ module Torque
             # 5.2 reflection, owner
 
             reflection = args.size.eql?(2) ? args[0] : args[1]
-            puts reflection.connected_through_array?.inspect
             return super unless reflection.connected_through_array?
 
             table = args[0] if args.size > 2

data/lib/torque/postgresql/auxiliary_statement.rb

@@ -31,11 +31,12 @@ module Torque
         end
 
         # Fast access to statement build
-        def build(statement, base, options = nil, bound_attributes = [])
+        def build(statement, base, options = nil, bound_attributes = [], join_sources = [])
           klass = instantiate(statement, base, options)
           result = klass.build(base)
 
           bound_attributes.concat(klass.bound_attributes)
+          join_sources.concat(klass.join_sources)
           result
         end
 
@@ -105,7 +106,7 @@ module Torque
       delegate :config, :table, :table_name, :relation, :configure, :relation_query?,
         to: :class
 
-      attr_reader :bound_attributes
+      attr_reader :bound_attributes, :join_sources
 
       # Start a new auxiliary statement giving extra options
       def initialize(*args)
@@ -117,15 +118,21 @@ module Torque
         @where = options.fetch(:where, {})
         @select = options.fetch(:select, {})
         @join_type = options.fetch(:join_type, nil)
+
         @bound_attributes = []
+        @join_sources = []
       end
 
       # Build the statement on the given arel and return the WITH statement
       def build(base)
+        @bound_attributes.clear
+        @join_sources.clear
+
+        # Prepare all the data for the statement
         prepare(base)
 
         # Add the join condition to the list
-        base.joins_values += [build_join(base)]
+        @join_sources << build_join(base)
 
         # Return the statement with its dependencies
         [@dependencies, ::Arel::Nodes::As.new(table, build_query(base))]
@@ -288,7 +295,7 @@ module Torque
               cte.is_a?(dependent_klass)
             end
 
-            AuxiliaryStatement.build(dependent, base, options, bound_attributes)
+            AuxiliaryStatement.build(dependent, base, options, bound_attributes, join_sources)
           end
         end
 

data/lib/torque/postgresql/relation/auxiliary_statement.rb

@@ -47,16 +47,16 @@ module Torque
 
           # Hook arel build to add the distinct on clause
           def build_arel(*)
-            subqueries = build_auxiliary_statements
-            return super if subqueries.nil?
-            super.with(subqueries)
+            arel = super
+            subqueries = build_auxiliary_statements(arel)
+            subqueries.nil? ? arel : arel.with(subqueries)
           end
 
           # Build all necessary data for auxiliary statements
-          def build_auxiliary_statements
-            return unless self.auxiliary_statements_values.present?
-            self.auxiliary_statements_values.map do |klass|
-              klass.build(self)
+          def build_auxiliary_statements(arel)
+            return unless auxiliary_statements_values.present?
+            auxiliary_statements_values.map do |klass|
+              klass.build(self).tap { arel.join_sources.concat(klass.join_sources) }
             end
           end
 

data/lib/torque/postgresql/schema_cache.rb

@@ -11,6 +11,7 @@ module Torque
         @data_sources_model_names = {}
         @inheritance_dependencies = {}
         @inheritance_associations = {}
+        @inheritance_loaded = false
       end
 
       def initialize_dup(*) # :nodoc:
@@ -22,16 +23,16 @@ module Torque
 
       def encode_with(coder) # :nodoc:
         super
-        coder["data_sources_model_names"] = @data_sources_model_names
-        coder["inheritance_dependencies"] = @inheritance_dependencies
-        coder["inheritance_associations"] = @inheritance_associations
+        coder['data_sources_model_names'] = @data_sources_model_names
+        coder['inheritance_dependencies'] = @inheritance_dependencies
+        coder['inheritance_associations'] = @inheritance_associations
       end
 
       def init_with(coder) # :nodoc:
         super
-        @data_sources_model_names = coder["data_sources_model_names"]
-        @inheritance_dependencies = coder["inheritance_dependencies"]
-        @inheritance_associations = coder["inheritance_associations"]
+        @data_sources_model_names = coder['data_sources_model_names']
+        @inheritance_dependencies = coder['inheritance_dependencies']
+        @inheritance_associations = coder['inheritance_associations']
       end
 
       def add(table_name, *) # :nodoc:
@@ -41,6 +42,7 @@ module Torque
         if @data_sources.key?(table_name)
           @inheritance_dependencies.clear
           @inheritance_associations.clear
+          @inheritance_loaded = false
         end
       end
 
@@ -49,6 +51,7 @@ module Torque
         @data_sources_model_names.clear
         @inheritance_dependencies.clear
         @inheritance_associations.clear
+        @inheritance_loaded = false
       end
 
       def size # :nodoc:
@@ -71,10 +74,12 @@ module Torque
           @inheritance_dependencies,
           @inheritance_associations,
           @data_sources_model_names,
+          @inheritance_loaded,
         ]
       end
 
       def marshal_load(array) # :nodoc:
+        @inheritance_loaded = array.pop
         @data_sources_model_names = array.pop
         @inheritance_associations = array.pop
         @inheritance_dependencies = array.pop
@@ -101,13 +106,13 @@ module Torque
       end
 
       # Try to find a model based on a given table
-      def lookup_model(table_name, scopred_class = '')
-        scopred_class = scopred_class.name if scopred_class.is_a?(Class)
+      def lookup_model(table_name, scoped_class = '')
+        scoped_class = scoped_class.name if scoped_class.is_a?(Class)
         return @data_sources_model_names[table_name] \
           if @data_sources_model_names.key?(table_name)
 
         # Get all the possible scopes
-        scopes = scopred_class.scan(/(?:::)?[A-Z][a-z]+/)
+        scopes = scoped_class.scan(/(?:::)?[A-Z][a-z]+/)
         scopes.unshift('Object::')
 
         # Consider the maximum namespaced possible model name
@@ -164,14 +169,17 @@ module Torque
         # Reload information about tables inheritance and dependencies, uses a
         # cache to not perform additional checkes
         def reload_inheritance_data!
-          return if @inheritance_dependencies.present?
+          return if @inheritance_loaded
           @inheritance_dependencies = connection.inherited_tables
           @inheritance_associations = generate_associations
+          @inheritance_loaded = true
         end
 
         # Calculates the inverted dependency (association), where even indirect
         # inheritance comes up in the list
         def generate_associations
+          return {} if @inheritance_dependencies.empty?
+
           result = Hash.new{ |h, k| h[k] = [] }
           masters = @inheritance_dependencies.values.flatten.uniq
 
@@ -200,7 +208,7 @@ module Torque
           super
           @data_sources_model_names = Torque::PostgreSQL.config
             .irregular_models.slice(*@data_sources.keys).map do |table_name, model_name|
-            [table_name, model_name.constantize]
+            [table_name, (model_name.is_a?(Class) ? model_name : model_name.constantize)]
           end.to_h
         end
 

data/lib/torque/postgresql/schema_dumper.rb

@@ -31,21 +31,21 @@ module Torque
           if inherited_tables.present?
             stream.puts "  # These are tables that has inheritance"
             inherited_tables.each do |table_name, inherits|
-              unless ignored?(table_name)
-                sub_stream = StringIO.new
-                table(table_name, sub_stream)
-
-                # Add the inherits setting
-                sub_stream.rewind
-                inherits.map!(&:to_sym)
-                inherits = inherits.first if inherits.size === 1
-                inherits = ", inherits: #{inherits.inspect} do |t|"
-                table_dump = sub_stream.read.gsub(/ do \|t\|$/, inherits)
-
-                # Ensure bodyless definitions
-                table_dump.gsub!(/do \|t\|\n  end/, '')
-                stream.print table_dump
-              end
+              next if ignored?(table_name)
+
+              sub_stream = StringIO.new
+              table(table_name, sub_stream)
+
+              # Add the inherits setting
+              sub_stream.rewind
+              inherits.map!(&:to_sym)
+              inherits = inherits.first if inherits.size === 1
+              inherits = ", inherits: #{inherits.inspect} do |t|"
+              table_dump = sub_stream.read.gsub(/ do \|t\|$/, inherits)
+
+              # Ensure bodyless definitions
+              table_dump.gsub!(/do \|t\|\n  end/, '')
+              stream.print table_dump
             end
           end
 
@@ -55,6 +55,9 @@ module Torque
               foreign_keys(tbl, stream) unless ignored?(tbl)
             end
           end
+
+          # Scenic integration
+          views(stream) if defined?(::Scenic)
         end
 
         # Dump user defined types like enum
@@ -63,7 +66,7 @@ module Torque
           return unless types.any?
 
           stream.puts "  # These are user-defined types used on this database"
-          types.each { |name, type| send(type.to_sym, name, stream) }
+          types.sort_by(&:first).each { |name, type| send(type.to_sym, name, stream) }
           stream.puts
         rescue => e
           stream.puts "# Could not dump user-defined types because of following #{e.class}"

data/lib/torque/postgresql/version.rb

@@ -1,5 +1,5 @@
 module Torque
   module PostgreSQL
-    VERSION = '1.1.1'
+    VERSION = '1.1.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torque-postgresql
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.6
 platform: ruby
 authors:
 - Carlos Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -260,8 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: ActiveRecord extension to access PostgreSQL advanced resources