noiseless 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b661712a5930c3da3a455f6e70c2d99cfbc424cf4e007c58abd587ab170854f
-  data.tar.gz: 547b60b50d5efb9b32da878523d96d5a58c5a7a645ab8bed13ebec40269370b7
+  metadata.gz: 3a2305879802aa874c213e1a5a87707ec7222af979d21834f21f4fd2c994cb48
+  data.tar.gz: 065cf12ecb097ac17ee1e33d99d5df0ccb79ca4ea6713640f82f6bcac2fad51a
 SHA512:
-  metadata.gz: 17a625f20fb2c879f427d429c82ecb4b9c2b338ffec03bd69de83ee9c2b800800c57eaef0bb6f4d2e32876e91497c5b12bdf389a2f1edcb055bc228764b03473
-  data.tar.gz: 4799c4ba712b8d097b30553ac800caa798349d70c0ecbc7ca901b3f54752a9ed48ce2fcb4d3784d76117c0b7598801efc6f9e3685c5c945e34639740970a8d2e
+  metadata.gz: dc5302df3e73a9a413e1a7382db1334e11dd28ee2564bb5ae9e0f5d6a2d62f7b241584463678ef6f0db6112740c70d5687fdc425903979056c9d61ff10140bc6
+  data.tar.gz: baba1a26426413fef74f6f900d3146aa9c7bcda385030dd3b722e8277c5dc5b8a25bb79adbf6dc9d0c695e4d3b43e4353e4fe99e3bffb7ec5fc5a0d18ff566cf

data/lib/noiseless/adapters/execution_modules/postgresql_execution.rb

@@ -169,11 +169,11 @@ module Noiseless
                     when AST::MultiMatch
                       apply_multi_match(scope, node, model)
                     when AST::Wildcard
-                      apply_wildcard(scope, node)
+                      apply_wildcard(scope, node, model)
                     when AST::Range
-                      apply_range(scope, node)
+                      apply_range(scope, node, model)
                     when AST::Prefix
-                      apply_prefix(scope, node)
+                      apply_prefix(scope, node, model)
                     else
                       scope
                     end
@@ -190,11 +190,12 @@ module Noiseless
           # cannot be satisfied here; fail closed rather than matching everything.
           return scope.none unless column?(model, field)
 
-          # Use pg_trgm similarity for fuzzy matching with unaccent
+          # Use pg_trgm similarity for fuzzy matching, accent-insensitive when
+          # the unaccent extension is present.
           if trgm_available? && text_column?(model, field)
             scope.where(
-              "unaccent(#{quoted_column(field)}) % unaccent(?) OR " \
-              "unaccent(#{quoted_column(field)}) ILIKE unaccent(?)",
+              "#{fuzzy_column(field)} % #{fuzzy_param} OR " \
+              "#{fuzzy_column(field)} ILIKE #{fuzzy_param}",
               value,
               "%#{sanitize_like(value)}%"
             )
@@ -213,8 +214,8 @@ module Noiseless
 
           conditions = fields.map do |field|
             if trgm_available? && text_column?(model, field)
-              "(unaccent(#{quoted_column(field)}) % unaccent(?) OR " \
-                "unaccent(#{quoted_column(field)}) ILIKE unaccent(?))"
+              "(#{fuzzy_column(field)} % #{fuzzy_param} OR " \
+                "#{fuzzy_column(field)} ILIKE #{fuzzy_param})"
             else
               "#{quoted_column(field)} ILIKE ?"
             end
@@ -231,15 +232,19 @@ module Noiseless
           scope.where(conditions.join(" OR "), *params)
         end
 
-        def apply_wildcard(scope, node)
+        def apply_wildcard(scope, node, model = nil)
           field = node.field.to_s
+          return scope.none if model && !column?(model, field)
+
           # Convert OpenSearch wildcards to SQL: * -> %, ? -> _
           pattern = node.value.to_s.tr("*", "%").tr("?", "_")
 
           scope.where("#{quoted_column(field)} ILIKE ?", pattern)
         end
 
-        def apply_range(scope, node)
+        def apply_range(scope, node, model = nil)
+          return scope.none if model && !column?(model, node.field.to_s)
+
           field = quoted_column(node.field.to_s)
 
           scope = scope.where("#{field} >= ?", node.gte) if node.gte
@@ -250,7 +255,9 @@ module Noiseless
           scope
         end
 
-        def apply_prefix(scope, node)
+        def apply_prefix(scope, node, model = nil)
+          return scope.none if model && !column?(model, node.field.to_s)
+
           scope.where("#{quoted_column(node.field.to_s)} ILIKE ?", "#{sanitize_like(node.value)}%")
         end
 
@@ -266,6 +273,8 @@ module Noiseless
                       # A filter on a mapping-only field cannot be enforced;
                       # silently dropping it would broaden results, so fail closed.
                       scope.none
+                    elsif model && array_column?(model, node.field.to_s)
+                      apply_array_filter(scope, node.field.to_s, value, model)
                     else
                       scope.where(node.field => value)
                     end
@@ -274,6 +283,13 @@ module Noiseless
           scope
         end
 
+        def apply_array_filter(scope, field, value, model)
+          cast = "#{model.columns_hash[field].sql_type.sub(/\[\]\z/, '')}[]"
+          operator = value.is_a?(Array) ? "&&" : "@>"
+
+          scope.where("#{quoted_column(field)} #{operator} ARRAY[?]::#{cast}", value)
+        end
+
         def apply_geo_filter(scope, node)
           # Requires PostGIS
           geo_config = node.value[:geo_distance]
@@ -297,17 +313,20 @@ module Noiseless
         end
 
         def apply_sorting(scope, sort_nodes, model = nil)
-          return scope if sort_nodes.empty?
-
+          sorted_fields = []
           order_clauses = sort_nodes.filter_map do |node|
             field = node.field.to_s
             # Sorting on a mapping-only field is cosmetic — drop it instead of
             # erroring the whole query.
             next if model && !column?(model, field)
 
+            sorted_fields << field
             direction = node.direction.to_s.upcase == "DESC" ? "DESC" : "ASC"
             "#{quoted_column(field)} #{direction}"
           end
+
+          primary_key = model.respond_to?(:primary_key) ? model.primary_key : nil
+          order_clauses << "#{quoted_column(primary_key)} ASC" if primary_key && !sorted_fields.include?(primary_key.to_s)
           return scope if order_clauses.empty?
 
           scope.order(Arel.sql(order_clauses.join(", ")))
@@ -415,6 +434,18 @@ module Noiseless
           column && %i[string text citext].include?(column.type) && !column.array
         end
 
+        def array_column?(model, field)
+          model.columns_hash[field.to_s]&.array
+        end
+
+        def fuzzy_column(field)
+          unaccent_available? ? "unaccent(#{quoted_column(field)})" : quoted_column(field)
+        end
+
+        def fuzzy_param
+          unaccent_available? ? "unaccent(?)" : "?"
+        end
+
         def quoted_column(field)
           ActiveRecord::Base.connection.quote_column_name(field)
         end

data/lib/noiseless/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Noiseless
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: noiseless
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Abdelkader Boudih