like_query 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cc43e697e0e135f6d9b0043ba7fd3d4b545ccd8b687cd8601c1383f3843cd7b
-  data.tar.gz: f23b48306aeb5ce6500f743f5cb08694489a598472502ad9294f3aea651c3259
+  metadata.gz: 218fe9ef241c396ed43d5a0daffe4fb69fceccf534b2b15b425eca0e56cd5f0d
+  data.tar.gz: a3a37469d41c7ec574868480691dd727c61a8908ad34816c23297775b830323c
 SHA512:
-  metadata.gz: 328324be8d50940dd69e65bd2a590f8f307974163c0facf70b3ac451c3e676bc7e20bba89eeed5002cfbaf996e772d5edccca5bf00a7778dc5e72e8d9823155a
-  data.tar.gz: 78bba2733a9dc776dff1c8970019f9ffcf1d1821bae9b93006a3d12a255633fd433ccb49a47e90539e2aa5d3591eb4f9fd6e6e01cbcad90a0af0c148cfdc526e
+  metadata.gz: 134b7f5d618b4828a973de21a34250bc16cae0cfe086819cd4927a99941e4ba6cde50b1c2883feb4a63cc413333234076b15f7dfa3e8cbc81878692e04028481
+  data.tar.gz: 19ed347cd40c60819bf56d7ffdf28e6c64b183367bb5e9f11282cf8fec89450a95df0e88b623f477c2eeacb4f2c66f5877dd224e91c0235eaf9806205b088a7c

data/lib/like_query/model_extensions.rb

@@ -13,7 +13,7 @@ module LikeQuery
         raise "only one array can be given: Either schema as one array or as multiple args, not as array"
       end
 
-      queries = nil
+      queries = []
       associations = []
       @like_query_schema = schema
 
@@ -21,14 +21,17 @@ module LikeQuery
 
         f_str = format_string_element(s)
 
-        q = nil
+        q = []
 
         (schema.first.is_a?(Array) ? schema.first : schema).each do |p|
           dbg("• Iterate schema => #{p}")
           enum_lab = enum_keys(p, s)
+
           if enum_lab.present?
-            q = arel_table[p].in(enum_lab)
-            dbg(-> { "     Query from enum => #{q.to_sql}" })
+            _q = arel_table[p].in(enum_lab).to_sql
+            dbg(-> { "     Query from enum => #{_q}" })
+            q.push(_q)
+
           elsif p.is_a?(Hash)
             p.each do |k, v|
               assoc = reflect_on_association(k)
@@ -37,36 +40,38 @@ module LikeQuery
               if v.is_a?(Symbol) || v.is_a?(String)
                 _q = create_arel(v, f_str, assoc)
                 if _q.present?
-                  q = (q ? q.or(_q) : _q)
+                  q.push(_q.to_sql)
                 end
               elsif v.is_a?(Array)
                 v.each do |_v|
                   _q = create_arel(_v, f_str, assoc)
                   if _q.present?
-                    q = (q ? q.or(_q) : _q)
+                    q.push(_q.to_sql)
                   end
                 end
               else
                 raise "unknown element: #{p}"
               end
             end
+
           else
             _q = create_arel(p, f_str)
             if _q.present?
-              q = (q ? q.or(_q) : _q)
+              q.push(_q.to_sql)
             end
+
           end
 
         end
-        queries = (queries ? queries.and(q) : q)
+        queries.push("(#{q.join(' OR ')})")
       end
 
       if associations.present?
-        r = left_outer_joins(associations).where(queries)
+        r = left_outer_joins(associations).where(queries.join(" AND "))
         dbg(->{"RESULT => #{r.to_sql}"})
         r
       else
-        r = where(queries)
+        r = where(queries.join(" AND "))
         dbg(->{"RESULT => #{r.to_sql}"})
         r
       end
@@ -139,7 +144,7 @@ module LikeQuery
       if search_string[:float_from] && [:float, :decimal, :big_decimal, :integer, :bigint].include?(type)
 
         q = arel.between(search_string[:float_from]..search_string[:float_until])
-        dbg(-> { "     Query from string-field => #{q.to_sql}" })
+        dbg(-> { "     Query from number-field => #{q.to_sql}" })
         q
 
       else

data/lib/like_query/version.rb

@@ -1,3 +1,3 @@
 module LikeQuery
-  VERSION = "0.1.7"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: like_query
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - christian