brick 1.0.68 → 1.0.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 977737d8dec8900c82e2a973060dca56ae7897e281557e43e1c0696012521270
-  data.tar.gz: 8a005ecab292cbfdaf94b29476d4db56e9f5b71a46a5f71ca6fd049550ed4cff
+  metadata.gz: af28a866a39817e9daa3a54b8f091c790d9280571cec94f9a3a317606e239fd9
+  data.tar.gz: a2cfe0b823c8b364c8f842852e631a48efe7f9dde8d506a27fbc85ebb74e58eb
 SHA512:
-  metadata.gz: c3cfaf5cdcdf67038ba5969306f49b73c09977b9e1dec078ad3ca3d6f6e7d16b5b0d18eb16a982568966ac91cabdcb96e82362cce4906485581b36ce2e2410da
-  data.tar.gz: 50f38455e43528478fe694f08bfcc50a8968536c9e4e6d8ab0c1713ff621e2153454a541d8e5940f584f2bd9e06549c4d3db047ac11fbdedaf5bc536d0ac7cd1
+  metadata.gz: 0cc18926c7c449e7dfba8d919d41b2490cb4d4a14692073f98f96903da075a31ff029f7a5f5931a845c7caf8f00b51cdba9ab0711dfa626d9e445d9122350b2b
+  data.tar.gz: 84373ca68edb9ebb88b8ccf2963bbf2e416c35c41840df1c1cd6922ef757cac204453aeb1e15881316681558a53ce17e32692e16320bb1b53c608bc41401920d

data/lib/brick/extensions.rb

@@ -266,18 +266,27 @@ module ActiveRecord
       quoted_table_name = table_name.split('.').map { |x| "\"#{x}\"" }.join('.')
       order_by_txt = [] if is_do_txt
       ordering = [ordering] if ordering && !ordering.is_a?(Array)
-      order_by = ordering&.map do |ord_part| # %%% If a term is also used as an eqi-condition in the WHERE clause, it can be omitted from ORDER BY
+      order_by = ordering&.each_with_object([]) do |ord_part, s| # %%% If a term is also used as an eqi-condition in the WHERE clause, it can be omitted from ORDER BY
                    case ord_part
                    when String
                      ord_expr = ord_part.gsub('^^^', quoted_table_name)
                      order_by_txt&.<<("Arel.sql(#{ord_expr})")
-                     Arel.sql(ord_expr)
+                     s << Arel.sql(ord_expr)
                    else # Expecting only Symbol
-                     ord_part = "_br_#{ord_part}_ct" if _br_hm_counts.key?(ord_part)
-                     # Retain any reference to a bt_descrip as being a symbol
-                     # Was:  "#{quoted_table_name}.\"#{ord_part}\""
-                     order_by_txt&.<<(_br_bt_descrip.key?(ord_part) ? ord_part : ord_part.inspect)
-                     ord_part
+                     if _br_hm_counts.key?(ord_part)
+                       ord_part = "\"b_r_#{ord_part}_ct\""
+                     elsif !_br_bt_descrip.key?(ord_part) && !column_names.include?(ord_part.to_s)
+                       # Disallow ordering by a bogus column
+                       # %%% Note this bogus entry so that Javascript can remove any bogus _brick_order
+                       # parameter from the querystring, pushing it into the browser history.
+                       ord_part = nil
+                     end
+                     if ord_part
+                       # Retain any reference to a bt_descrip as being a symbol
+                       # Was:  "#{quoted_table_name}.\"#{ord_part}\""
+                       order_by_txt&.<<(_br_bt_descrip.key?(ord_part) ? ord_part : ord_part.inspect)
+                       s << ord_part
+                     end
                    end
                  end
       [order_by, order_by_txt]
@@ -373,7 +382,9 @@ module ActiveRecord
     end
 
     def brick_select(params, selects = nil, order_by = nil, translations = {}, join_array = ::Brick::JoinArray.new)
+      is_postgres = ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
       is_mysql = ActiveRecord::Base.connection.adapter_name == 'Mysql2'
+      is_mssql = ActiveRecord::Base.connection.adapter_name == 'SQLServer'
       is_distinct = nil
       wheres = {}
       params.each do |k, v|
@@ -398,13 +409,15 @@ module ActiveRecord
       if selects&.empty? # Default to all columns
         tbl_no_schema = table.name.split('.').last
         columns.each do |col|
-          col_alias = " AS _#{col.name}" if (col_name = col.name) == 'class'
+          col_alias = " AS #{col.name}_" if (col_name = col.name) == 'class'
           selects << if is_mysql
                        "`#{tbl_no_schema}`.`#{col_name}`#{col_alias}"
