ahoy_matey 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fb8aecda5242614f518d06dbdc9449305f0ed30677d667e01eb1edefc627bc7
-  data.tar.gz: 8f52fbe0bab0a0ac1c5722b06f342add3d31c0c441230b77f03ae566e07f746b
+  metadata.gz: cea71919e25f8f3b9ce9f3ccea43f8d11ec29d1995b3c5078428a8d4a7948457
+  data.tar.gz: 81316ad1b9fc956bf0ece8c23c63570d5f333e0f7c781406e1b2214e965feebb
 SHA512:
-  metadata.gz: '059927d7fe2344882860ae81ff23e142a09ed955da818da8d3e679b03173b39e64ffc611e4e682a912901678cd9b790b461805f788c423cd2b4331c2a340c226'
-  data.tar.gz: f2d53c35500ee4d30485cfbf6c5d444cbf03c50cec4762783a972411343e19b8baf53b61286cc4aa78bbbe98a69df21da701989422263780447341fdce756db0
+  metadata.gz: c52e5f32c8fd7f9d070867e8d53868a58365430ed6d7bfa3baa1dd826f042875d42fadddc7991bf5c1c0b836021dd1b2634e8c2e43fa88a055dff9b8aeae70e5
+  data.tar.gz: e3cdb04028a3277f678f65bf713d3a93339be369d4ed8af73a87bddd549b2ffd7983abd91443858e4411459442b8e292612381ea3ff731ce53d8f0b50f995857

data/CHANGELOG.md

@@ -1,6 +1,12 @@
+## 4.0.1 (2021-08-18)
+
+- Added support for `where_event`, `where_props`, and `where_group` for SQLite
+- Fixed results with `where_event`
+- Fixed results with `where_props` and `where_group` when used with other scopes
+
 ## 4.0.0 (2021-08-14)
 
-- Disabled geocoding by default
+- Disabled geocoding by default (this was already the case for new installations with 3.2.0+)
 - Made the `geocoder` gem an optional dependency
 - Updated Ahoy.js to 0.4.0
 - Updated API to return 400 status code when missing required parameters

data/lib/ahoy/query_methods.rb

@@ -8,7 +8,9 @@ module Ahoy
       end
 
       def where_props(properties)
-        relation = self
+        return all if properties.empty?
+
+        relation = all
         if respond_to?(:columns_hash)
           column_type = columns_hash["properties"].type
           adapter_name = connection.adapter_name.downcase
@@ -17,18 +19,9 @@ module Ahoy
         end
         case adapter_name
         when "mongoid"
-          relation = where(Hash[properties.map { |k, v| ["properties.#{k}", v] }])
+          relation = where(properties.to_h { |k, v| ["properties.#{k}", v] })
         when /mysql/
-          column = column_type == :json || connection.try(:mariadb?) ? "properties" : "CAST(properties AS JSON)"
-          properties.each do |k, v|
-            if v.nil?
-              v = "null"
-            elsif v == true
-              v = "true"
-            end
-
-            relation = relation.where("JSON_UNQUOTE(JSON_EXTRACT(#{column}, ?)) = ?", "$.#{k}", v.as_json)
-          end
+          relation = relation.where("JSON_CONTAINS(properties, ?, '$') = 1", properties.to_json)
         when /postgres|postgis/
           case column_type
           when :jsonb
@@ -45,6 +38,15 @@ module Ahoy
           else
             relation = relation.where("properties::jsonb @> ?", properties.to_json)
           end
+        when /sqlite/
+          properties.each do |k, v|
+            relation =
+              if v.nil?
+                relation.where("JSON_EXTRACT(properties, ?) IS NULL", "$.#{k}")
+              else
+                relation.where("JSON_EXTRACT(properties, ?) = ?", "$.#{k}", v.as_json)
+              end
+          end
         else
           raise "Adapter not supported: #{adapter_name}"
         end
@@ -56,7 +58,7 @@ module Ahoy
         # like with group
         props.flatten!
 
-        relation = self
+        relation = all
         if respond_to?(:columns_hash)
           column_type = columns_hash["properties"].type
           adapter_name = connection.adapter_name.downcase
@@ -67,10 +69,9 @@ module Ahoy
         when "mongoid"
           raise "Adapter not supported: #{adapter_name}"
         when /mysql/
-          column = column_type == :json || connection.try(:mariadb?) ? "properties" : "CAST(properties AS JSON)"
           props.each do |prop|
             quoted_prop = connection.quote("$.#{prop}")
-            relation = relation.group("JSON_UNQUOTE(JSON_EXTRACT(#{column}, #{quoted_prop}))")
+            relation = relation.group("JSON_UNQUOTE(JSON_EXTRACT(properties, #{quoted_prop}))")
           end
         when /postgres|postgis/
           # convert to jsonb to fix
@@ -82,6 +83,11 @@ module Ahoy
             quoted_prop = connection.quote(prop)
             relation = relation.group("properties#{cast} -> #{quoted_prop}")
           end
+        when /sqlite/
+          props.each do |prop|
+            quoted_prop = connection.quote("$.#{prop}")
+            relation = relation.group("JSON_EXTRACT(properties, #{quoted_prop})")
+          end
         else
           raise "Adapter not supported: #{adapter_name}"
         end

data/lib/ahoy/version.rb

@@ -1,3 +1,3 @@
 module Ahoy
-  VERSION = "4.0.0"
+  VERSION = "4.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_matey
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-14 00:00:00.000000000 Z
+date: 2021-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport