kasket 1.0.1 → 1.0.2

data/lib/kasket.rb

@@ -14,7 +14,7 @@ module Kasket
   class Version
     MAJOR = 1
     MINOR = 0
-    PATCH = 1
+    PATCH = 2
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 

data/lib/kasket/query_parser.rb

@@ -21,6 +21,12 @@ module Kasket
         query = Hash.new
         query[:attributes] = sorted_attribute_value_pairs(match[1])
         return nil if query[:attributes].nil?
+
+        if query[:attributes].size > 1 && query[:attributes].map(&:last).any? {|a| a.is_a?(Array)}
+          # this is a query with IN conditions AND other conditions
+          return nil
+        end
+
         query[:index] = query[:attributes].map(&:first)
         query[:limit] = match[2].blank? ? nil : 1
         query[:key] = @model_class.kasket_key_for(query[:attributes])

data/test/parser_test.rb

@@ -8,6 +8,11 @@ class ParserTest < ActiveSupport::TestCase
       @parser = Kasket::QueryParser.new(Post)
     end
 
+    should 'not support IN queries in combination with other conditions' do
+      parsed_query = @parser.parse('SELECT * FROM `posts` WHERE (`posts`.`id` IN (1,2,3) AND `posts`.`is_active` = 1)')
+      assert(!parsed_query)
+    end
+
     should "extract conditions" do
       assert_equal [[:blog_id, "big"], [:title, "red"]], @parser.parse('SELECT * FROM `posts` WHERE (`posts`.`title` = red AND `posts`.`blog_id` = big)')[:attributes]
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kasket
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Mick Staugaard
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 -07:00
+date: 2011-07-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency