brick 1.0.188 → 1.0.190

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66a294952ebee9c385431265543c55106d7d9938c215d98163a15f1e94863ef9
-  data.tar.gz: 207b5914e0bc18bdd24c074b3b6de94e262cce57f21ca40d8e7aeecbeb7ca1ec
+  metadata.gz: 3e7a12940f4ac57eea3c53bb3b437472f90bbaa857bd6611d3e871463add46f2
+  data.tar.gz: 8afb6e47cebd99a9b4172aa82d9447b71dd66e6df750249063b66b9b9ba939a9
 SHA512:
-  metadata.gz: f381dd36a4c52d533545b8a5bcc61f43e64998f3e90f3158e5f1be7a04614f8113557e928ab5a129543f4529dbf9676b044ac99c3dde1d83a979b34892aa8137
-  data.tar.gz: 54231970263712710cdc694b4909f1758b345084c5ed36c603fead9aebb41c1253c230f760fdc0c1a611a1ca40d0985bcd2cba3b823e90f829fe3b18357ff227
+  metadata.gz: d5379ddb6c61675b5606730a771a3f95638829b8359b42fd78c0509836635a93d36b787b09f21a0b9321623c917a149508b643a68ff4474baf7b40739ad5eeed
+  data.tar.gz: 40b6c6dc4fd31b10632fafb572608ec1c6473b6efa1dab346f1c82fc4f9daa1faba6d3675b336a780291595e25ace20358a95205a9284e7c42ddf450efe1d0a4

data/lib/brick/extensions.rb

@@ -98,6 +98,7 @@ module ActiveRecord
       end
 
       def _br_quoted_name(name)
+        name = name.join('.') if name.is_a?(Array)
         if name == '*'
           name
         elsif is_mysql
@@ -729,12 +730,12 @@ module ActiveRecord
               cc_part_idx -= 1
             end
           end
-          selects << "#{tbl_name}.#{cc_part.last} AS #{col_alias}"
+          selects << "#{_br_quoted_name(tbl_name)}.#{_br_quoted_name(cc_part.last)} AS #{_br_quoted_name(col_alias)}"
           cc_part << col_alias
         end
         # Add a key column unless we've already got it
         if key_alias && !used_col_aliases.key?(key_alias)
-          selects << "#{key_tbl_name}.#{dest_pk} AS #{key_alias}"
+          selects << "#{_br_quoted_name(key_tbl_name)}.#{_br_quoted_name(dest_pk)} AS #{_br_quoted_name(key_alias)}"
           used_col_aliases[key_alias] = nil
         end
         cc[2] = key_alias ? [key_klass, key_alias] : nil
@@ -1018,7 +1019,7 @@ JOIN (SELECT #{hm_selects.map { |s| _br_quoted_name("#{'br_t0.' if from_clause}#
         selects, where_values_hash, nil, translations: translations, join_array: join_array,
         cust_col_override: { '_br' => (descrip_cols = [pieces, my_dsl]) }
       )
-      order_values = "#{klass.table_name}.#{klass.primary_key}"
+      order_values = "#{_br_quoted_name(klass.table_name)}.#{_br_quoted_name(klass.primary_key)}"
       [self.select(selects), descrip_cols]
     end
 
@@ -2158,7 +2159,7 @@ class Object
 
             # %%% Allow params to define which columns to use for order_by
             # Overriding the default by providing a querystring param?
-            order_by = params['_brick_order']&.split(',')&.map(&:to_sym) || Object.send(:default_ordering, table_name, pk)
+            order_by = params['_brick_order']&.split(',')&.map(&:to_s) || Object.send(:default_ordering, table_name, pk)
 
             ar_relation = ActiveRecord.version < Gem::Version.new('4') ? real_model.preload : real_model.all
             params['_brick_is_api'] = true if (is_api = request.format == :js || current_api_root)
@@ -2895,24 +2896,32 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
       #   end
       # end
       # schema = ::Brick.default_schema # Reset back for this next round of fun
+      kcus = nil
       case ActiveRecord::Base.connection.adapter_name
       when 'PostgreSQL', 'Mysql2', 'Trilogy', 'SQLServer'
