querybuilder 1.1.3 → 1.1.4

data/History.txt

@@ -1,3 +1,8 @@
+== 1.1.4 2012-10-07
+
+* Major enhancement
+  * Key/value tables are now 'LEFT' joined, enabling null testing and simplifying complex queries (with OR).
+
 == 1.1.3 2012-08-30
 
 * Major enhancement

data/lib/query_builder/info.rb

@@ -1,3 +1,3 @@
 module QueryBuilder
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

data/lib/query_builder/processor.rb

@@ -791,16 +791,14 @@ module QueryBuilder
       end
 
       # Add a new table and apply scoping when needed
-      def add_table(use_name, table_name = nil)
-        if use_name == main_table && first?
-          # we are now using final table
-          context[:table_alias] = use_name
-          avoid_alias = true
-        else
-          avoid_alias = false
-        end
-
+      def add_table(use_name, table_name = nil, type = nil, &block)
         if use_name == main_table
+          if first?
+            # we are now using final table
+            context[:table_alias] = use_name
+            avoid_alias = true
+          end
+          
           if context[:scope_type] == :join
             context[:scope_type] = nil
             # pre scope
@@ -808,7 +806,7 @@ module QueryBuilder
               @query.add_table(main_table, main_table, avoid_alias)
               apply_scope(context[:scope])
             end
-            @query.add_table(use_name, table_name, avoid_alias)
+            @query.add_table(use_name, table_name, avoid_alias, type, &block)
           elsif context[:scope_type] == :filter
             context[:scope_type] = nil
             # post scope
@@ -816,12 +814,12 @@ module QueryBuilder
             apply_scope(context[:scope] || default_scope(context))
           else
             # scope already applied / skip
-            @query.add_table(use_name, table_name, avoid_alias)
+            @query.add_table(use_name, table_name, avoid_alias, type, &block)
           end
         else
           # no scope
           # can only scope main_table
-          @query.add_table(use_name, table_name)
+          @query.add_table(use_name, table_name, true, type, &block)
         end
       end
 

data/lib/query_builder/query.rb

@@ -119,9 +119,9 @@ module QueryBuilder
 
     # 'avoid_alias' is used when parsing the last element so that it takes the real table name (nodes, not no1). We need
     # this because we can use 'OR' between parts and we thus need the same table reference.
-    def add_table(use_name, table_name = nil, avoid_alias = true)
+    def add_table(use_name, table_name = nil, avoid_alias = true, type = nil, &block)
       alias_name = get_alias(use_name, table_name, avoid_alias)
-      add_alias_to_tables(table_name || use_name, alias_name)
+      add_alias_to_tables(table_name || use_name, alias_name, type, &block)
     end
 
     # Add a table to 'import' a key/value based field. This method ensures that
@@ -133,10 +133,8 @@ module QueryBuilder
         # done, the index_table has been used for the given key in the current context
       else
         # insert the new table
-        add_table(use_name, index_table, false)
+        add_table(use_name, index_table, false, :left, &block)
         alias_table = key_table[key] = table(use_name)
-        # Let caller configure the filter (join).
-        block.call(alias_table)
       end
       alias_table
     end
@@ -225,27 +223,51 @@ module QueryBuilder
     def quote_column_name(name)
       connection.quote_column_name(name)
     end
-
+    
+    def has_table?(use_name)
+      !@table_alias[use_name].nil?
+    end
+    
+    
     private
-      # Make sure each used table gets a unique name
+      # Make sure each used table gets a unique name. By default, this uses an alias
+      # But if 'avoid_alias' is true and it is the first call for this table, return the
+      # table without an alias.
       def get_alias(use_name, table_name = nil, avoid_alias = true)
         table_name ||= use_name
-        @table_alias[use_name] ||= []
-        if avoid_alias && !@tables.include?(table_name)
+        list = (@table_alias[use_name] ||= [])
+        if avoid_alias && !list.include?(use_name)
           alias_name = use_name
         elsif @tables.include?(use_name)
           # links, li1, li2, li3
-          alias_name = "#{use_name[0..1]}#{@table_alias[use_name].size}"
+          alias_name = "#{use_name[0..1]}#{list.size}"
         else
           # ob1, obj2, objects
-          alias_name = "#{use_name[0..1]}#{@table_alias[use_name].size + 1}"
+          alias_name = "#{use_name[0..1]}#{list.size + 1}"
         end
 
-        @table_alias[use_name] << alias_name
+        list << alias_name
         alias_name
       end
 
-      def add_alias_to_tables(table_name, alias_name)
+      def add_alias_to_tables(table_name, alias_name, type = nil, &block)
+        if type
+          key = "#{table_name}=#{type}=#{alias_name}"
+          
+          @needed_join_tables[key] ||= begin
+            clause = "#{type.to_s.upcase} JOIN #{table_name}"
+            if alias_name && alias_name != table_name
+              clause << " AS #{alias_name}"
+            end
+            if block_given?
+              clause << " ON #{block.call(alias_name || table_name)}"
+            end
+            joins = (@join_tables[main_table] ||= [])
+            joins << clause
+          end
+          return
+        end
+        
         if alias_name != table_name
           @tables << "#{table_name} AS #{alias_name}"
         else
@@ -278,7 +300,7 @@ module QueryBuilder
 
         group = @group
         if !group && @distinct
-          key =  @tables.size > 1 ? "#{main_table}.id" : 'id'
+          key = "#{main_table}.id"
 
           case self.class.adapter
           when 'postgresql'

data/querybuilder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{querybuilder}
-  s.version = "1.1.3"
+  s.version = "1.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2012-08-30}
+  s.date = %q{2012-10-10}
   s.description = %q{QueryBuilder is an interpreter for the "pseudo sql" language. This language
     can be used for two purposes:
 

data/test/database.rb

@@ -1,4 +1,5 @@
 require 'active_record'
+require 'logger'
 
 begin
   class QueryBuilderTestMigration < ActiveRecord::Migration

data/test/mock/dummy_processor.rb

@@ -35,8 +35,7 @@ class DummyProcessor < QueryBuilder::Processor
     elsif %w{age size}.include?(field_name)
       tbl = add_key_value_table('idx', 'idx_nodes', field_name) do |tbl_name|
         # This block is only executed once
-        add_filter "#{tbl_name}.node_id = #{table}.id"
-        add_filter "#{tbl_name}.key = #{quote(field_name)}"
+        "#{tbl_name}.node_id = #{table}.id AND #{tbl_name}.key = #{quote(field_name)}"
       end
 
       "#{tbl}.value"

data/test/querybuilder/basic.yml

@@ -89,7 +89,7 @@ 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 objects.id}"
 
 function:
   src: "objects where event_at.year = 2005"

data/test/querybuilder/filters.yml

@@ -93,36 +93,36 @@ 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 = ? GROUP BY 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 objects.id}, id]"
 
 or_with_same_tables:
   src: "objects where age = 5 or age = 7"
-  res: "[%Q{SELECT objects.* FROM idx_nodes AS id1,objects WHERE ((id1.value = 5 AND id1.key = 'age' AND id1.node_id = objects.id) OR (id1.value = 7 AND id1.key = 'age' AND id1.node_id = objects.id)) AND objects.parent_id = ? GROUP BY objects.id}, id]"
+  res: "[%Q{SELECT objects.* FROM objects LEFT JOIN idx_nodes AS id1 ON id1.node_id = objects.id AND id1.key = 'age' WHERE (id1.value = 5 OR id1.value = 7) AND objects.parent_id = ? GROUP BY objects.id}, id]"
 
 or_with_missing_table:
-  src: "objects where age = 5 or 7"
-  res: "[%Q{SELECT objects.* FROM idx_nodes AS id1,objects WHERE ((id1.value = 5 AND id1.key = 'age' AND id1.node_id = objects.id) OR (7 AND id1.id = 0)) AND objects.parent_id = ? GROUP BY objects.id}, id]"
+  src: "objects where age = 5 or id = 7"
+  res: "[%Q{SELECT objects.* FROM objects LEFT JOIN idx_nodes AS id1 ON id1.node_id = objects.id AND id1.key = 'age' WHERE (id1.value = 5 OR objects.id = 7) AND objects.parent_id = ? GROUP BY objects.id}, id]"
 
 or_different_table:
   src: "objects where age = 5 or size = 15"
-  res: "[%Q{SELECT objects.* FROM idx_nodes AS id1,objects WHERE ((id1.value = 5 AND id1.key = 'age' AND id1.node_id = objects.id) OR (id1.value = 15 AND id1.key = 'size' AND id1.node_id = objects.id)) AND objects.parent_id = ? GROUP BY objects.id}, id]"
+  res: "[%Q{SELECT objects.* FROM objects LEFT JOIN idx_nodes AS id1 ON id1.node_id = objects.id AND id1.key = 'age' WHERE (id1.value = 5 OR id1.value = 15) AND objects.parent_id = ? GROUP BY objects.id}, id]"
 
 and_with_same_tables:
   src: "objects where age > 5 and age < 7"
-  res: "[%Q{SELECT objects.* FROM idx_nodes AS id1,objects WHERE id1.value > 5 AND id1.value < 7 AND id1.key = 'age' AND id1.node_id = objects.id AND objects.parent_id = ?}, id]"
+  res: "[%Q{SELECT objects.* FROM objects LEFT JOIN idx_nodes AS id1 ON id1.node_id = objects.id AND id1.key = 'age' WHERE id1.value > 5 AND id1.value < 7 AND objects.parent_id = ?}, id]"
 
 and_with_same_tables_different_key:
   src: "objects where age > 5 and size = 10"
-  res: "[%Q{SELECT objects.* FROM idx_nodes AS id1,idx_nodes AS id2,objects WHERE id1.value > 5 AND id2.value = 10 AND id2.key = 'size' AND id2.node_id = objects.id AND id1.key = 'age' AND id1.node_id = objects.id AND objects.parent_id = ?}, id]"
+  res: "[%Q{SELECT objects.* FROM objects LEFT JOIN idx_nodes AS id1 ON id1.node_id = objects.id AND id1.key = 'age' LEFT JOIN idx_nodes AS id2 ON id2.node_id = objects.id AND id2.key = 'size' WHERE id1.value > 5 AND id2.value = 10 AND objects.parent_id = ?}, id]"
 
 
 filter_and_order_index:
   src: "objects where age > 5 order by age asc"
-  res: "[%Q{SELECT objects.* FROM idx_nodes AS id1,objects WHERE id1.value > 5 AND id1.key = 'age' AND id1.node_id = objects.id AND objects.parent_id = ? ORDER BY id1.value ASC}, id]"
+  res: "[%Q{SELECT objects.* FROM objects LEFT JOIN idx_nodes AS id1 ON id1.node_id = objects.id AND id1.key = 'age' WHERE id1.value > 5 AND objects.parent_id = ? ORDER BY id1.value ASC}, id]"
 
 order_without_idx_filter:
   src: "objects order by age asc"
-  res: "[%Q{SELECT objects.* FROM idx_nodes AS id1,objects WHERE id1.key = 'age' AND id1.node_id = objects.id AND objects.parent_id = ? ORDER BY id1.value ASC}, id]"
+  res: "[%Q{SELECT objects.* FROM objects LEFT JOIN idx_nodes AS id1 ON id1.node_id = objects.id AND id1.key = 'age' WHERE objects.parent_id = ? ORDER BY id1.value ASC}, id]"
 
 equation_par:
   src: "objects where (1 > 2 or 2 > 3) and 4 = 5 "

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: querybuilder
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 1
-  - 3
-  version: 1.1.3
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-30 00:00:00 +02:00
+date: 2012-10-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency