query_helper 0.2.18 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66a48754e9a1e5fcf794039299fc18c477bdda5cc334e09988e24a73cd5dc0b7
-  data.tar.gz: 2f1aa69978a6b1ccffca16f82b7617e32bbb5e819460782ae566de439a694043
+  metadata.gz: c3bc15fea354655ec8dc8ab74e84849104d7f13e8f0dfc064d7210d75642ae60
+  data.tar.gz: cdb0d638c3afc722e19816d136a1a27f5716e1d06bc838eeea481d6995438f7c
 SHA512:
-  metadata.gz: 0b09be775d91bb839e8c15da2d166bc33ac6bbb1ed46b00f2bd6a52962d06999383797776411c26e86a28e082221fdb37f28562aa0d8d28f91087bf3971ab6f7
-  data.tar.gz: 77ec774a1a2a49b4ac90deb066321488ee7a4a2884bc149107b664a54eb31a955d109eeef9ce6c8a22b61afd66ffc06889382d50db8081e69b1b1432c6aa28b9
+  metadata.gz: 4ce4101f690100aabd91841e8866daa1bffc728d5b741739707dc28bdb220dc2851974fb468d11ad5c681d5aa3315c49e93e3de7b197046e4badfd8bdb339866
+  data.tar.gz: 65aaa2d1e2d37ae994968728df34027cd846ff4e38c6c25771c64c90bffde48d799fb70ddffdadbee7b6a7584055e2ba8a43a32155a2aff1e2e0c6311c98261d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    query_helper (0.2.18)
+    query_helper (0.2.19)
       activerecord (> 5)
       activesupport (> 5)
 

data/lib/query_helper.rb

@@ -80,13 +80,13 @@ class QueryHelper
     @as_json_options = as_json_options if as_json_options
     @custom_mappings = custom_mappings if custom_mappings
     @preload = preload if preload
-    @search_fields = search_fields if search_fields 
-    @sql_filter = sql_filter if sql_filter 
-    @sql_sort = sql_sort if sql_sort 
-    @search_string = search_string if search_string 
+    @search_fields = search_fields if search_fields
+    @sql_filter = sql_filter if sql_filter
+    @sql_sort = sql_sort if sql_sort
+    @search_string = search_string if search_string
     @page = determine_page(page: page, per_page: per_page) if page
     @per_page = determine_per_page(page: page, per_page: per_page) if per_page
-    @metadata = metadata if metadata 
+    @metadata = metadata if metadata
     set_limit_and_offset()
     return self
   end
@@ -116,21 +116,21 @@ class QueryHelper
     @sql_filter.create_filters()
 
     having_clauses = @sql_filter.having_clauses
-    where_clauses = @sql_filter.where_clauses 
-    
+    where_clauses = @sql_filter.where_clauses
+
     if @search_string
       search_filter = search_filter(column_maps)
       if search_filter[:placement] == :where
         where_clauses << search_filter[:filter]
-      else 
+      else
         having_clauses << search_filter[:filter]
       end
-    end 
+    end
 
 
     # merge the filter bind variables into the query bind variables
     @bind_variables.merge!(@sql_filter.bind_variables)
-    
+
     # Execute Sql Query
     manipulator = SqlManipulator.new(
       sql: @query,
@@ -152,7 +152,7 @@ class QueryHelper
     return query if @bind_variables.length == 0
     begin
       return @model.sanitize_sql_array([query, @bind_variables])
-    rescue NoMethodError 
+    rescue NoMethodError
       # sanitize_sql_array is a protected method before Rails v5.2.3
       return @model.send(:sanitize_sql_array, [query, @bind_variables])
     end
@@ -181,8 +181,8 @@ class QueryHelper
 
   def pagination_results(count=@count)
     # Set pagination params if they aren't provided
-    results_per_page = @per_page || count 
-    results_page = @page || 1 
+    results_per_page = @per_page || count
+    results_page = @page || 1
 
     total_pages = (count.to_i/(results_per_page.nonzero? || 1).to_f).ceil
     next_page = results_page + 1 if results_page.between?(1, total_pages - 1)
@@ -205,16 +205,16 @@ class QueryHelper
   private
 
     def determine_page(page:, per_page:)
-      return page.to_i if page 
-      return 1 if !page && per_page 
+      return page.to_i if page
+      return 1 if !page && per_page
       return nil
-    end 
+    end
 
     def determine_per_page(page:, per_page:)
-      return per_page.to_i if per_page 
-      return 100 if !per_page && page 
+      return per_page.to_i if per_page
+      return 100 if !per_page && page
       return nil
-    end 
+    end
 
     def set_limit_and_offset
       if @page && @per_page
@@ -226,7 +226,7 @@ class QueryHelper
         @bind_variables[:limit] = limit
         @bind_variables[:offset] = offset
       end
-    end 
+    end
 
     def paginated_results
       { pagination: pagination_results(),
@@ -273,16 +273,16 @@ class QueryHelper
     def search_filter(column_maps)
       raise ArgumentError.new("search_fields not defined") unless @search_fields.length > 0
       placement = :where
-      maps = column_maps.select do |cm| 
+      maps = column_maps.select do |cm|
         placement = :having if cm.aggregate
         @search_fields.include? cm.alias_name
-      end 
+      end
       bind_variable = ('a'..'z').to_a.shuffle[0,20].join.to_sym
       @bind_variables[bind_variable] = "%#{@search_string}%"
-      filter = "#{maps.map{|m| "#{m.sql_expression}::varchar"}.join(" || ")} ilike :#{bind_variable}"
+      filter = "#{maps.map{|m| "coalesce(#{m.sql_expression}::varchar, '')"}.join(" || ")} ilike :#{bind_variable}"
       return {
         filter: filter,
         placement: placement
       }
-    end 
+    end
 end

data/lib/query_helper/column_map.rb

@@ -13,7 +13,7 @@ class QueryHelper
 
       model.attribute_names.each do |attribute|
         if maps.select{|x| x.alias_name == attribute}.empty?
-          maps << ColumnMap.new(alias_name: attribute, sql_expression: "#{model.to_s.underscore.pluralize}.#{attribute}")
+          maps << ColumnMap.new(alias_name: attribute, sql_expression: "#{model.table_name.pluralize}.#{attribute}")
         end
       end
 

data/lib/query_helper/version.rb

@@ -1,3 +1,3 @@
 class QueryHelper
-  VERSION = "0.2.18"
+  VERSION = "0.2.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: query_helper
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors:
 - Evan McDaniel
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -199,7 +199,7 @@ homepage: https://github.com/iserve-products/query_helper
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ruby Gem to help with pagination and data formatting at Pattern, Inc.
 test_files: []