brick 1.0.39 → 1.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 965d31143248d85fd47cf2445a266fb9d26cc5eb814330cbdbfb37d50570b5a0
-  data.tar.gz: d4f070e1c01b3922a610a4385fde6f6b4f345892d68d6b872e1294a33f4b1e61
+  metadata.gz: cf29d4af64b65c01ae68df45762b816403a1ebc0035e1221552f249ff3ba2ce9
+  data.tar.gz: 076cdb672d7c2137cc74421467d72491e9ea89751fab32015f427158fc367b45
 SHA512:
-  metadata.gz: 70ea705efad428abb335e05569284caabe908c65efd679fffcd044894083626ca432366a65305bcd50506a7ca13169bac9cc2f7354728c3b8f23e4ed0aba7094
-  data.tar.gz: b61096e6deadf323cc8784bcf93ae5faf72eae02fef3059b002c57bac035b30858da73bb59bd2f0572168a90b39062645580cd120e1d78665f5c909258727ad8
+  metadata.gz: ce17038567ddd9d6d9d9dce6eb71fd50612d167b56351898ef9b3f9441d1a7ef3ee4ec3a57f3f24e613829e6c8a2f59517fc0d4e9266f11166b92821310b0c06
+  data.tar.gz: 6a7bb38b009853594a8bf1ab28489bbc92d6300fcd0f8497c7950e81c6a62a4c6da2bd65840f93bd7afea40153727cb93914529120ecf9b0dceca39b21fef880

data/lib/brick/extensions.rb

@@ -70,7 +70,11 @@ module ActiveRecord
     def self._brick_primary_key(relation = nil)
       return instance_variable_get(:@_brick_primary_key) if instance_variable_defined?(:@_brick_primary_key)
 
-      pk = primary_key.is_a?(String) ? [primary_key] : primary_key || []
+      pk = begin
+             primary_key.is_a?(String) ? [primary_key] : primary_key || []
+           rescue
+             []
+           end
       # Just return [] if we're missing any part of the primary key.  (PK is usually just "id")
       if relation && pk.present?
         @_brick_primary_key ||= pk.any? { |pk_part| !relation[:cols].key?(pk_part) } ? [] : pk

data/lib/brick/frameworks/rails/engine.rb

@@ -529,6 +529,7 @@ if (headerTop) {
                # 0..62 because Postgres column names are limited to 63 characters
                #{obj_name}, (descrips = @_brick_bt_descrip[bt.first][bt_class])[0..-2].map { |z| #{obj_name}.send(z.last[0..62]) }, (bt_id_col = descrips.last)
              )
+             bt_txt ||= \"<< Orphaned ID: #\{val} >>\" if val
              bt_id = #{obj_name}.send(*bt_id_col) if bt_id_col&.present? %>
           <%= bt_id ? link_to(bt_txt, send(\"#\{bt_class.base_class.name.underscore.tr('/', '_')\}_path\".to_sym, bt_id)) : bt_txt %>
           <%#= Previously was:  bt_obj = bt[1].first.first.find_by(bt[2] => val); link_to(bt_obj.brick_descrip, send(\"#\{bt[1].first.first.name.underscore\}_path\".to_sym, bt_obj.send(bt[1].first.first.primary_key.to_sym))) if bt_obj %>
@@ -610,7 +611,11 @@ end
       html_options = { prompt: \"Select #\{bt_name\}\" }
       html_options[:class] = 'dimmed' unless val %>
       <%= f.select k.to_sym, bt[3], { value: val || '^^^brick_NULL^^^' }, html_options %>
-      <%= bt_obj = bt_class&.find_by(bt_pair[1] => val); link_to('⇛', send(\"#\{bt_class.base_class.name.underscore.tr('/', '_')\}_path\".to_sym, bt_obj.send(bt_class.primary_key.to_sym)), { class: 'show-arrow' }) if bt_obj %>
+      <%= if (bt_obj = bt_class&.find_by(bt_pair[1] => val))
+            link_to('⇛', send(\"#\{bt_class.base_class.name.underscore.tr('/', '_')\}_path\".to_sym, bt_obj.send(bt_class.primary_key.to_sym)), { class: 'show-arrow' })
+          elsif val
+            \"Orphaned ID: #\{val}\"
+          end %>
     <% else case #{model_name}.column_for_attribute(k).type
       when :string, :text %>
         <% if is_bcrypt?(val) # || .readonly? %>

data/lib/brick/tasks/orphans.rake

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+if Object.const_defined?('::Rake::TaskManager')
+  namespace :brick do
+    desc 'Find any seemingly-orphaned records'
+    task orphans: :environment do
+      def class_pk(dotted_name, multitenant)
+        Object.const_get((multitenant ? [dotted_name.split('.').last] : dotted_name.split('.')).map { |nm| "::#{nm.singularize.camelize}" }.join).primary_key
+      end
+
+      schema_list = ((multi = ::Brick.config.schema_behavior[:multitenant]) && ::Brick.db_schemas.keys.sort) || []
+      if schema_list.length > 1
+        require 'fancy_gets'
+        include FancyGets
+        schema = gets_list(
+          list: schema_list,
+          chosen: multi[:schema_to_analyse]
+        )
+      elsif schema_list.length.positive?
+        schema = schema_list.first
+      end
+      ActiveRecord::Base.execute_sql("SET SEARCH_PATH = ?", schema) if schema
+      orphans = +''
+      ::Brick.relations.each do |k, v|
+        next if v.key?(:isView) || ::Brick.config.exclude_tables.include?(k) ||
+                !(pri_pk = v[:pkey].values.first&.first) ||
+                !(pri_pk = class_pk(k, multi))
+        v[:fks].each do |k1, v1|
+          next if v1[:is_bt] ||
+                  !(for_rel = ::Brick.relations.fetch(v1[:inverse_table], nil)) ||
+                  v1[:inverse]&.key?(:polymorphic) ||
+                  !(for_pk = for_rel.fetch(:pkey, nil)&.values&.first&.first) ||
+                  !(for_pk = class_pk(v1[:inverse_table], multi))
+          begin
+            ActiveRecord::Base.execute_sql(
+              "SELECT DISTINCT frn.#{v1[:fk]} AS pri_id, frn.#{for_pk} AS fk_id
+              FROM #{v1[:inverse_table]} AS frn
+                LEFT OUTER JOIN #{k} AS pri ON pri.#{pri_pk} = frn.#{v1[:fk]}
+              WHERE frn.#{v1[:fk]} IS NOT NULL AND pri.#{pri_pk} IS NULL
+              ORDER BY 1, 2"
+            ).each do |o|
+              orphans << "#{v1[:inverse_table]} #{o['fk_id']} refers to non-existant #{k} #{o['pri_id']}\n"
+            end
+          rescue StandardError => err
+            puts "Strange -- #{err.inspect}"
+          end
+        end
+      end
+      puts "For #{schema}:\n#{'=' * (schema.length + 5)}" if schema
+      if orphans.blank?
+        puts "No orphans!"
+      else
+        print orphans
+      end
+    end
+  end
+end

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 39
+    TINY = 40
 
     # PRE is nil unless it's a pre-release (beta, RC, etc.)
     PRE = nil

data/lib/brick.rb

@@ -481,6 +481,11 @@ require 'active_record'
 require 'active_record/relation'
 require 'active_record/relation/query_methods' if is_add_left_outer_join
 
+# Rake tasks
+class Railtie < Rails::Railtie
+  Dir.glob("#{File.expand_path(__dir__)}/brick/tasks/**/*.rake").each { |task| load task }
+end
+
 # Major compatibility fixes for ActiveRecord < 4.2
 # ================================================
 ActiveSupport.on_load(:active_record) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.39
+  version: 1.0.40
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-30 00:00:00.000000000 Z
+date: 2022-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,6 +30,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.2'
+- !ruby/object:Gem::Dependency
+  name: fancy_gets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -225,6 +239,7 @@ files:
 - lib/brick/join_array.rb
 - lib/brick/serializers/json.rb
 - lib/brick/serializers/yaml.rb
+- lib/brick/tasks/orphans.rake
 - lib/brick/util.rb
 - lib/brick/version_number.rb
 - lib/generators/brick/USAGE