-        sql = "SELECT kcu1.CONSTRAINT_SCHEMA, kcu1.TABLE_NAME, kcu1.COLUMN_NAME,
-            kcu2.CONSTRAINT_SCHEMA AS primary_schema, kcu2.TABLE_NAME AS primary_table, kcu1.CONSTRAINT_NAME AS CONSTRAINT_SCHEMA_FK
+        # All KCUs -- use this to virtually JOIN against fk_references in Ruby code
+        sql = "SELECT CONSTRAINT_CATALOG, CONSTRAINT_SCHEMA, CONSTRAINT_NAME, ORDINAL_POSITION,
+                      TABLE_NAME, COLUMN_NAME
+              FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE#{"
+              WHERE CONSTRAINT_SCHEMA = COALESCE(current_setting('SEARCH_PATH'), 'public')" if is_postgres && schema }"
+        kcus = ActiveRecord::Base.execute_sql(sql).each_with_object({}) do |v, s|
+                 key = "#{v['constraint_name']}.#{v['constraint_schema']}.#{v['constraint_catalog']}.#{v['ordinal_position']}"
+                 key << ".#{v['table_name']}.#{v['column_name']}" unless is_postgres || is_mssql
+                 s[key] = [v['constraint_schema'], v['table_name']]
+               end
+
+        sql = "SELECT kcu.CONSTRAINT_SCHEMA, kcu.TABLE_NAME, kcu.COLUMN_NAME,
+            #{# These will get filled in with real values (effectively doing the JOIN in Ruby)
+              is_postgres || is_mssql ? 'NULL as primary_schema, NULL as primary_table' :
+                                        'kcu.REFERENCED_TABLE_NAME, kcu.REFERENCED_COLUMN_NAME'},
+            kcu.CONSTRAINT_NAME AS CONSTRAINT_SCHEMA_FK,
+            rc.UNIQUE_CONSTRAINT_NAME, rc.UNIQUE_CONSTRAINT_SCHEMA, rc.UNIQUE_CONSTRAINT_CATALOG, kcu.ORDINAL_POSITION
           FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS AS rc
-            INNER JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE AS kcu1
-              ON kcu1.CONSTRAINT_CATALOG = rc.CONSTRAINT_CATALOG
-              AND kcu1.CONSTRAINT_SCHEMA = rc.CONSTRAINT_SCHEMA
-              AND kcu1.CONSTRAINT_NAME = rc.CONSTRAINT_NAME
-            INNER JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE AS kcu2
-              ON kcu2.CONSTRAINT_CATALOG = rc.UNIQUE_CONSTRAINT_CATALOG
-              AND kcu2.CONSTRAINT_SCHEMA = rc.UNIQUE_CONSTRAINT_SCHEMA
-              AND kcu2.CONSTRAINT_NAME = rc.UNIQUE_CONSTRAINT_NAME#{"
-              AND kcu2.TABLE_NAME = kcu1.REFERENCED_TABLE_NAME
-              AND kcu2.COLUMN_NAME = kcu1.REFERENCED_COLUMN_NAME" unless is_postgres || is_mssql }
-              AND kcu2.ORDINAL_POSITION = kcu1.ORDINAL_POSITION#{"
-          WHERE kcu1.CONSTRAINT_SCHEMA = COALESCE(current_setting('SEARCH_PATH'), 'public')" if is_postgres && schema }"
-          # AND kcu2.TABLE_NAME = ?;", Apartment::Tenant.current, table_name
+            INNER JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE AS kcu
+              ON kcu.CONSTRAINT_CATALOG = rc.CONSTRAINT_CATALOG
+              AND kcu.CONSTRAINT_SCHEMA = rc.CONSTRAINT_SCHEMA
+              AND kcu.CONSTRAINT_NAME = rc.CONSTRAINT_NAME#{"
+          WHERE kcu.CONSTRAINT_SCHEMA = COALESCE(current_setting('SEARCH_PATH'), 'public')" if is_postgres && schema }"
         fk_references = ActiveRecord::Base.execute_sql(sql)
       when 'SQLite'
         sql = "SELECT NULL AS constraint_schema, m.name, fkl.\"from\", NULL AS primary_schema, fkl.\"table\", m.name || '_' || fkl.\"from\" AS constraint_name