-                     else
+                     elsif is_postgres || is_mssql
                        # Postgres can not use DISTINCT with any columns that are XML, so for any of those just convert to text
                        cast_as_text = '::text' if is_distinct && Brick.relations[klass.table_name]&.[](:cols)&.[](col.name)&.first&.start_with?('xml')
                        "\"#{tbl_no_schema}\".\"#{col_name}\"#{cast_as_text}#{col_alias}"
+                     else # Sqlite or Oracle
+                       "#{tbl_no_schema}.#{col_name}#{col_alias}"
                      end
         end
       end
@@ -430,13 +443,17 @@ module ActiveRecord
               # Postgres can not use DISTINCT with any columns that are XML, so for any of those just convert to text
               is_xml = is_distinct && Brick.relations[sel_col.first.table_name]&.[](:cols)&.[](sel_col.last)&.first&.start_with?('xml')
               # If it's not unique then also include the belongs_to association name before the column name
-              if used_col_aliases.key?(col_alias = "_brfk_#{v.first}__#{sel_col.last}")
-                col_alias = "_brfk_#{v.first}__#{v1[idx][-2..-1].map(&:to_s).join('__')}"
+              if used_col_aliases.key?(col_alias = "br_fk_#{v.first}__#{sel_col.last}")
+                col_alias = "br_fk_#{v.first}__#{v1[idx][-2..-1].map(&:to_s).join('__')}"
               end
               selects << if is_mysql
                            "`#{field_tbl_name}`.`#{sel_col.last}` AS `#{col_alias}`"
-                         else
+                         elsif is_postgres
                            "\"#{field_tbl_name}\".\"#{sel_col.last}\"#{'::text' if is_xml} AS \"#{col_alias}\""
+                         elsif is_mssql
+                           "\"#{field_tbl_name}\".\"#{sel_col.last}\" AS \"#{col_alias}\""
+                         else
+                           "#{field_tbl_name}.#{sel_col.last} AS \"#{col_alias}\""
                          end
               used_col_aliases[col_alias] = nil
               v1[idx] << col_alias
@@ -447,9 +464,11 @@ module ActiveRecord
               ((id_col = k1.primary_key).is_a?(Array) ? id_col : [id_col]).each do |id_part|
                 id_for_tables[v.first] << if id_part
                                             selects << if is_mysql
-                                                         "#{"`#{tbl_name}`.`#{id_part}`"} AS `#{(id_alias = "_brfk_#{v.first}__#{id_part}")}`"
+                                                         "#{"`#{tbl_name}`.`#{id_part}`"} AS `#{(id_alias = "br_fk_#{v.first}__#{id_part}")}`"
+                                                       elsif is_postgres || is_mssql
+                                                         "#{"\"#{tbl_name}\".\"#{id_part}\""} AS \"#{(id_alias = "br_fk_#{v.first}__#{id_part}")}\""
                                                        else
-                                                         "#{"\"#{tbl_name}\".\"#{id_part}\""} AS \"#{(id_alias = "_brfk_#{v.first}__#{id_part}")}\""
+                                                         "#{"#{tbl_name}.#{id_part}"} AS \"#{(id_alias = "br_fk_#{v.first}__#{id_part}")}\""
                                                        end
                                             id_alias
                                           end
@@ -479,9 +498,22 @@ module ActiveRecord
                        end
         next unless count_column # %%% Would be able to remove this when multiple foreign keys to same destination becomes bulletproof
 
-        tbl_alias = is_mysql ? "`_br_#{hm.name}`" : "\"_br_#{hm.name}\""
+        tbl_alias = if is_mysql
+                      "`b_r_#{hm.name}`"
+                    elsif is_postgres
+                      "\"b_r_#{hm.name}\""
+                    else
+                      "b_r_#{hm.name}"
+                    end
         pri_tbl = hm.active_record
         pri_tbl_name = is_mysql ? "`#{pri_tbl.table_name}`" : "\"#{pri_tbl.table_name.gsub('.', '"."')}\""
+        pri_tbl_name = if is_mysql
+                         "`#{pri_tbl.table_name}`"
+                       elsif is_postgres || is_mssql
+                         "\"#{pri_tbl.table_name.gsub('.', '"."')}\""
+                       else
+                         pri_tbl.table_name
+                       end
         on_clause = []
         if fk_col.is_a?(Array) # Composite key?
           fk_col.each_with_index { |fk_col_part, idx| on_clause << "#{tbl_alias}.#{fk_col_part} = #{pri_tbl_name}.#{pri_tbl.primary_key[idx]}" }
@@ -494,22 +526,29 @@ module ActiveRecord
           selects << poly_type
           on_clause << "#{tbl_alias}.#{poly_type} = '#{name}'"
         end
