kasket 2.2.0 → 2.2.1

data/lib/kasket/query_parser.rb

@@ -23,10 +23,13 @@ module Kasket
     def parse(sql)
       if match = @supported_query_pattern.match(sql)
         where, limit = match[1], match[2]
-        if AR30 && where =~ /limit \d+\s*$/i
-          # limit is harder to find in rails 3.0 since where does not use surrounding braces
-          return unless where =~ /(.*?)(\s+limit 1)\s*$/i
-          where, limit = $1, $2
+        if AR30
+          return if where =~ / (order by|group by|join|having) /i
+          if where =~ /limit \d+\s*$/i
+            # limit is harder to find in rails 3.0 since where does not use surrounding braces
+            return unless where =~ /(.*?)(\s+limit 1)\s*$/i
+            where, limit = $1, $2
+          end
         end
 
         query = Hash.new

data/lib/kasket/version.rb

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

data/test/parser_test.rb

@@ -34,6 +34,10 @@ class ParserTest < ActiveSupport::TestCase
       assert !parse(:conditions => "(0 = 1)")
     end
 
+    should "not support :order" do
+      assert !parse(:conditions => "id = 1", :order => "xxx")
+    end
+
     should 'not support IN queries in combination with other conditions' do
       assert !parse(:conditions => {:id => [1,2,3], :is_active => true})
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kasket
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -183,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3681071488185082983
+      hash: -3400740618265195569
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3681071488185082983
+      hash: -3400740618265195569
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24