@@ -2943,6 +2952,11 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
       ::Brick.default_schema ||= 'public' if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
       fk_references&.each do |fk|
         fk = fk.values unless fk.is_a?(Array)
+        # Virtually JOIN against fk_references in order to change out the primary schema and primary table
+        if (kcu = kcus&.fetch("#{fk[6]}.#{fk[7]}.#{fk[8]}.#{fk[9]}", nil))
+          fk[3] = kcu[0]
+          fk[4] = kcu[1]
+        end
         # Multitenancy makes things a little more general overall, except for non-tenanted tables
         if ::Brick.is_apartment_excluded_table(::Brick.namify(fk[1]))
           fk[0] = ::Brick.apartment_default_tenant
@@ -2967,6 +2981,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
         end
         ::Brick._add_bt_and_hm(fk, relations)
       end
+      kcus = nil # Allow this large item to be garbage collected
     end
 
     table_name_lookup = (::Brick.table_name_lookup ||= {})

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

@@ -738,8 +738,11 @@ window.addEventListener(\"popstate\", linkSchemas);
                       hms_columns << hm_entry
                     end
                   when 'show', 'new', 'update'
+                    predicates = nil
                     hm_stuff << if hm_fk_name
-                                  if hm_assoc.klass.column_names.include?(hm_fk_name.to_s) ||
+                                  if (hm_fk_name.is_a?(Array) && # Composite key?
+                                      hm_fk_name.all? { |hm_fk_part| hm_assoc.klass.column_names.include?(hm_fk_part) }) ||
+                                     hm_assoc.klass.column_names.include?(hm_fk_name.to_s) ||
                                      (hm_fk_name.is_a?(String) && hm_fk_name.include?('.')) # HMT?  (Could do a better check for this)
                                     predicates = path_keys(hm_assoc, hm_fk_name, pk).map do |k, v|
                                                    if v == '[sti_type]'
@@ -1638,7 +1641,7 @@ end
                  end
       s << "<table id=\"#{hm_name}\" class=\"shadow\">
         <tr><th>#{hm[1]}#{' poly' if hm[0].options[:as]} #{hm[3]}
-          <% if respond_to?(:new_#{partial_new_path_name = hm.first.klass._brick_index(:singular)}_path) %>
+          <% if predicates && respond_to?(:new_#{partial_new_path_name = hm.first.klass._brick_index(:singular)}_path) %>
           <span class = \"add-hm-related\"><%=
             pk_val = (obj_pk = model.primary_key).is_a?(String) ? obj.send(obj_pk) : obj_pk.map { |pk_part| obj.send(pk_part) }
             pk_val_arr = [pk_val] unless pk_val.is_a?(Array)

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

@@ -467,7 +467,7 @@ function onImagesLoaded(event) {
           if bt.length < 4
             bt << (option_detail = [["(No #{bt_name} chosen)", '^^^brick_NULL^^^']])
             # %%% Accommodate composite keys for obj.pk at the end here
-            collection, descrip_cols = bt_class&.order(Arel.sql("#{bt_class.table_name}.#{obj_pk = bt_class.primary_key}"))&.brick_list
+            collection, descrip_cols = bt_class&.order(Arel.sql("#{bt_class._br_quoted_name(bt_class.table_name)}.#{bt_class._br_quoted_name(obj_pk = bt_class.primary_key)}"))&.brick_list
             collection&.brick_(:each) do |obj|
               option_detail << [
                 obj.brick_descrip(

data/lib/brick/version_number.rb

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

data/lib/generators/brick/migrations_generator.rb

@@ -10,6 +10,7 @@ module Brick
   # Auto-generates migration files
   class MigrationsGenerator < ::Rails::Generators::Base
     include ::Brick::MigrationBuilder
+    include FancyGets
 
     desc 'Auto-generates migration files for an existing database.'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.188
+  version: 1.0.190
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-11 00:00:00.000000000 Z
+date: 2023-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -280,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Create a Rails app from data alone