-        hm_table_name = is_mysql ? "`#{associative&.table_name || hm.klass.table_name}`" : "\"#{(associative&.table_name || hm.klass.table_name).gsub('.', '"."')}\""
+        hm_table_name = if is_mysql
+                          "`#{associative&.table_name || hm.klass.table_name}`"
+                        elsif is_postgres || is_mssql
+                          "\"#{(associative&.table_name || hm.klass.table_name).gsub('.', '"."')}\""
+                        else
+                          associative&.table_name || hm.klass.table_name
+                        end
+        group_bys = ::Brick.is_oracle || is_mssql ? selects : (1..selects.length).to_a
         join_clause = "LEFT OUTER
 JOIN (SELECT #{selects.join(', ')}, COUNT(#{'DISTINCT ' if hm.options[:through]}#{count_column
-          }) AS _ct_ FROM #{hm_table_name} GROUP BY #{(1..selects.length).to_a.join(', ')}) AS #{tbl_alias}"
+          }) AS c_t_ FROM #{hm_table_name} GROUP BY #{group_bys.join(', ')}) #{tbl_alias}"
         joins!("#{join_clause} ON #{on_clause.join(' AND ')}")
       end
       where!(wheres) unless wheres.empty?
       # Must parse the order_by and see if there are any symbols which refer to BT associations
-      # as they must be expanded to find the corresponding _br_model__column naming for each.
+      # as they must be expanded to find the corresponding b_r_model__column naming for each.
       if order_by.present?
         final_order_by = *order_by.each_with_object([]) do |v, s|
           if v.is_a?(Symbol)
             # Add the ordered series of columns derived from the BT based on its DSL
             if (bt_cols = klass._br_bt_descrip[v])
               bt_cols.values.each do |v1|
-                v1.each { |v2| s << v2.last if v2.length > 1 }
+                v1.each { |v2| s << "\"#{v2.last}\"" if v2.length > 1 }
               end
             else
               s << v
@@ -625,7 +664,7 @@ Module.class_exec do
        )
       return possible
     end
-    class_name = args.first.to_s
+    class_name = ::Brick.namify(args.first.to_s)
     # self.name is nil when a model name is requested in an .erb file
     base_module = (self < ActiveRecord::Migration || !self.name) ? Object : self
     # See if a file is there in the same way that ActiveSupport::Dependencies#load_missing_constant
@@ -737,7 +776,7 @@ class Object
           schema_name = Apartment.default_schema
         end
         # Maybe, just maybe there's a database table that will satisfy this need
-        if (matching = [table_name, singular_table_name, plural_class_name, model_name].find { |m| relations.key?(schema_name ? "#{schema_name}.#{m}" : m) })
+        if (matching = [table_name, singular_table_name, plural_class_name, model_name, table_name.titleize].find { |m| relations.key?(schema_name ? "#{schema_name}.#{m}" : m) })
           build_model_worker(schema_name, inheritable_name, model_name, singular_table_name, table_name, relations, matching)
         end
       end
@@ -1020,6 +1059,7 @@ class Object
       table_name = ActiveSupport::Inflector.underscore(plural_class_name)
       singular_table_name = ActiveSupport::Inflector.singularize(table_name)
       pk = model&._brick_primary_key(relations.fetch(table_name, nil))
+      is_postgres = ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
       is_mysql = ActiveRecord::Base.connection.adapter_name == 'Mysql2'
 
       namespace_name = "#{namespace.name}::" if namespace
@@ -1125,7 +1165,13 @@ class Object
           # %%% Add custom HM count columns
           # %%% What happens when the PK is composite?
           counts = model._br_hm_counts.each_with_object([]) do |v, s|
-            s << (is_mysql ? "`_br_#{v.first}`._ct_ AS \"_br_#{v.first}_ct\"" : "\"_br_#{v.first}\"._ct_ AS \"_br_#{v.first}_ct\"")
+            s << if is_mysql
+                   "`b_r_#{v.first}`.c_t_ AS \"b_r_#{v.first}_ct\""
+                 elsif is_postgres
+                   "\"b_r_#{v.first}\".c_t_ AS \"b_r_#{v.first}_ct\""
+                 else
+                   "b_r_#{v.first}.c_t_ AS \"b_r_#{v.first}_ct\""
+                 end
           end
           instance_variable_set("@#{table_name}".to_sym, ar_relation.dup._select!(*selects, *counts))
           if namespace && (idx = lookup_context.prefixes.index(table_name))
@@ -1297,7 +1343,7 @@ class Object
         # hm_assoc[:assoc_name] = new_alt_name
         [new_alt_name, true]
       else
-        assoc_name = hm_assoc[:inverse_table].pluralize
+        assoc_name = ::Brick.namify(hm_assoc[:inverse_table]).pluralize
         # hm_assoc[:assoc_name] = assoc_name
         [assoc_name, assoc_name.include?('.')]
       end
@@ -1340,12 +1386,20 @@ module ActiveRecord::ConnectionHandling
       # puts ActiveRecord::Base.execute_sql("SELECT current_setting('SEARCH_PATH')").to_a.inspect
 
       is_postgres = nil
+      is_mssql = ActiveRecord::Base.connection.adapter_name == 'SQLServer'
       case ActiveRecord::Base.connection.adapter_name
-      when 'PostgreSQL'
-        is_postgres = true
+      when 'PostgreSQL', 'SQLServer'
+        is_postgres = !is_mssql
         db_schemas = ActiveRecord::Base.execute_sql('SELECT DISTINCT table_schema FROM INFORMATION_SCHEMA.tables;')
         ::Brick.db_schemas = db_schemas.each_with_object({}) do |row, s|
-          row = row.is_a?(String) ? row : row['table_schema']
+          row = case row
+                when String
+                  row
+                when Array
+                  row.first
+                else
+                  row['table_schema']
+                end
           # Remove any system schemas
           s[row] = nil unless ['information_schema', 'pg_catalog'].include?(row)
         end
@@ -1357,6 +1411,11 @@ module ActiveRecord::ConnectionHandling
         end
       when 'Mysql2'
         ::Brick.default_schema = schema = ActiveRecord::Base.connection.current_database
+      when 'OracleEnhanced'
+        # ActiveRecord::Base.connection.current_database will be something like "XEPDB1"
+        ::Brick.default_schema = schema = ActiveRecord::Base.connection.raw_connection.username
+        ::Brick.db_schemas = {}
+        execute_oracle("SELECT username FROM sys.all_users WHERE ORACLE_MAINTAINED != 'Y'").each { |s| ::Brick.db_schemas[s.first] = nil }
       when 'SQLite'
         sql = "SELECT m.name AS relation_name, UPPER(m.type) AS table_type,
           p.name AS column_name, p.type AS data_type,
@@ -1389,7 +1448,7 @@ module ActiveRecord::ConnectionHandling
       case ActiveRecord::Base.connection.adapter_name
       when 'PostgreSQL', 'SQLite' # These bring back a hash for each row because the query uses column aliases
         # schema ||= 'public' if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
-        ActiveRecord::Base.retrieve_schema_and_tables(sql, is_postgres, schema).each do |r|
+        ActiveRecord::Base.retrieve_schema_and_tables(sql, is_postgres, is_mssql, schema).each do |r|
           # If Apartment gem lists the table as being associated with a non-tenanted model then use whatever it thinks
           # is the default schema, usually 'public'.
           schema_name = if ::Brick.config.schema_behavior[:multitenant]
@@ -1415,9 +1474,32 @@ module ActiveRecord::ConnectionHandling
           cols[col_name] = [r['data_type'], r['max_length'], measures&.include?(col_name), r['is_nullable'] == 'NO']
           # puts "KEY! #{r['relation_name']}.#{col_name} #{r['key']} #{r['const']}" if r['key']
         end
-      else # MySQL2 acts a little differently, bringing back an array for each row
-        ActiveRecord::Base.retrieve_schema_and_tables(sql).each do |r|
-          relation = relations[(relation_name = r[1])] # here relation represents a table or view from the database
+      else # MySQL2 and OracleEnhanced act a little differently, bringing back an array for each row
+        schema_and_tables = case ActiveRecord::Base.connection.adapter_name
+                            when 'OracleEnhanced'
+                              sql =
+"SELECT c.owner AS schema, c.table_name AS relation_name, 'BASE_TABLE' AS table_type,
+  LOWER(c.column_name) AS column_name, c.data_type,
+  COALESCE(c.data_length, c.data_precision) AS max_length,
+  CASE ac.constraint_type WHEN 'P' THEN 'PRIMARY KEY' END AS const,
+  ac.constraint_name AS \"key\",
+  CASE c.nullable WHEN 'Y' THEN 'YES' ELSE 'NO' END AS is_nullable
+FROM all_tab_cols c
+  LEFT OUTER JOIN all_cons_columns acc ON acc.owner = c.owner AND acc.table_name = c.table_name AND acc.column_name = c.column_name
+  LEFT OUTER JOIN all_constraints ac ON ac.owner = acc.owner AND ac.table_name = acc.table_name AND ac.constraint_name = acc.constraint_name AND constraint_type = 'P'
+WHERE c.owner IN (#{::Brick.db_schemas.keys.map { |s| "'#{s}'" }.join(', ')})
+ORDER BY 1, 2, c.internal_column_id, acc.position"
+                              execute_oracle(sql, *ar_tables)
+                            else
+                              ActiveRecord::Base.retrieve_schema_and_tables(sql)
+                            end
+        schema_and_tables.each do |r|
+          next if r[1].index('$') # Oracle can have goofy table names with $
+
+          if (relation_name = r[1]) =~ /^[A-Z_]+$/
+            relation_name.downcase!
+          end
+          relation = relations[relation_name] # here relation represents a table or view from the database
           relation[:isView] = true if r[2] == 'VIEW' # table_type
           col_name = r[3]
           key = case r[6] # constraint type
@@ -1457,9 +1539,9 @@ module ActiveRecord::ConnectionHandling
       # end
       # schema = ::Brick.default_schema # Reset back for this next round of fun
       case ActiveRecord::Base.connection.adapter_name
-      when 'PostgreSQL', 'Mysql2'
+      when 'PostgreSQL', 'Mysql2', '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
+            kcu2.CONSTRAINT_SCHEMA AS primary_schema, kcu2.TABLE_NAME AS primary_table, kcu1.CONSTRAINT_NAME AS CONSTRAINT_SCHEMA_FK
           FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS AS rc
             INNER JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE AS kcu1
               ON kcu1.CONSTRAINT_CATALOG = rc.CONSTRAINT_CATALOG
@@ -1470,36 +1552,55 @@ module ActiveRecord::ConnectionHandling
               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 }
+              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
+        fk_references = ActiveRecord::Base.execute_sql(sql)
       when 'SQLite'
         sql = "SELECT m.name, fkl.\"from\", fkl.\"table\", m.name || '_' || fkl.\"from\" AS constraint_name
         FROM sqlite_master m
           INNER JOIN pragma_foreign_key_list(m.name) fkl ON m.type = 'table'
         ORDER BY m.name, fkl.seq"
-      else
+        fk_references = ActiveRecord::Base.execute_sql(sql)
+      when 'OracleEnhanced'
+        schemas = ::Brick.db_schemas.keys.map { |s| "'#{s}'" }.join(', ')
+        sql =
+        "SELECT -- fk
+               ac.owner AS constraint_schema, acc_fk.table_name, LOWER(acc_fk.column_name),
+               -- referenced pk
+               ac.r_owner AS primary_schema, acc_pk.table_name AS primary_table, acc_fk.constraint_name AS constraint_schema_fk
+               -- , LOWER(acc_pk.column_name)
+        FROM all_cons_columns acc_fk
+          INNER JOIN all_constraints ac ON acc_fk.owner = ac.owner
+            AND acc_fk.constraint_name = ac.constraint_name
+          INNER JOIN all_cons_columns acc_pk ON ac.r_owner = acc_pk.owner
+            AND ac.r_constraint_name = acc_pk.constraint_name
+        WHERE ac.constraint_type = 'R'
+          AND ac.owner IN (#{schemas})
+          AND ac.r_owner IN (#{schemas})"
+        fk_references = ActiveRecord::Base.execute_oracle(sql)
       end
-      if sql
-        # ::Brick.default_schema ||= schema ||= 'public' if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
-        ActiveRecord::Base.execute_sql(sql).each do |fk|
-          fk = fk.values unless fk.is_a?(Array)
-          # Multitenancy makes things a little more general overall, except for non-tenanted tables
-          if apartment_excluded&.include?(fk[1].singularize.camelize)
-            fk[0] = Apartment.default_schema
-          elsif is_postgres && (fk[0] == 'public' || (is_multitenant && fk[0] == schema)) ||
-                !is_postgres && ['mysql', 'performance_schema', 'sys'].exclude?(fk[0])
-            fk[0] = nil
-          end
-          if apartment_excluded&.include?(fk[4].singularize.camelize)
-            fk[3] = Apartment.default_schema
-          elsif is_postgres && (fk[3] == 'public' || (is_multitenant && fk[3] == schema)) ||
-                !is_postgres && ['mysql', 'performance_schema', 'sys'].exclude?(fk[3])
-            fk[3] = nil
-          end
-          ::Brick._add_bt_and_hm(fk, relations)
+      ::Brick.is_oracle = true if ActiveRecord::Base.connection.adapter_name == 'OracleEnhanced'
+      # ::Brick.default_schema ||= schema ||= 'public' if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
+      fk_references&.each do |fk|
+        fk = fk.values unless fk.is_a?(Array)
+        # Multitenancy makes things a little more general overall, except for non-tenanted tables
+        if apartment_excluded&.include?(::Brick.namify(fk[1]).singularize.camelize)
+          fk[0] = Apartment.default_schema
+        elsif is_postgres && (fk[0] == 'public' || (is_multitenant && fk[0] == schema)) ||
+              !is_postgres && ['mysql', 'performance_schema', 'sys'].exclude?(fk[0])
+          fk[0] = nil
         end
+        if apartment_excluded&.include?(fk[4].singularize.camelize)
+          fk[3] = Apartment.default_schema
+        elsif is_postgres && (fk[3] == 'public' || (is_multitenant && fk[3] == schema)) ||
+              !is_postgres && ['mysql', 'performance_schema', 'sys'].exclude?(fk[3])
+          fk[3] = nil
+        end
+        fk[1].downcase! if ::Brick.is_oracle && fk[1] =~ /^[A-Z_]+$/
+        fk[4].downcase! if ::Brick.is_oracle && fk[4] =~ /^[A-Z_]+$/
+        ::Brick._add_bt_and_hm(fk, relations)
       end
     end
 
@@ -1530,29 +1631,35 @@ module ActiveRecord::ConnectionHandling
     ::Brick.load_additional_references if initializer_loaded
   end
 
-  def retrieve_schema_and_tables(sql = nil, is_postgres = nil, schema = nil)
+  def retrieve_schema_and_tables(sql = nil, is_postgres = nil, is_mssql = nil, schema = nil)
+    is_mssql = ActiveRecord::Base.connection.adapter_name == 'SQLServer' if is_mssql.nil?
     sql ||= "SELECT t.table_schema AS \"schema\", t.table_name AS relation_name, t.table_type,#{"
       pg_catalog.obj_description(
         ('\"' || t.table_schema || '\".\"' || t.table_name || '\"')::regclass, 'pg_class'
       ) AS table_description," if is_postgres}
       c.column_name, c.data_type,
       COALESCE(c.character_maximum_length, c.numeric_precision) AS max_length,
-      tc.constraint_type AS const, kcu.constraint_name AS \"key\",
+      kcu.constraint_type AS const, kcu.constraint_name AS \"key\",
       c.is_nullable
     FROM INFORMATION_SCHEMA.tables AS t
       LEFT OUTER JOIN INFORMATION_SCHEMA.columns AS c ON t.table_schema = c.table_schema
         AND t.table_name = c.table_name
-      LEFT OUTER JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE AS kcu ON
-        -- ON kcu.CONSTRAINT_CATALOG = t.table_catalog AND
+        LEFT OUTER JOIN
+        (SELECT kcu1.constraint_schema, kcu1.table_name, kcu1.ordinal_position,
+        tc.constraint_type, kcu1.constraint_name
+        FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE AS kcu1
+        INNER JOIN INFORMATION_SCHEMA.table_constraints AS tc
+          ON kcu1.CONSTRAINT_SCHEMA = tc.CONSTRAINT_SCHEMA
+          AND kcu1.TABLE_NAME = tc.TABLE_NAME
+          AND kcu1.CONSTRAINT_NAME = tc.constraint_name
+          AND tc.constraint_type != 'FOREIGN KEY' -- For MSSQL
+        ) AS kcu ON
+        -- kcu.CONSTRAINT_CATALOG = t.table_catalog AND
         kcu.CONSTRAINT_SCHEMA = c.table_schema
-        AND kcu.TABLE_NAME = c.table_name
-        AND kcu.position_in_unique_constraint IS NULL
+        AND kcu.TABLE_NAME = c.table_name#{"
+    --    AND kcu.position_in_unique_constraint IS NULL" unless is_mssql}
         AND kcu.ordinal_position = c.ordinal_position
-      LEFT OUTER JOIN INFORMATION_SCHEMA.table_constraints AS tc
-        ON kcu.CONSTRAINT_SCHEMA = tc.CONSTRAINT_SCHEMA
-        AND kcu.TABLE_NAME = tc.TABLE_NAME
-        AND kcu.CONSTRAINT_NAME = tc.constraint_name
-    WHERE t.table_schema #{is_postgres ?
+    WHERE t.table_schema #{is_postgres || is_mssql ?
         "NOT IN ('information_schema', 'pg_catalog')"
         :
         "= '#{ActiveRecord::Base.connection.current_database.tr("'", "''")}'"}#{"
@@ -1560,13 +1667,27 @@ module ActiveRecord::ConnectionHandling
   --          AND t.table_type IN ('VIEW') -- 'BASE TABLE', 'FOREIGN TABLE'
       AND t.table_name NOT IN ('pg_stat_statements', ?, ?)
     ORDER BY 1, t.table_type DESC, 2, c.ordinal_position"
+    ActiveRecord::Base.execute_sql(sql, *ar_tables)
+  end
+
+  def ar_tables
     ar_smtn = if ActiveRecord::Base.respond_to?(:schema_migrations_table_name)
                 ActiveRecord::Base.schema_migrations_table_name
               else
                 'schema_migrations'
               end
     ar_imtn = ActiveRecord.version >= ::Gem::Version.new('5.0') ? ActiveRecord::Base.internal_metadata_table_name : ''
-    ActiveRecord::Base.execute_sql(sql, ar_smtn, ar_imtn)
+    [ar_smtn, ar_imtn]
+  end
+
+  def execute_oracle(*sql_args)
+    cursor = ActiveRecord::Base.execute_sql(*sql_args)
+    result = []
+    while row = cursor.fetch()
+      result << row
+    end
+    cursor.close
+    result
   end
 end
 
@@ -1594,22 +1715,23 @@ module Brick
 
   class << self
     def _add_bt_and_hm(fk, relations, is_polymorphic = false, is_optional = false)
-      bt_assoc_name = fk[2]
+      bt_assoc_name = ::Brick.namify(fk[2])
       unless is_polymorphic
         bt_assoc_name = if bt_assoc_name.underscore.end_with?('_id')
-                          bt_assoc_name[0..-4]
+                          bt_assoc_name[-3] == '_' ? bt_assoc_name[0..-4] : bt_assoc_name[0..-3]
                         elsif bt_assoc_name.downcase.end_with?('id') && bt_assoc_name.exclude?('_')
                           bt_assoc_name[0..-3] # Make the bold assumption that we can just peel off any final ID part
                         else
                           "#{bt_assoc_name}_bt"
                         end
       end
-      bt_assoc_name = "_#{bt_assoc_name}" if bt_assoc_name == 'attribute'
+      bt_assoc_name = "#{bt_assoc_name}_" if bt_assoc_name == 'attribute'
 
       # %%% Temporary schema patch
       for_tbl = fk[1]
+      fk_namified = ::Brick.namify(fk[1])
       apartment = Object.const_defined?('Apartment') && Apartment
-      fk[0] = Apartment.default_schema if apartment && apartment.excluded_models.include?(for_tbl.singularize.camelize)
+      fk[0] = Apartment.default_schema if apartment && apartment.excluded_models.include?(fk_namified.singularize.camelize)
       fk[1] = "#{fk[0]}.#{fk[1]}" if fk[0] # && fk[0] != ::Brick.default_schema
       bts = (relation = relations.fetch(fk[1], nil))&.fetch(:fks) { relation[:fks] = {} }
 
@@ -1708,7 +1830,7 @@ module Brick
                   else
                     fk[1]
                   end
-        assoc_hm = hms[hm_cnstr_name] = { is_bt: false, fk: fk[2], assoc_name: for_tbl.pluralize, alternate_name: bt_assoc_name,
+        assoc_hm = hms[hm_cnstr_name] = { is_bt: false, fk: fk[2], assoc_name: fk_namified.pluralize, alternate_name: bt_assoc_name,
                                           inverse_table: inv_tbl, inverse: assoc_bt }
         assoc_hm[:polymorphic] = true if is_polymorphic
         hm_counts = relation.fetch(:hm_counts) { relation[:hm_counts] = {} }

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

@@ -49,8 +49,10 @@ module Brick
       # After we're initialized and before running the rest of stuff, put our configuration in place
       ActiveSupport.on_load(:after_initialize) do |app|
         assets_path = File.expand_path("#{__dir__}/../../../../vendor/assets")
-        (app.config.assets.precompile ||= []) << "#{assets_path}/images/brick_erd.png"
-        (app.config.assets.paths ||= []) << assets_path
+        if (app_config = app.config).respond_to?(:assets)
+          (app_config.assets.precompile ||= []) << "#{assets_path}/images/brick_erd.png"
+          (app.config.assets.paths ||= []) << assets_path
+        end
         # ====================================
         # Dynamically create generic templates
         # ====================================
@@ -145,7 +147,7 @@ module Brick
                                                  'nil'
                                                else
                                                  # Postgres column names are limited to 63 characters
-                                                 "#{obj_name}.#{"_br_#{assoc_name}_ct"[0..62]} || 0"
+                                                 "#{obj_name}.#{"b_r_#{assoc_name}_ct"[0..62]} || 0"
                                                end
                                      ", #{set_ct}, #{path_keys(hm_assoc, hm_fk_name, obj_name, pk)}"
                                    end
@@ -565,7 +567,7 @@ erDiagram
      end %>
 <% end
    def dt_lookup(dt)
-     { 'integer' => 'int', }[dt] || dt.tr(' ', '_')
+     { 'integer' => 'int', }[dt] || dt&.tr(' ', '_') || 'int'
    end
    callbacks.merge({model_short_name => #{@_brick_model.name}}).each do |cb_k, cb_class|
      cb_relation = ::Brick.relations[cb_class.table_name]
@@ -581,8 +583,9 @@ erDiagram
          fk.each do |fk_part| %>
     <%= \"#\{dt_lookup(cols[fk_part].first)} #\{fk_part} \\\"&nbsp;&nbsp;&nbsp;&nbsp;fk\\\"\".html_safe unless pkeys&.include?(fk_part) %><%
          end
-       else %>
-    <%= \"#\{dt_lookup(cols[fk].first)} #\{fk} \\\"&nbsp;&nbsp;&nbsp;&nbsp;fk\\\"\".html_safe unless pkeys&.include?(fk) %><%
+       else # %%% Does not yet accommodate polymorphic BTs
+    %>
+    <%= \"#\{dt_lookup(cols[fk]&.first)} #\{fk} \\\"&nbsp;&nbsp;&nbsp;&nbsp;fk\\\"\".html_safe unless pkeys&.include?(fk) %><%
        end
      end %>
   }
@@ -1096,7 +1099,9 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
             gErd.setAttribute(\"class\", \"relatedModel\");
             gErd.addEventListener(\"click\",
               function (evt) {
-                location.href = changeout(changeout(location.href, -1, cbs[this.id]), \"_brick_erd\", \"1\");
+                location.href = changeout(changeout(
+                  changeout(location.href, '_brick_order', null), // Remove any ordering
+                -1, cbs[this.id]), \"_brick_erd\", \"1\");
               }
             );
           }

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -123,7 +123,7 @@ module Brick
   end
 
   class << self
-    attr_accessor :default_schema, :db_schemas, :routes_done
+    attr_accessor :default_schema, :db_schemas, :routes_done, :is_oracle
 
     def set_db_schema(params)
       schema = params['_brick_schema'] || 'public'
@@ -151,6 +151,20 @@ module Brick
       @pending_models ||= {}
     end
 
+    # Convert spaces to underscores if the second character and onwards is mixed case
+    def namify(name)
+      if name.include?(' ')
+        # All uppers or all lowers?
+        if name[1..-1] =~ /^[A-Z0-9_]+$/ || name[1..-1] =~ /^[a-z0-9_]+$/
+          name.titleize.tr(' ', '_')
+        else # Mixed uppers and lowers -- just remove existing spaces
+          name.tr(' ', '')
+        end
+      else
+        name
+      end
+    end
+
     def get_bts_and_hms(model)
       bts, hms = model.reflect_on_all_associations.each_with_object([{}, {}]) do |a, s|
         next if !const_defined?(a.name.to_s.singularize.camelize) && ::Brick.config.exclude_tables.include?(a.plural_name)
@@ -469,9 +483,10 @@ In config/initializers/brick.rb appropriate entries would look something like:
         # %%% TODO: If no auto-controllers then enumerate the controllers folder in order to build matching routes
         # If auto-controllers and auto-models are both enabled then this makes sense:
         ::Brick.relations.each do |rel_name, v|
-          rel_name = rel_name.split('.').map(&:underscore)
+          rel_name = rel_name.split('.').map { |x| ::Brick.namify(x).underscore }
           schema_names = rel_name[0..-2]
           schema_names.shift if ::Brick.apartment_multitenant && schema_names.first == Apartment.default_schema
+          # %%% If more than one schema has the same table name, will need to add a schema name prefix to have uniqueness
           k = rel_name.last
           unless existing_controllers.key?(controller_name = k.pluralize)
             options = {}
@@ -545,7 +560,11 @@ ActiveSupport.on_load(:active_record) do
         class << self
           def execute_sql(sql, *param_array)
             param_array = param_array.first if param_array.length == 1 && param_array.first.is_a?(Array)
-            connection.execute(send(:sanitize_sql_array, [sql] + param_array))
+            if ActiveRecord::Base.connection.adapter_name == 'SQLServer'
+              connection.exec_query(send(:sanitize_sql_array, [sql] + param_array)).rows
+            else
+              connection.execute(send(:sanitize_sql_array, [sql] + param_array))
+            end
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.68
+  version: 1.0.70
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-04 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: fancy_gets
   requirement: !ruby/object:Gem::Requirement
@@ -264,5 +264,5 @@ requirements: []
 rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
-summary: Import and Export Data
+summary: Create a Rails app from data alone
 test_files: []