like_query 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dd78d6cee1f2c1de9f98dca1ba3fecc9a6d4fca67b705a98c0a7d76e0bf05a4
-  data.tar.gz: f785e5341d8c8e397a858af100c67e27c0e25551c181cf13e5b8d146da42f47c
+  metadata.gz: 2244376c37da7206ec259ae99b3ce2e42588141cc6b45251cff9baec1d118882
+  data.tar.gz: 6d8c20860daa488b5c70a87c6b751cadf7bd668062df0039cf859ba93d720c0d
 SHA512:
-  metadata.gz: 04732f1e9d3177ea44ae7cff882007ea53ce893c349cd22d4ce7ad2301759eed886697ea20cc5b23c8a127ac081c089cab27acc97c5214330b9f18444cd81b70
-  data.tar.gz: 3e60c6de1f037a4c371227f6cf622e8e15029dfe1780ae5ecd58554d8bfed31ac9404fd6edcfdc578f7daf20849a48ccd92be2bac4202e78093dfd37a0620c53
+  metadata.gz: 2bf07d4bbe541b83cb78aad5ca59107d19d8269ab89bfed4b495bdfa13ef020ad3d016740a8a07f5e6dfcfad066cc60811b8806754718ad867110894354da4ce
+  data.tar.gz: a235b679dcb95c7a90302e67aeb9c16b599e42696387573e09a3a73ad1168d0ad29c349223e943e3a32ae2f95fc63449de9afa0cf96d100f1ebb82f31e10c551

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,15 +21,16 @@ 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|
@@ -37,16 +38,10 @@ module LikeQuery
               raise "Unknown association: :#{k}" unless assoc.present?
               associations.push(k.to_sym) unless associations.include?(k.to_sym)
               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)
-                end
+                q.push(query_string(v, f_str, assoc))
               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)
-                  end
+                  q.push(query_string(_v, f_str, assoc))
                 end
               else
                 raise "unknown element: #{p}"
@@ -54,23 +49,20 @@ module LikeQuery
             end
 
           else
-            _q = create_arel(p, f_str)
-            if _q.present?
-              q = (q ? q.or(_q) : _q)
-            end
+            q.push(query_string(p, f_str))
 
           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
@@ -130,7 +122,7 @@ module LikeQuery
       res
     end
 
-    def create_arel(schema_column, search_string, association = nil)
+    def query_string(schema_column, search_string, association = nil)
 
       base_object = association&.klass || self
       begin
@@ -142,14 +134,14 @@ 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 number-field => #{q.to_sql}" })
+        q = arel.between(search_string[:float_from]..search_string[:float_until]).to_sql
+        dbg("     Query from number-field => #{q}")
         q
 
       else
 
-        q = arel.matches(search_string[:string])
-        dbg(-> { "     Query from string-field => #{q.to_sql}" })
+        q = arel.matches(search_string[:string]).to_sql
+        dbg("     Query from string-field => #{q}")
         q
 
       end

data/lib/like_query/version.rb

@@ -1,3 +1,3 @@
 module LikeQuery
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
 end

metadata

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