querybuilder 0.7.0 → 0.8.0

data/lib/querybuilder_rb.rl

@@ -87,6 +87,7 @@ module QueryBuilder
 
     action goto_expr_p {
       # remember current machine state 'cs'
+      par_count += 1
       last << [:par, cs]
       stack.push last.last
       last = last.last
@@ -96,6 +97,7 @@ module QueryBuilder
     action expr_close {
       pop_stack(stack, :par_close)
       # reset machine state 'cs'
+      par_count -= 1
       cs = stack.last.delete_at(1)
       # one more time to remove [:par...] line
       stack.pop
@@ -195,6 +197,7 @@ module QueryBuilder
       else
         data = "#{arg}\n"
       end
+      par_count = 0
       stack = [[:query]]
       last  = stack.last
       str_buf         = ""
@@ -206,7 +209,11 @@ module QueryBuilder
       if p < pe
         p = p - 3
         p = 0 if p < 0
-        raise QueryBuilder::SyntaxError.new("Syntax error near #{data[p..-1].chomp.inspect}.")
+        raise QueryBuilder::SyntaxError.new("Syntax error near #{data[p..-2].inspect}.")
+      end
+
+      if par_count > 0
+        raise QueryBuilder::SyntaxError.new("Missing closing parenthesis in #{data[0..-2].inspect}.")
       end
       stack.first
     end

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_:]+) $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

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{querybuilder}
-  s.version = "0.7.0"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2010-05-27}
+  s.date = %q{2010-07-22}
   s.description = %q{QueryBuilder is an interpreter for the "pseudo sql" language. This language
     can be used for two purposes:
 
@@ -38,12 +38,13 @@ Gem::Specification.new do |s|
      "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",
-     "tasks/build.rake",
+     "test/database.rb",
      "test/dummy_test.rb",
      "test/mock/custom_queries/test.yml",
      "test/mock/dummy.rb",
@@ -69,7 +70,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{QueryBuilder is an interpreter for the "pseudo sql" language.}
   s.test_files = [
-    "test/dummy_test.rb",
+    "test/database.rb",
+     "test/dummy_test.rb",
      "test/mock/dummy.rb",
      "test/mock/dummy_processor.rb",
      "test/mock/user_processor.rb",

data/test/database.rb

@@ -0,0 +1,20 @@
+require 'active_record'
+
+begin
+  class QueryBuilderTestMigration < ActiveRecord::Migration
+    def self.down
+    end
+
+    def self.up
+    end
+  end
+
+  ActiveRecord::Base.establish_connection(:adapter=>'sqlite3', :database=>':memory:')
+  log_path = Pathname(__FILE__).dirname + '../log/test.log'
+  Dir.mkdir(log_path.dirname) unless File.exist?(log_path.dirname)
+  ActiveRecord::Base.logger = Logger.new(File.open(log_path, 'wb'))
+  ActiveRecord::Migration.verbose = false
+  #PropertyMigration.migrate(:down)
+  QueryBuilderTestMigration.migrate(:up)
+  ActiveRecord::Migration.verbose = true
+end

data/test/mock/dummy_processor.rb

@@ -32,11 +32,28 @@ class DummyProcessor < QueryBuilder::Processor
       "#{table}.#{fld_name}"
     elsif fld_name == 'REF_DATE'
       context[:ref_date] ? insert_bind(context[:ref_date]) : 'now()'
+    elsif fld_name == 'index'
+      add_table('index')
+      add_filter "#{table('index')}.node_id = #{field_or_attr('id', table(self.class.main_table))}"
+      "#{table('index')}.value"
     else
       super # raises an error
     end
   end
 
+  def resolve_missing_table(query, table_alias, table_name)
+    case table_name
+    when 'index'
+      query.where.insert 0, "#{table_alias}.id = 0"
+    when 'links'
+      query.where.insert 0, "#{table_alias}.id = 0"
+    else
+      # Raise an error
+      super
+    end
+    # do nothing
+  end
+
   # We do special things with 'class ='
   def process_equal(left, right)
     if left == [:field, 'class'] && right[0] == :string

data/test/querybuilder/basic.yml

@@ -70,11 +70,12 @@ paginate:
 recipients_or_objects:
   src: recipients or objects
   sxp: '[:query, [:clause_or, [:relation, "recipients"], [:relation, "objects"]]]'
-  res: "[%Q{SELECT objects.* FROM links,objects WHERE ((objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ?) OR objects.parent_id = ?) GROUP BY objects.id}, id, id]"
+  res: "[%Q{SELECT objects.* FROM links,objects WHERE ((objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ?) OR (objects.parent_id = ? AND links.id = 0)) GROUP BY objects.id}, id, id]"
 
 recipients_or_objects_or_letters:
   src: recipients or objects or letters
-  res: "[%Q{SELECT objects.* FROM links,objects WHERE ((objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ?) OR objects.parent_id = ? OR (objects.kpath LIKE 'NNL%' AND objects.parent_id = ?)) GROUP BY objects.id}, id, id, id]"
+  res: "[%Q{SELECT objects.* FROM links,objects WHERE ((objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ?) OR (links.id = 0 AND objects.parent_id = ?) OR (links.id = 0 AND objects.kpath LIKE 'NNL%' AND objects.parent_id = ?)) GROUP BY objects.id}, id, id, id]"
+  res: "[%Q{SELECT objects.* FROM links,objects WHERE ((objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ?) OR (objects.parent_id = ? AND links.id = 0) OR (objects.kpath LIKE 'NNL%' AND objects.parent_id = ? AND links.id = 0)) GROUP BY objects.id}, id, id, id]"
 
 or_clause_with_filter:
   src: "(recipients where name = 'foo') or objects"
@@ -88,4 +89,4 @@ 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%')}"
+  res: "%Q{SELECT objects.* FROM objects WHERE (1 = 1) AND (objects.name LIKE 'a%' OR objects.name LIKE 'b%') GROUP BY id}"

data/test/querybuilder/errors.yml

@@ -30,3 +30,12 @@ or_clause_with_filter:
   src: "recipients where name = 'foo' or objects"
   sxp: '[:query, [:filter, [:relation, "recipients"], [:or, [:"=", [:field, "name"], [:string, "foo"]], [:field, "objects"]]]]'
   res: "Unknown field 'objects'."
+
+
+unmatched_open_par:
+  src: "objects where event_at is null or (name is not null"
+  res: "Missing closing parenthesis in \"objects where event_at is null or (name is not null\"."
+
+unmatched_close_par:
+  src: "objects where event_at is null )"
+  res: "Syntax error near \"ll )\"."

data/test/querybuilder/filters.yml

@@ -83,7 +83,15 @@ equation_with_date_interval:
 equation_and_or_par:
   src: "objects where event_at > '2006-04-01' or name like 'foo%'"
   sxp: '[:query, [:filter, [:relation, "objects"], [:or, [:>, [:field, "event_at"], [:string, "2006-04-01"]], [:like, [:field, "name"], [:string, "foo%"]]]]]'
-  res: "[%Q{SELECT objects.* FROM objects WHERE (objects.event_at > '2006-04-01' OR objects.name LIKE 'foo%') AND objects.parent_id = ?}, id]"
+  res: "[%Q{SELECT objects.* FROM objects WHERE (objects.event_at > '2006-04-01' OR objects.name LIKE 'foo%') AND objects.parent_id = ? GROUP BY id}, id]"
+
+or_with_same_tables:
+  src: "objects where index = 5 or index = 7"
+  res: "[%Q{SELECT objects.* FROM index,objects WHERE ((index.value = 5 AND index.node_id = objects.id) OR (index.value = 7 AND index.node_id = objects.id)) AND objects.parent_id = ? GROUP BY objects.id}, id]"
+
+or_with_missing_table:
+  src: "objects where index = 5 or 7"
+  res: "[%Q{SELECT objects.* FROM index,objects WHERE ((index.value = 5 AND index.node_id = objects.id) OR (7 AND index.id = 0)) AND objects.parent_id = ? GROUP BY objects.id}, id]"
 
 equation_par:
   src: "objects where (1 > 2 or 2 > 3) and 4 = 5 "
@@ -112,4 +120,4 @@ functions:
 filter_empty_literal:
   src: "objects where \"\" = ''"
   sxp: '[:query, [:filter, [:relation, "objects"], [:"=", [:dstring, ""], [:string, ""]]]]'
-  sql: "SELECT objects.* FROM objects WHERE '' = '' AND objects.parent_id = 123"
+  sql: "SELECT objects.* FROM objects WHERE '' = '' AND objects.parent_id = 123"

data/test/querybuilder/joins.yml

@@ -26,6 +26,11 @@ tags:
 complex_from_with_scopes:
   src: "letters where name = 'foo' in project from letters in section"
   sxp: '[:query, [:from, [:scope, [:filter, [:relation, "letters"], [:"=", [:field, "name"], [:string, "foo"]]], "project"], [:scope, [:relation, "letters"], "section"]]]'
+
+complex_from_with_scopes_and_typed_scope:
+  # instead of 'project', we give it a class with 'jobs:project'
+  src: "letters where name = 'foo' in jobs:project from letters in section"
+  sxp: '[:query, [:from, [:scope, [:filter, [:relation, "letters"], [:"=", [:field, "name"], [:string, "foo"]]], "jobs:project"], [:scope, [:relation, "letters"], "section"]]]'
   
 letters_in_project_from_letters:
   sxp: '[:query, [:from, [:scope, [:relation, "letters"], "project"], [:relation, "letters"]]]'

data/test/test_helper.rb

@@ -3,6 +3,7 @@ $LOAD_PATH.unshift((Pathname(__FILE__).dirname +  '..' + 'lib').expand_path)
 require 'stringio'
 require 'test/unit'
 require 'rubygems'
+require 'database'
 require 'querybuilder'
 require 'shoulda'
 require 'yamltest'

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-27 00:00:00 +02:00
+date: 2010-07-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,12 +89,13 @@ files:
 - 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
-- tasks/build.rake
+- test/database.rb
 - test/dummy_test.rb
 - test/mock/custom_queries/test.yml
 - test/mock/dummy.rb
@@ -144,6 +145,7 @@ 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