querybuilder 0.9.4 → 0.9.5

data/History.txt

@@ -1,4 +1,10 @@
-== 0.9.4
+== 0.9.5
+
+* Major enhancements
+  * Better quoting when connection quote uses backslash (eval removes backslash).
+  * Fixed a bug when paginating without a limit clause.
+
+== 0.9.4 2010-12-02
 
 * 1 Minor enhancement
   * Should only raise QueryBuilder::Error on initialize.

data/lib/query_builder/info.rb

@@ -1,3 +1,3 @@
 module QueryBuilder
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
 end

data/lib/query_builder/processor.rb

@@ -568,7 +568,7 @@ module QueryBuilder
 
       def process_paginate(query, paginate_fld)
         process(query)
-        raise QueryBuilder::SyntaxError.new("Invalid paginate clause '#{paginate}' (used without limit).") unless @query.limit
+        raise QueryBuilder::SyntaxError.new("Invalid paginate clause (used without limit).") unless @query.limit
         context[:processing] = :paginate
         fld = process(paginate_fld)
         if fld && (page_size = @query.limit[/ LIMIT (\d+)/,1])
@@ -812,7 +812,9 @@ module QueryBuilder
       end
 
       def quote(arg)
-        connection.quote(arg)
+        # we must backslash twice because 'eval' will take one out:
+        # 'l\\'avion' ==> 'l\'avion' ==> ok
+        connection.quote(arg).gsub('\\','\\\\\\\\') # we need 8
       end
 
       def connection

data/querybuilder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{querybuilder}
-  s.version = "0.9.4"
+  s.version = "0.9.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2010-12-02}
+  s.date = %q{2011-02-11}
   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

@@ -173,9 +173,6 @@ end
 
 
 class DummyClass
-  # Mock connection and quoting
-  def self.connection; self; end
-  def self.quote(obj)
-    obj.kind_of?(String) ? "'#{obj}'" : obj
-  end
+  # Mock connection
+  def self.connection; ActiveRecord::Base.connection; end
 end

data/test/mock/user_processor.rb

@@ -1,8 +1,5 @@
 class TestUser
-  def self.connection; self; end
-  def self.quote(obj)
-    obj.kind_of?(String) ? "'#{obj}'" : obj
-  end
+  def self.connection; ActiveRecord::Base.connection; end
 end
 
 class UserProcessor < QueryBuilder::Processor

data/test/querybuilder/errors.yml

@@ -14,6 +14,10 @@ offset_without_limit:
   src: "objects in project offset 3"
   res: "Invalid offset (used without limit)."
 
+paginate_without_limit:
+  src: "objects in site paginate p"
+  res: "Invalid paginate clause (used without limit)."
+  
 legacy_many_clauses:
   src: letters or foo
   res: "Unknown relation 'foo'."

data/test/querybuilder/filters.yml

@@ -159,4 +159,8 @@ filter_in_single_literal:
 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)"
+  sql: "SELECT objects.* FROM objects WHERE objects.id NOT IN (1,2,3,4)"
+
+filter_quote_string:
+  src: "objects where name = \"l'avion\""
+  sql: "SELECT objects.* FROM objects WHERE objects.name = 'l''avion' AND objects.parent_id = 123"

data/test/querybuilder_test.rb

@@ -16,7 +16,6 @@ class DummyQueryBuilder < Test::Unit::TestCase
   def id;         123;  end
   def parent_id;  333;  end
   def project_id; 9999; end
-  def connection; self; end
 
   context 'A query processor' do
     subject do
@@ -75,7 +74,7 @@ class DummyQueryBuilder < Test::Unit::TestCase
     should 'respond to select_keys' do
       assert_equal %w{a number c}, subject.select_keys
     end
-    
+
     should 'not include star keys' do
       assert !subject.select_keys.include?('*')
     end

data/test/test_helper.rb

@@ -10,4 +10,8 @@ require 'yamltest'
 
 require 'mock/dummy_processor'
 require 'mock/user_processor'
-require 'mock/dummy'
+require 'mock/dummy'
+
+require 'active_record'
+# in order to use connection for quoting and such
+ActiveRecord::Base.establish_connection(:adapter=>'sqlite3', :database=>':memory:')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: querybuilder
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: false
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-02 00:00:00 +01:00
+date: 2011-02-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency