brick 1.0.143 → 1.0.144

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f3f2c35ad5ad81b538cb12c4d5166ed24bbf5e60bbc02583ed3d6f60cb38783
-  data.tar.gz: 2e598860e1be1b371160146ad05b8c43dfaa108c6125a1c567774fc928945a5f
+  metadata.gz: 6b84f681ffcc3cfbc37531e21ee68c07a27df07d0b0b63aed94d7e13fedc8ec1
+  data.tar.gz: b1f96b376d7c27b9a01e8025f8628efdfedff77875b089323e66bdff557a4141
 SHA512:
-  metadata.gz: d4a99c758d21966a05f82b10d6b33865c17d85dcacb1a0c2af5d6cada712f062f30ebeab0124e7a8d31d132fe83cc265474246b2d45efa98a0b0a0c86f377cb9
-  data.tar.gz: 004b04e031315c1b7b96b516a55c13a7587fe109179b6ae1bd7dbe11ca305c37adfdb61b2f6c2acf26fb35cb9fbbba898c18552bc2ad050bec48fa5dec072c3d
+  metadata.gz: d6b2dfbd93defb98b61bd20c405657d8b3df5c9f1c4887dc37fe75a09fdcc61abc9ba15a1e9a16006487017f270d62ca1843fefeea574eb8df07fc55f136693b
+  data.tar.gz: 4f1d192f9420b9f8cfac9fa7d6f7f6c057d5bb0f852b8066937f79410b20005b4080b6bdec16f2e470e8fa1a9e5331fd26b64d675e1e397942ec65a371f8d977

data/lib/brick/extensions.rb

@@ -316,8 +316,10 @@ module ActiveRecord
     def self.brick_import_template
       template = constants.include?(:IMPORT_TEMPLATE) ? self::IMPORT_TEMPLATE : suggest_template(0, false, true)
       # Add the primary key to the template as being unique (unless it's already there)
-      template[:uniques] = [pk = primary_key.to_sym]
-      template[:all].unshift(pk) unless template[:all].include?(pk)
+      if primary_key
+        template[:uniques] = [pk = primary_key.to_sym]
+        template[:all].unshift(pk) unless template[:all].include?(pk)
+      end
       template
     end
 
@@ -512,9 +514,6 @@ module ActiveRecord
       # model early in case the user wants to do an ORDER BY based on any of that.
       model._brick_calculate_bts_hms(translations, join_array) if is_add_bts || is_add_hms
 
-      is_postgres = ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
-      is_mysql = ['Mysql2', 'Trilogy'].include?(ActiveRecord::Base.connection.adapter_name)
-      is_mssql = ActiveRecord::Base.connection.adapter_name == 'SQLServer'
       is_distinct = nil
       wheres = {}
       params.each do |k, v|
@@ -836,47 +835,27 @@ module ActiveRecord
           next
         end
 
-        tbl_alias = if is_mysql
-                      "`b_r_#{hm.name}`"
-                    elsif is_postgres
-                      "\"b_r_#{hm.name}\""
-                    else
-                      "b_r_#{hm.name}"
-                    end
-        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
+        tbl_alias = "b_r_#{hm.name}"
         on_clause = []
         hm_selects = 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_key[idx]}" }
+                       fk_col.each_with_index { |fk_col_part, idx| on_clause << "#{tbl_alias}.#{fk_col_part} = #{pri_tbl.table_name}.#{pri_key[idx]}" }
                        fk_col.dup
                      else
-                       on_clause << "#{tbl_alias}.#{fk_col} = #{pri_tbl_name}.#{pri_key}"
+                       on_clause << "#{_br_quoted_name("#{tbl_alias}.#{fk_col}")} = #{_br_quoted_name("#{pri_tbl.table_name}.#{pri_key}")}"
                        [fk_col]
                      end
         if poly_type
           hm_selects << poly_type
-          on_clause << "#{tbl_alias}.#{poly_type} = '#{name}'"
+          on_clause << "#{_br_quoted_name("#{tbl_alias}.#{poly_type}")} = '#{name}'"
         end
         unless from_clause
           tbl_nm = hm.macro == :has_and_belongs_to_many ? hm.join_table : hm.table_name
-          hm_table_name = if is_mysql
-                            "`#{tbl_nm}`"
-                          elsif is_postgres || is_mssql
-                            "\"#{(tbl_nm).gsub('.', '"."')}\""
-                          else
-                            tbl_nm
-                          end
+          hm_table_name = _br_quoted_name(tbl_nm)
         end
         group_bys = ::Brick.is_oracle || is_mssql ? hm_selects : (1..hm_selects.length).to_a
         join_clause = "LEFT OUTER
-JOIN (SELECT #{hm_selects.map { |s| "#{'br_t0.' if from_clause}#{s}" }.join(', ')}, COUNT(#{'DISTINCT ' if hm.options[:through]}#{count_column
-          }) AS c_t_ FROM #{from_clause || hm_table_name} GROUP BY #{group_bys.join(', ')}) #{tbl_alias}"
+JOIN (SELECT #{hm_selects.map { |s| _br_quoted_name("#{'br_t0.' if from_clause}#{s}") }.join(', ')}, COUNT(#{'DISTINCT ' if hm.options[:through]}#{_br_quoted_name(count_column)
+          }) AS c_t_ FROM #{from_clause || hm_table_name} GROUP BY #{group_bys.join(', ')}) #{_br_quoted_name(tbl_alias)}"
         self.joins_values |= ["#{join_clause} ON #{on_clause.join(' AND ')}"] # Same as:  joins!(...)
       end unless cust_col_override
       while (n = nix.pop)
@@ -924,6 +903,7 @@ JOIN (SELECT #{hm_selects.map { |s| "#{'br_t0.' if from_clause}#{s}" }.join(', '
               s << v
             end
           else # String stuff (which defines a custom ORDER BY) just comes straight through
+            v = v.split('.').map { |x| "\"#{x}\"" }.join('.')
             s << v
             # Avoid "PG::InvalidColumnReference: ERROR: for SELECT DISTINCT, ORDER BY expressions must appear in select list" in Postgres
             selects << v if is_distinct
@@ -1015,6 +995,26 @@ Might want to add this in your brick.rb:
     def shift_or_first(ary)
       ary.length > 1 ? ary.shift : ary.first
     end
+
+    def _br_quoted_name(name)
+      if is_mysql
+        "`#{name}`"
+      elsif is_postgres || is_mssql
+        "\"#{(name).gsub('.', '"."')}\""
+      else
+        name
+      end
+    end
+
+    def is_postgres
+      @is_postgres ||= ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
+    end
+    def is_mysql
+      @is_mysql ||= ['Mysql2', 'Trilogy'].include?(ActiveRecord::Base.connection.adapter_name)
+    end
+    def is_mssql
+      @is_mssql ||= ActiveRecord::Base.connection.adapter_name == 'SQLServer'
+    end
   end
 
   module Inheritance
@@ -2452,7 +2452,7 @@ end.class_exec do
                         end
           relation_name = schema_name ? "#{schema_name}.#{r['relation_name']}" : r['relation_name']
           # Both uppers and lowers as well as underscores?
-          apply_double_underscore_patch if relation_name =~ /[A-Z]/ && relation_name =~ /[a-z]/ && relation_name.index('_')
+          ::Brick.apply_double_underscore_patch if relation_name =~ /[A-Z]/ && relation_name =~ /[a-z]/ && relation_name.index('_')
           relation = relations[relation_name]
           relation[:isView] = true if r['table_type'] == 'VIEW'
           relation[:description] = r['table_description'] if r['table_description']
@@ -2501,7 +2501,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
             relation_name.downcase!
           # Both uppers and lowers as well as underscores?
           elsif relation_name =~ /[A-Z]/ && relation_name =~ /[a-z]/ && relation_name.index('_')
-            apply_double_underscore_patch
+            ::Brick.apply_double_underscore_patch
           end
           # Expect the default schema for SQL Server to be 'dbo'.
           if (::Brick.is_oracle && r[0] != schema) || (is_mssql && r[0] != 'dbo')
@@ -2528,6 +2528,15 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
         end
       end
 
+      # PostGIS adds three views which would confuse Rails if models were to be built for them.
+      if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
+        if relations.key?('geography_columns') && relations.key?('geometry_columns') && relations.key?('spatial_ref_sys')
+          (::Brick.config.exclude_tables ||= []) << 'geography_columns'
+          ::Brick.config.exclude_tables << 'geometry_columns'
+          ::Brick.config.exclude_tables << 'spatial_ref_sys'
+        end
+      end
+
       # # Add unique OIDs
       # if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
       #   ActiveRecord::Base.execute_sql(
@@ -2706,43 +2715,6 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
     ar_imtn = ActiveRecord.version >= ::Gem::Version.new('5.0') ? ActiveRecord::Base.internal_metadata_table_name : 'ar_internal_metadata'
     [ar_smtn, ar_imtn]
   end
-
-  def apply_double_underscore_patch
-    unless @double_underscore_applied
-      # Same as normal #camelize and #underscore, just that double-underscores turn into a single underscore
-      ActiveSupport::Inflector.class_eval do
-        def camelize(term, uppercase_first_letter = true)
-          strings = term.to_s.split('__').map do |string|
-            # String#camelize takes a symbol (:upper or :lower), so here we also support :lower to keep the methods consistent.
-            if !uppercase_first_letter || uppercase_first_letter == :lower
-              string = string.sub(inflections.acronyms_camelize_regex) { |match| match.downcase! || match }
-            else
-              string = string.sub(/^[a-z\d]*/) { |match| inflections.acronyms[match] || match.capitalize! || match }
-            end
-            string.gsub!(/(?:_|(\/))([a-z\d]*)/i) do
-              word = $2
-              substituted = inflections.acronyms[word] || word.capitalize! || word
-              $1 ? "::#{substituted}" : substituted
-            end
-            string
-          end
-          strings.join('_')
-        end
-
-        def underscore(camel_cased_word)
-          return camel_cased_word.to_s unless /[A-Z-]|::/.match?(camel_cased_word)
-          camel_cased_word.to_s.gsub("::", "/").split('_').map do |word|
-            word.gsub!(inflections.acronyms_underscore_regex) { "#{$1 && '_' }#{$2.downcase}" }
-            word.gsub!(/([A-Z]+)(?=[A-Z][a-z])|([a-z\d])(?=[A-Z])/) { ($1 || $2) << "_" }
-            word.tr!("-", "_")
-            word.downcase!
-            word
-          end.join('__')
-        end
-      end
-      @double_underscore_applied = true
-    end
-  end
 end
 
 # ==========================================
@@ -2769,7 +2741,7 @@ module Brick
 
   class << self
     def _add_bt_and_hm(fk, relations, polymorphic_class = nil, is_optional = false)
-      bt_assoc_name = ::Brick.namify(fk[2], :downcase)
+      bt_assoc_name = ::Brick.namify(fk[2].dup, :downcase)
       unless polymorphic_class
         bt_assoc_name = if bt_assoc_name.underscore.end_with?('_id')
                           bt_assoc_name[-3] == '_' ? bt_assoc_name[0..-4] : bt_assoc_name[0..-3]

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

@@ -1258,57 +1258,73 @@ erDiagram
     // Have a click on the sheets link to bring up the sign-in window.  (Must happen from some kind of user click.)
     sheetsLink.addEventListener(\"click\", async function (evt) {
       evt.preventDefault();
-      await gapi.load(\"client\", function () {
-        gapi.client.init({ // Load the discovery doc to initialize the API
-          clientId: \"487319557829-fgj4u660igrpptdji7ev0r5hb6kh05dh.apps.googleusercontent.com\",
-          scope: \"https://www.googleapis.com/auth/spreadsheets https://www.googleapis.com/auth/drive.file\",
-          discoveryDocs: [\"https://sheets.googleapis.com/$discovery/rest?version=v4\"]
-        }).then(function () {
-          gapi.auth2.getAuthInstance().isSignedIn.listen(updateSignInStatus);
-          updateSignInStatus(gapi.auth2.getAuthInstance().isSignedIn.get());
-        });
+      var client = google.accounts.oauth2.initTokenClient({
+        client_id: \"487319557829-fgj4u660igrpptdji7ev0r5hb6kh05dh.apps.googleusercontent.com\",
+        scope: \"https://www.googleapis.com/auth/spreadsheets https://www.googleapis.com/auth/drive.file\",
+        callback: updateSignInStatus
       });
+      client.requestAccessToken();
     });
   }
 
-  async function updateSignInStatus(isSignedIn) {
-    if (isSignedIn) {
-      await gapi.client.sheets.spreadsheets.create({
-        properties: {
-          title: #{table_name.inspect},
-        },
-        sheets: [
-          // sheet1, sheet2, sheet3
-        ]
-      }).then(function (response) {
-        sheetUrl = response.result.spreadsheetUrl;
-        spreadsheetId = response.result.spreadsheetId;
-        sheetsLink.setAttribute(\"href\", sheetUrl); // response.result.spreadsheetUrl
-        console.log(\"x1\", sheetUrl);
-
-        // Get JSON data
-        fetch(changeout(<%= #{@_brick_model._brick_index}_path(format: :js).inspect.html_safe %>, \"_brick_schema\", brickSchema)).then(function (response) {
-          response.json().then(function (data) {
-            gapi.client.sheets.spreadsheets.values.append({
-              spreadsheetId: spreadsheetId,
-              range: \"Sheet1\",
-              valueInputOption: \"RAW\",
-              insertDataOption: \"INSERT_ROWS\"
-            }, {
-              range: \"Sheet1\",
-              majorDimension: \"ROWS\",
-              values: data,
-            }).then(function (response2) {
-  //            console.log(\"beefcake\", response2);
-            });
+  async function updateSignInStatus(token) {
+    await new Promise(function (resolve) {
+      gapi.load(\"client\", function () {
+        resolve(); // gapi client code now loaded
+      });
+    }).then(async function (x) {
+      gapi.client.setToken(token);
+      var discoveryDoc = await (await fetch(\"https://sheets.googleapis.com/$discovery/rest?version=v4\")).json();
+      await gapi.client.load(discoveryDoc, function () {
+        resolve(); // Spreadsheets code now loaded
+      });
+    });
+
+    await gapi.client.sheets.spreadsheets.create({
+      properties: {
+        title: #{table_name.inspect},
+      },
+      sheets: [
+        // sheet1, sheet2, sheet3
+      ]
+    }).then(function (response) {
+      sheetUrl = response.result.spreadsheetUrl;
+      spreadsheetId = response.result.spreadsheetId;
+      // sheetsLink.setAttribute(\"href\", sheetUrl);
+
+      // Get JSON data
+      var jsPath = <%= #{@_brick_model._brick_index}_path(format: :js).inspect.html_safe %>;
+      if (brickSchema) jsPath = changeout(jsPath, \"_brick_schema\", brickSchema);
+      fetch(jsPath).then(function (response) {
+        response.json().then(function (resp) {
+          // Expect the first row to have field names
+          var colHeaders = Object.keys(resp.data[0]);;
+          var ary = [colHeaders];
+          // Add all the rows
+          var row;
+          resp.data.forEach(function (row) {
+            ary.push(Object.keys(colHeaders).reduce(function(x, y) {
+              x.push(row[colHeaders[y]]); return x
+            }, []));
+          });
+          // Send to spreadsheet
+          gapi.client.sheets.spreadsheets.values.append({
+            spreadsheetId: spreadsheetId,
+            range: 'Sheet1',
+            valueInputOption: 'RAW',
+            insertDataOption: 'INSERT_ROWS',
+            values: ary
+          }).then(function (response2) {
+            // console.log('Spreadsheet created', response2);
           });
         });
       });
       window.open(sheetUrl, '_blank');
-    }
+    });
   }
 </script>
-<script async defer src=\"https://apis.google.com/js/api.js\" onload=\"gapiLoaded()\"></script>
+<script src=\"https://apis.google.com/js/api.js\"></script>
+<script async defer src=\"https://accounts.google.com/gsi/client\" onload=\"gapiLoaded()\"></script>
 "
                          end # DutyFree data export and import
 # %%% Instead of our current "for Janet Leverling (Employee)" kind of link we previously had this code that did a "where x = 123" thing:

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -695,6 +695,44 @@ In config/initializers/brick.rb appropriate entries would look something like:
       end
       [klass, sti_type, found]
     end
+
+    def apply_double_underscore_patch
+      unless @double_underscore_applied
+        # Same as normal #camelize and #underscore, just that double-underscores turn into a single underscore
+        ActiveSupport::Inflector.class_eval do
+          def camelize(term, uppercase_first_letter = true)
+            strings = term.to_s.split('__').map do |string|
+              # String#camelize takes a symbol (:upper or :lower), so here we also support :lower to keep the methods consistent.
+              if !uppercase_first_letter || uppercase_first_letter == :lower
+                string = string.sub(inflections.acronyms_camelize_regex) { |match| match.downcase! || match }
+              else
+                string = string.sub(/^[a-z\d]*/) { |match| inflections.acronyms[match] || match.capitalize! || match }
+              end
+              string.gsub!(/(?:_|(\/))([a-z\d]*)/i) do
+                word = $2
+                substituted = inflections.acronyms[word] || word.capitalize! || word
+                $1 ? "::#{substituted}" : substituted
+              end
+              string
+            end
+            strings.join('_')
+          end
+
+          def underscore(camel_cased_word)
+            return camel_cased_word.to_s unless /[A-Z-]|::/.match?(camel_cased_word)
+            regex = inflections.respond_to?(:acronyms_underscore_regex) ? inflections.acronyms_underscore_regex : inflections.acronym_regex
+            camel_cased_word.to_s.gsub('::', '/').split('_').map do |word|
+              word.gsub!(regex) { "#{$1 && '_' }#{$2.downcase}" }
+              word.gsub!(/([A-Z]+)(?=[A-Z][a-z])|([a-z\d])(?=[A-Z])/) { ($1 || $2) << '_' }
+              word.tr!('-', '_')
+              word.downcase!
+              word
+            end.join('__')
+          end
+        end
+        @double_underscore_applied = true
+      end
+    end
   end
 
   module RouteSet

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.143
+  version: 1.0.144
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-19 00:00:00.000000000 Z
+date: 2023-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord