querybuilder 0.8.2 → 0.8.3

data/lib/querybuilder_rb.rl

@@ -69,6 +69,10 @@ module QueryBuilder
       str_buf = ""
     }
 
+    action in_op {
+      last = apply_op(stack, :in)
+    }
+
     action is {
       # We need the 'is' operator to avoid confusion with 'in site'.
       last = apply_op(stack, :is)

data/lib/querybuilder_syntax.rl

@@ -23,8 +23,10 @@
   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))*;
+  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 | is_null)*;
+  expr     = value (operator value | in_expr | is_null)*;
   expr_p  := expr ws* ')' $expr_close;
 
   relation = ws* var %relation;

data/querybuilder.gemspec

@@ -5,17 +5,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{querybuilder}
-  s.version = "0.8.2"
+  s.version = "0.8.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2010-08-30}
+  s.date = %q{2010-08-31}
   s.description = %q{QueryBuilder is an interpreter for the "pseudo sql" language. This language
     can be used for two purposes:
 
      1. protect your database from illegal SQL by securing queries
      2. ease writing complex relational queries by abstracting table internals}
   s.email = %q{gaspard@teti.ch}
+  s.extensions = ["lib/extconf.rb"]
   s.extra_rdoc_files = [
     "README.rdoc"
   ]

data/test/querybuilder/filters.yml

@@ -121,3 +121,21 @@ filter_empty_literal:
   src: "objects where \"\" = ''"
   sxp: '[:query, [:filter, [:relation, "objects"], [:"=", [:dstring, ""], [:string, ""]]]]'
   sql: "SELECT objects.* FROM objects WHERE '' = '' AND objects.parent_id = 123"
+
+filter_in_literal:
+  src: "objects where id in (1, 2 , 3,4) in site"
+  sxp: '[:query, [:scope, [:filter, [:relation, "objects"], [:in, [:field, "id"], [:integer, "1"], [:integer, "2"], [:integer, "3"], [:integer, "4"]]], "site"]]'
+  sql: "SELECT objects.* FROM objects WHERE objects.id IN (1,2,3,4)"
+
+filter_in_string:
+  src: "objects where name in ('paul', 'john') in site"
+  sql: "SELECT objects.* FROM objects WHERE objects.name IN ('paul','john')"
+
+filter_in_single_literal:
+  src: "objects where id in (1) in site"
+  sql: "SELECT objects.* FROM objects WHERE objects.id IN (1)"
+
+filter_not_in_literal:
+  src: "objects where id not in (1, 2 , 3,4) in site"
+  sxp: '[:query, [:scope, [:filter, [:relation, "objects"], [:not, [:in, [:field, "id"], [:integer, "1"], [:integer, "2"], [:integer, "3"], [:integer, "4"]]]], "site"]]'
+  sql: "SELECT objects.* FROM objects WHERE objects.id NOT IN (1,2,3,4)"

data/test/querybuilder/rubyless.yml

@@ -12,4 +12,13 @@ eval:
 
 date_function:
   src: 'objects where name = #{params[:name]}.year'
-  res: "/objects.name = strftime\('%Y',\?\)/"
+  res: "/objects.name = strftime\('%Y',\?\)/"
+
+filter_in_rubyless:
+  src: "objects where id in (#{params[:d]}) in site"
+  sxp: '[:query, [:scope, [:filter, [:relation, "objects"], [:in, [:field, "id"], [:rubyless, "params[:d]"]]], "site"]]'
+  res: "[%Q{SELECT objects.* FROM objects WHERE objects.id IN (?)}, get_params[:d]]"
+
+filter_in_mixed:
+  src: 'objects where name in ("hello", #{params[:p]})'
+  res: "[%Q{SELECT objects.* FROM objects WHERE objects.name IN ('hello',?) AND objects.parent_id = ?}, get_params[:p], id]"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 +02:00
+date: 2010-08-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,8 +66,8 @@ description: |-
 email: gaspard@teti.ch
 executables: []
 
-extensions: []
-
+extensions: 
+- lib/extconf.rb
 extra_rdoc_files: 
 - README.rdoc
 files: