querybuilder 0.9.5 → 0.9.6

data/lib/querybuilder_syntax.rl

@@ -8,7 +8,7 @@
   # The where CLAUSE can contain the following operators
 
   ws       = ' ' | '\t' | '\n';
-  var      = ws* ([a-zA-Z_:]+) $str_a;
+  var      = ws* ([a-zA-Z_][a-zA-Z0-9_:]*) $str_a;
   dquote   = ([^"\\] | '\n') $str_a | ('\\' (any | '\n') $str_a);
   squote   = ([^'\\] | '\n') $str_a | ('\\' (any | '\n') $str_a);
   string   = ws* ("'" squote* "'" >string | '"' dquote* '"' >dstring);

data/querybuilder.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{querybuilder}
-  s.version = "0.9.5"
+  s.version = "0.9.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2011-02-11}
+  s.date = %q{2011-05-09}
   s.description = %q{QueryBuilder is an interpreter for the "pseudo sql" language. This language
     can be used for two purposes:
 
@@ -21,68 +21,65 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "History.txt",
-     "Manifest.txt",
-     "README.rdoc",
-     "Rakefile",
-     "lib/extconf.rb",
-     "lib/query_builder.rb",
-     "lib/query_builder/error.rb",
-     "lib/query_builder/info.rb",
-     "lib/query_builder/parser.rb",
-     "lib/query_builder/processor.rb",
-     "lib/query_builder/query.rb",
-     "lib/querybuilder.rb",
-     "lib/querybuilder_ext.c",
-     "lib/querybuilder_ext.rl",
-     "lib/querybuilder_rb.rb",
-     "lib/querybuilder_rb.rl",
-     "lib/querybuilder_syntax.rl",
-     "lib/tasks/build.rake",
-     "old_QueryBuilder.rb",
-     "querybuilder.gemspec",
-     "script/console",
-     "script/destroy",
-     "script/generate",
-     "test/database.rb",
-     "test/dummy_test.rb",
-     "test/mock/custom_queries/test.yml",
-     "test/mock/dummy.rb",
-     "test/mock/dummy_processor.rb",
-     "test/mock/queries/bar.yml",
-     "test/mock/queries/foo.yml",
-     "test/mock/user_processor.rb",
-     "test/query_test.rb",
-     "test/querybuilder/basic.yml",
-     "test/querybuilder/custom.yml",
-     "test/querybuilder/errors.yml",
-     "test/querybuilder/filters.yml",
-     "test/querybuilder/group.yml",
-     "test/querybuilder/joins.yml",
-     "test/querybuilder/mixed.yml",
-     "test/querybuilder/rubyless.yml",
-     "test/querybuilder_test.rb",
-     "test/test_helper.rb"
+    "History.txt",
+    "Manifest.txt",
+    "README.rdoc",
+    "Rakefile",
+    "lib/extconf.rb",
+    "lib/query_builder.rb",
+    "lib/query_builder/error.rb",
+    "lib/query_builder/info.rb",
+    "lib/query_builder/parser.rb",
+    "lib/query_builder/processor.rb",
+    "lib/query_builder/query.rb",
+    "lib/querybuilder.rb",
+    "lib/querybuilder_ext.c",
+    "lib/querybuilder_ext.rl",
+    "lib/querybuilder_rb.rb",
+    "lib/querybuilder_rb.rl",
+    "lib/querybuilder_syntax.rl",
+    "lib/tasks/build.rake",
+    "old_QueryBuilder.rb",
+    "querybuilder.gemspec",
+    "script/console",
+    "script/destroy",
+    "script/generate",
+    "test/database.rb",
+    "test/dummy_test.rb",
+    "test/mock/custom_queries/test.yml",
+    "test/mock/dummy.rb",
+    "test/mock/dummy_processor.rb",
+    "test/mock/queries/bar.yml",
+    "test/mock/queries/foo.yml",
+    "test/mock/user_processor.rb",
+    "test/query_test.rb",
+    "test/querybuilder/basic.yml",
+    "test/querybuilder/custom.yml",
+    "test/querybuilder/errors.yml",
+    "test/querybuilder/filters.yml",
+    "test/querybuilder/group.yml",
+    "test/querybuilder/joins.yml",
+    "test/querybuilder/mixed.yml",
+    "test/querybuilder/rubyless.yml",
+    "test/querybuilder_test.rb",
+    "test/test_helper.rb"
   ]
   s.homepage = %q{http://zenadmin.org/524}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.1}
   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"
+    "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
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/test/mock/dummy_processor.rb

@@ -28,7 +28,7 @@ class DummyProcessor < QueryBuilder::Processor
 
   # Overwrite this and take care to check for valid fields.
   def process_field(field_name)
-    if ['id', 'parent_id', 'project_id', 'section_id', 'kpath', 'name', 'event_at', 'custom_a'].include?(field_name)
+    if ['id', 'parent_id', 'project_id', 'section_id', 'kpath', 'name', 'event_at', 'custom_a', 'idx_foo1'].include?(field_name)
       "#{table}.#{field_name}"
     elsif field_name == 'REF_DATE'
       context[:ref_date] ? insert_bind(context[:ref_date]) : 'now()'

data/test/querybuilder/filters.yml

@@ -163,4 +163,10 @@ filter_not_in_literal:
 
 filter_quote_string:
   src: "objects where name = \"l'avion\""
-  sql: "SELECT objects.* FROM objects WHERE objects.name = 'l''avion' AND objects.parent_id = 123"
+  sql: "SELECT objects.* FROM objects WHERE objects.name = 'l''avion' AND objects.parent_id = 123"
+
+
+field_with_digits:
+  src: "objects where idx_foo1 is not null"
+  sxp: '[:query, [:filter, [:relation, "objects"], [:is, [:field, "idx_foo1"], [:raw, "not null"]]]]'
+  res: "[%Q{SELECT objects.* FROM objects WHERE objects.idx_foo1 IS NOT NULL AND objects.parent_id = ?}, id]"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: querybuilder
 version: !ruby/object:Gem::Version 
-  hash: 49
-  prerelease: false
+  hash: 55
+  prerelease: 
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 +01:00
+date: 2011-05-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,7 +78,6 @@ extensions:
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- .gitignore
 - History.txt
 - Manifest.txt
 - README.rdoc
@@ -126,8 +125,8 @@ homepage: http://zenadmin.org/524
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -151,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: QueryBuilder is an interpreter for the "pseudo sql" language.