query_helper 0.3.8 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8de4575667fa298b34568c0635c91d7bc056e8f69b17e7c2053a29a974dff831
-  data.tar.gz: 12b8586b7bd0b14323ea85511dede752fd03d8b0ad12d3704e905fe2f0f8fe56
+  metadata.gz: 4ad56f0d478e804e375bb1e51305dad25b306d34a0db834b5ff3f67bfc4aeab1
+  data.tar.gz: 401fd61c7e653858ce46527efa430d3ce39ad2ec81b96b245d5870bbc32eac3f
 SHA512:
-  metadata.gz: bf2ec789f7bc275fffde36f677711423279cf4746e6cdcd8c14f18d47b5c53053ec7772652b9ea23885dde9b0f63397fcab115624ceac486e004ba12edbcf16e
-  data.tar.gz: 853857f9e9937833b3199064964a54a20e2a089d786d50e5bc3775543d394e040e45b6c1fdc6ebc589f3febef515ccb1da850ac10115fe97a70bd268447ee4d0
+  metadata.gz: f8bad72d56d042dde48a2316682adb871aeba56f19e1518c4488ad0bc12b205e8157542ee1d25fe76bd9c6df27a3f2a1a1e44449f248b2d4891f6d0017899d90
+  data.tar.gz: de8c9f4e1f22bc806c9857dfba844350c3ec65ff62bc7be19ad21aa1f53d2204285b1fe571289e54866850f88b68dc1615e8b2708bd8e113a14985162f948921

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    query_helper (0.3.8)
+    query_helper (0.4.0)
       activerecord (> 5)
       activesupport (> 5)
       sqlite3
@@ -89,7 +89,7 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.10.2)
-    sqlite3 (2.1.0)
+    sqlite3 (1.6.4)
       mini_portile2 (~> 2.8.0)
     thor (1.1.0)
     tzinfo (2.0.4)

data/lib/query_helper/sql_filter.rb

@@ -17,7 +17,7 @@ class QueryHelper
 
       @filter_values.each do |comparate_alias, criteria|
         # Find the sql mapping if it exists
-        map = @column_maps.find { |m| m.alias_name.downcase == comparate_alias.downcase }
+        map = @column_maps.find { |m| m.alias_name == comparate_alias }
         raise InvalidQueryError.new("cannot filter by #{comparate_alias}") unless map
 
         # create the filter

data/lib/query_helper/sql_parser.rb

@@ -18,7 +18,9 @@ class QueryHelper
 
     def remove_comments
       # Remove SQL inline comments (/* */) and line comments (--)
-      @sql = @sql.gsub(/\/\*(.*?)\*\//, '').gsub(/--(.*)$/, '')
+      @sql = @sql.gsub(%r{/\*[^/]*?\*/}m, '')  # Removes multi-line comments (/* ... */)
+              .gsub(/--[^\n]*/, '')            # Removes single-line comments (--)
+
       @sql.squish!
     end
 
@@ -186,7 +188,7 @@ class QueryHelper
         ColumnMap.new(
           alias_name: sql_alias,
           sql_expression: sql_expression.squish,
-          aggregate: /(array_agg|avg|bit_and|bit_or|bool_and|bool_or|boolor_agg|booland_agg|count|every|json_agg|jsonb_agg|json_object_agg|jsonb_object_agg|max|min|string_agg|sum|xmlagg)\((.*)\)/.match?(sql_expression)
+          aggregate: /\b(array_agg|avg|bit_and|bit_or|bool_and|bool_or|boolor_agg|booland_agg|count|every|json_agg|jsonb_agg|json_object_agg|jsonb_object_agg|max|min|string_agg|sum|xmlagg)\((.*)\)/.match?(sql_expression)
         ) if sql_alias
       end
       column_maps.compact

data/lib/query_helper/sql_sort.rb

@@ -34,9 +34,7 @@ class QueryHelper
           direction = sort.split(":")[1]
           modifier = sort.split(":")[2]
           begin
-            sort_col = @column_maps.find{ |m| m.alias_name.casecmp?(sort_alias) }
-            raise InvalidSortParamError.new("Invalid sort param", sort_alias) if sort_col.nil?
-            sql_expression = sort_col.sql_expression
+            sql_expression = @column_maps.find{ |m| m.alias_name.casecmp?(sort_alias) }.sql_expression
           rescue NoMethodError => e
             raise InvalidQueryError.new("Sorting not allowed on column '#{sort_alias}'")
           end

data/lib/query_helper/version.rb

@@ -1,3 +1,3 @@
 class QueryHelper
-  VERSION = "0.3.8"
+  VERSION = "0.4.0"
 end

data/lib/query_helper.rb

@@ -10,7 +10,6 @@ require "query_helper/sql_manipulator"
 require "query_helper/sql_filter"
 require "query_helper/sql_sort"
 require "query_helper/invalid_query_error"
-require "query_helper/invalid_sort_param_error"
 
 class QueryHelper
 
@@ -281,8 +280,12 @@ class QueryHelper
       raise ArgumentError.new("search_fields not defined") unless @search_fields.length > 0
       placement = :where
       maps = column_maps.select do |cm|
-        placement = :having if cm.aggregate
-        @search_fields.map(&:downcase).include? cm.alias_name.downcase
+        if @search_fields.include? cm.alias_name
+          placement = :having if cm.aggregate
+          true
+        else
+          false
+        end
       end
       bind_variable = ('a'..'z').to_a.shuffle[0,20].join.to_sym
       @bind_variables[bind_variable] = "%#{@search_string}%"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: query_helper
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.0
 platform: ruby
 authors:
 - Patterninc
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-27 00:00:00.000000000 Z
+date: 2024-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -190,7 +190,6 @@ files:
 - lib/query_helper/column_map.rb
 - lib/query_helper/filter.rb
 - lib/query_helper/invalid_query_error.rb
-- lib/query_helper/invalid_sort_param_error.rb
 - lib/query_helper/query_helper_concern.rb
 - lib/query_helper/sql_filter.rb
 - lib/query_helper/sql_manipulator.rb
@@ -217,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Ruby Gem to help with pagination and data formatting at Pattern, Inc.

data/lib/query_helper/invalid_sort_param_error.rb

@@ -1,18 +0,0 @@
-class QueryHelper
-  class InvalidSortParamError < StandardError
-
-    attr_reader :sort_string
-
-    def initialize(msg='Invalid sort param', sort_string='')
-      @sort_string = sort_string
-      super(msg)
-    end
-    
-    def as_json
-      {
-        'error' => message,
-        'sort_param' => sort_string
-      }
-    end
-  end
-end