kasket 4.9.0 → 4.10.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1399453146b7dcf0974eb42a7b80375291b2978415269d686ff66ccb77b9f53
-  data.tar.gz: 4649d5f06595e558f859472439733208e62229841901bf9dc81b602c3f78e07e
+  metadata.gz: 39357427624d53e3972b2ab60f4dfda45f419a882453c10d2546817d4f5a374f
+  data.tar.gz: cd5deb43db9eeb51c5be9123eb6700d4d9017b16618f4159852b87be07edbe79
 SHA512:
-  metadata.gz: 7a6eeea3f1cdfe9bb349379cb07f4d13a21bfa0867ed09e9795746d91f74a69349ee15eb83d76e6f4776a717d8d4f2b8ce1479d41a095ac2e275502e3b54c99c
-  data.tar.gz: fd34ac51846f1748a47cf0de7b2c5f27ef843abe93429285e3830a8a8c3afb53822f7eab19452af3df5c99483323e1c0d9fd2a727ddda535626e58408a5a28e1
+  metadata.gz: a6770fe5254dda71afa96fcb68205ddfae271418d63212405cf1cf8dfb8585871b417a7709908bc4603b48875d24eb9de6c5acaa414e914fd01ee23fabc1f099
+  data.tar.gz: 5d41b9265957ea8c68441381c14db2046a85bd61c55a8203dc694483be8b3fc504e8ff0e000c23e7eea53915f1d05da62f0a983d4ae7707d82ba7776ebc9614a

data/README.md

@@ -1,4 +1,4 @@
-# Kasket [![Build status](https://circleci.com/gh/zendesk/kasket.svg?style=svg)](https://circleci.com/gh/zendesk/kasket)
+# Kasket
 
 ### Puts a cap on your queries
 A caching layer for ActiveRecord (3.x and 4.x)

data/lib/kasket/query_parser.rb

@@ -12,26 +12,43 @@ module Kasket
     def initialize(model_class)
       @model_class = model_class
 
-      @supported_query_pattern = /^select\s+((?:`|")#{@model_class.table_name}(?:`|")\.)?\* from (?:`|")#{@model_class.table_name}(?:`|") where (.*?)(|\s+limit 1)\s*$/i
+      @supported_query_pattern = /^select\s+(.+?)\s+from (?:`|")#{@model_class.table_name}(?:`|") where (.*?)(|\s+limit 1)\s*$/i
 
+      @star_pattern = /^((`|")#{@model_class.table_name}\2\.)?\*$/
       # Matches: `users`.id, `users`.`id`, users.id, id
       @table_and_column_pattern = /(?:(?:`|")?#{@model_class.table_name}(?:`|")?\.)?(?:`|")?([a-zA-Z]\w*)(?:`|")?/
       # Matches: KEY = VALUE, (KEY = VALUE), ()(KEY = VALUE))
       @key_eq_value_pattern = /^[\(\s]*#{@table_and_column_pattern}\s+(=|IN)\s+#{VALUE}[\)\s]*$/
     end
 
+    ##
+    # Parses a SQL query to produce a kasket query
+    #
+    # @param sql [String] the sql query to parse
+    # @return [Hash|nil] the kasket query, or nil if the sql query is not supported
     def parse(sql)
       if match = @supported_query_pattern.match(sql)
+        select = match[1]
+        unless @star_pattern.match? select
+          # If we're not selecting all columns using star, then ensure all columns are selected explicitly
+          select_columns = select.split(/\s*,\s*/).map do |s|
+            break unless column_match = @table_and_column_pattern.match(s)
+
+            column_match[1]
+          end.uniq
+          columns = @model_class.column_names
+          return unless columns.size == select_columns.size && (columns - select_columns).empty?
+        end
         where = match[2]
         limit = match[3]
 
         query = {}
         query[:attributes] = sorted_attribute_value_pairs(where)
-        return nil if query[:attributes].nil?
+        return if query[:attributes].nil?
 
-        if query[:attributes].size > 1 && query[:attributes].map(&:last).any? {|a| a.is_a?(Array)}
+        if query[:attributes].size > 1 && query[:attributes].map(&:last).any?(Array)
           # this is a query with IN conditions AND other conditions
-          return nil
+          return
         end
 
         query[:index] = query[:attributes].map(&:first)

data/lib/kasket/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Kasket
-  VERSION = '4.9.0'
+  VERSION = '4.10.2.1'
   class Version
     MAJOR = Kasket::VERSION.split('.')[0]
     MINOR = Kasket::VERSION.split('.')[1]

data/lib/kasket/visitor.rb

@@ -52,11 +52,18 @@ module Kasket
       return :unsupported if ActiveRecord::VERSION::MAJOR < 5 ? node.having : node.havings.present?
       return :unsupported if node.set_quantifier
       return :unsupported if !node.source || node.source.empty?
-      return :unsupported if node.projections.size != 1
+      return :unsupported if node.projections.empty?
 
       select = node.projections[0]
       select = select.name if select.respond_to?(:name)
-      return :unsupported if select != '*'
+      if select != '*'
+        # If we're not selecting all columns using star, then ensure all columns are selected explicitly
+        column_names = @model_class.column_names
+        return :unsupported unless node.projections.size == column_names.size
+
+        projection_names = node.projections.map { |p| p.name if p.respond_to?(:name) }.compact
+        return unless (column_names - projection_names).empty?
+      end
 
       parts = [visit(node.source)]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kasket
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 4.10.2.1
 platform: ruby
 authors:
 - Mick Staugaard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-19 00:00:00.000000000 Z
+date: 2022-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -31,118 +31,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
-- !ruby/object:Gem::Dependency
-  name: bump
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest-rg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: wwtd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: puts a cap on your queries
 email:
 - mick@zendesk.com
@@ -180,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: A write back caching layer on active record