querybuilder 1.1.0 → 1.1.1

data/History.txt

@@ -1,3 +1,8 @@
+== 1.1.1 2012-06-27
+
+* Major enhancements
+  * Fixed bug with default scope (should only be applied on last context).
+
 == 1.1.0 2011-11-01
 
 * Major enhancements

data/lib/query_builder/info.rb

@@ -1,3 +1,3 @@
 module QueryBuilder
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/lib/query_builder/processor.rb

@@ -202,6 +202,15 @@ module QueryBuilder
       def default(key)
         @default[key] || self.class.defaults[key]
       end
+      
+      # The passed :default scope is only applied on last context.
+      def default_scope(context)
+        if context[:last]
+          default(:scope)
+        else
+          self.class.defaults[:scope]
+        end
+      end
 
       def process(sxp)
         return sxp if sxp.kind_of?(String)
@@ -800,7 +809,7 @@ module QueryBuilder
             context[:scope_type] = nil
             # post scope
             @query.add_table(use_name, table_name, avoid_alias)
-            apply_scope(context[:scope] || default(:scope))
+            apply_scope(context[:scope] || default_scope(context))
           else
             # scope already applied / skip
             @query.add_table(use_name, table_name, avoid_alias)

data/querybuilder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{querybuilder}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2011-11-01}
+  s.date = %q{2012-06-27}
   s.description = %q{QueryBuilder is an interpreter for the "pseudo sql" language. This language
     can be used for two purposes:
 

data/test/mock/dummy_processor.rb

@@ -90,6 +90,9 @@ class DummyProcessor < QueryBuilder::Processor
     when 'coalesce'
       args = [arg] + args.map{|a| process(a)}
       "COALESCE(#{args.join(',')})"
+    when 'min'
+      args = [arg] + args.map{|a| process(a)}
+      "MIN(#{args.join(',')})"
     else
       super
     end

data/test/querybuilder/basic.yml

@@ -100,3 +100,8 @@ function_with_multiple_args:
   src: "objects where name.coalesce(id,'foo') = 'foo'"
   sxp: '[:query, [:filter, [:relation, "objects"], [:"=", [:function, [:field, "name"], [:method, "coalesce"], [:field, "id"], [:string, "foo"]], [:string, "foo"]]]]'
   res: "[%Q{SELECT objects.* FROM objects WHERE COALESCE(objects.name,objects.id,'foo') = 'foo' AND objects.parent_id = ?}, id]"
+
+function_in_order:
+  src: "objects order by event_at.coalesce(0)"
+  sxp: '[:query, [:order, [:relation, "objects"], [:function, [:field, "event_at"], [:method, "coalesce"], [:integer, "0"]]]]'
+  res: "[%Q{SELECT objects.* FROM objects WHERE objects.parent_id = ? ORDER BY COALESCE(objects.event_at,0)}, id]"

data/test/querybuilder/filters.yml

@@ -138,6 +138,11 @@ functions:
   sxp: '[:query, [:filter, [:relation, "objects"], [:"=", [:function, [:field, "event_at"], [:method, "year"]], [:function, [:field, "REF_DATE"], [:method, "year"]]]]]'
   res: "[%Q{SELECT objects.* FROM objects WHERE strftime('%Y',objects.event_at) = strftime('%Y',now()) AND objects.parent_id = ?}, id]"
 
+nested_functions:
+  src: "objects where event_at.year.min = 2006 group by project_id"
+  sxp: '[:query, [:group, [:filter, [:relation, "objects"], [:"=", [:function, [:function, [:field, "event_at"], [:method, "year"]], [:method, "min"]], [:integer, "2006"]]], [:field, "project_id"]]]'
+  res: "[%Q{SELECT objects.* FROM objects WHERE MIN(strftime('%Y',objects.event_at)) = 2006 AND objects.parent_id = ? GROUP BY objects.project_id}, id]"
+
 filter_empty_literal:
   src: "objects where \"\" = ''"
   sxp: '[:query, [:filter, [:relation, "objects"], [:"=", [:dstring, ""], [:string, ""]]]]'

data/test/querybuilder_test.rb

@@ -37,6 +37,10 @@ class DummyQueryBuilder < Test::Unit::TestCase
       assert_equal '[%Q{SELECT objects.* FROM objects WHERE objects.project_id = ?}, project_id]', subject.new('objects', :default => {:scope => 'project'}).query.to_s
       assert_equal '[%Q{SELECT objects.* FROM objects WHERE objects.parent_id = ?}, id]', subject.new('objects').query.to_s
     end
+    
+    should 'not overwrite defaults before last' do
+      assert_equal '%Q{SELECT objects.* FROM objects,objects AS ob1 WHERE objects.parent_id = ob1.id GROUP BY objects.id}', subject.new('objects from objects', :default => {:scope => 'site'}).query.to_s
+    end
   end
 
   context 'Including QueryBuilder' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: querybuilder
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-01 00:00:00 +01:00
+date: 2012-06-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency