querybuilder 1.0.1 → 1.1.0

data/lib/querybuilder_syntax.rl

@@ -11,18 +11,20 @@
   dquote   = ([^"\\] | '\n') $str_a | ('\\' (any | '\n') $str_a);
   squote   = ([^'\\] | '\n') $str_a | ('\\' (any | '\n') $str_a);
   string   = ws* ("'" squote* "'" >string | '"' dquote* '"' >dstring);
-  field    = var %field ('.' %function var %method)*;
   rcontent = ('"' dquote* '"') $str_a | ([^\}"\\] | '\n') $str_a | ('\\' (any | '\n') $str_a) ;
   rubyless = ws* "#{" rcontent+ "}" >rubyless ('.' %function var %method)*;
   real     = ws* ('-'? ('0'..'9' digit* '.' digit+) ) $str_a %real;
   integer  = ws* ('-'? digit+ ) $str_a %integer;
   number   = (real | integer);
+  literal  = (string | number | rubyless);
+
+  field    = var %field ('.' %function var %method ('(' (var %field | literal) (',' (var % field | literal))* ')')*)*;
   op       = ws* ('+' | '-' | '<' | '<=' | '=' | '>=' | '>') $str_a;
   text_op  = ws+ (('or' | 'and' | 'lt' | 'le' | 'eq' | 'ne' | 'ge' | 'gt' | 'match') $str_a | ('not' $str_a %operator ws+)? 'like' $str_a);
   operator = (op %operator | text_op %operator ws+ );
   interval = ws+ ('second'|'minute'|'hour'|'day'|'week'|'month'|'year') $str_a %interval 's'?;
-  value    = ((field | string | number | rubyless) interval? | ws* '(' >goto_expr_p ws* ')');
-  in_value = (string | number | rubyless) (ws* ',' (string | number | rubyless))*;
+  value    = ((field | literal) interval? | ws* '(' >goto_expr_p ws* ')');
+  in_value = literal (ws* ',' literal)*;
   in_expr  = ws+ ('not' $str_a %operator ws+)? 'in' ws* '(' %in_op in_value ws* ')'; # wait until '(' to execute 'operator' to avoid confusion with scope
   is_null  = ws+ 'is' %is ws+ (('not' ws+)* ('null' | 'NULL')) $str_a %raw;
   expr     = value (operator value | in_expr | is_null)*;

data/querybuilder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{querybuilder}
-  s.version = "1.0.1"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2011-07-11}
+  s.date = %q{2011-11-01}
   s.description = %q{QueryBuilder is an interpreter for the "pseudo sql" language. This language
     can be used for two purposes:
 
@@ -68,18 +68,8 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://zenadmin.org/524}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.1}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{QueryBuilder is an interpreter for the "pseudo sql" language.}
-  s.test_files = [
-    "test/database.rb",
-    "test/dummy_test.rb",
-    "test/mock/dummy.rb",
-    "test/mock/dummy_processor.rb",
-    "test/mock/user_processor.rb",
-    "test/query_test.rb",
-    "test/querybuilder_test.rb",
-    "test/test_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/mock/dummy_processor.rb

@@ -77,7 +77,7 @@ class DummyProcessor < QueryBuilder::Processor
   def process_match(left, right)
   end
 
-  def process_function(arg, method)
+  def process_function(arg, method, *args)
     method, arg = process(method), process(arg)
 
     case method
@@ -87,6 +87,9 @@ class DummyProcessor < QueryBuilder::Processor
       "COUNT(#{arg})"
     when 'sum'
       "SUM(#{arg})"
+    when 'coalesce'
+      args = [arg] + args.map{|a| process(a)}
+      "COALESCE(#{args.join(',')})"
     else
       super
     end

data/test/querybuilder/basic.yml

@@ -89,4 +89,14 @@ after_process_callback:
   context:
     after_filter: '(1 = 1)'
   src: "objects where name like 'a%' or name like 'b%' in site"
-  res: "%Q{SELECT objects.* FROM objects WHERE (1 = 1) AND (objects.name LIKE 'a%' OR objects.name LIKE 'b%') GROUP BY id}"
+  res: "%Q{SELECT objects.* FROM objects WHERE (1 = 1) AND (objects.name LIKE 'a%' OR objects.name LIKE 'b%') GROUP BY id}"
+
+function:
+  src: "objects where event_at.year = 2005"
+  sxp: '[:query, [:filter, [:relation, "objects"], [:"=", [:function, [:field, "event_at"], [:method, "year"]], [:integer, "2005"]]]]'
+  res: "[%Q{SELECT objects.* FROM objects WHERE strftime('%Y',objects.event_at) = 2005 AND objects.parent_id = ?}, id]"
+
+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]"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: querybuilder
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-11 00:00:00 +02:00
+date: 2011-11-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -152,16 +152,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: QueryBuilder is an interpreter for the "pseudo sql" language.
-test_files: 
-- test/database.rb
-- test/dummy_test.rb
-- test/mock/dummy.rb
-- test/mock/dummy_processor.rb
-- test/mock/user_processor.rb
-- test/query_test.rb
-- test/querybuilder_test.rb
-- test/test_helper.rb
+test_files: []
+