querybuilder 0.5.4 → 0.5.5

data/History.txt

@@ -1,3 +1,8 @@
+== 0.5.4 2009-06-04
+
+* 1 minor enhancement:
+  * Added 'use_name' to 'add_table' so you can add tables under a different name
+
 == 0.5.4 2009-04-09
 
 * 1 minor enhancement:

data/README.rdoc

@@ -1,6 +1,6 @@
 = QueryBuilder
 
-* http://github.com/zena/querybuilder/tree/master
+* http://zenadmin.org/524
 
 == DESCRIPTION:
 

data/lib/QueryBuilder.rb

@@ -10,7 +10,7 @@ Syntax of a query is "RELATION [where ...|] [in ...|from SUB_QUERY|]".
 =end
 class QueryBuilder
   attr_reader :tables, :where, :errors, :join_tables, :distinct, :final_parser, :page_size
-  VERSION = '0.5.4'
+  VERSION = '0.5.5'
   
   @@main_table = {}
   @@main_class = {}
@@ -280,14 +280,14 @@ class QueryBuilder
             return
           end
           allowed = [:op, :bool_op]
-        elsif rest =~ /\A((>=|<=|<>|<|=|>)|((not\s+like|like|lt|le|eq|ne|ge|gt)\s+))/
+        elsif rest =~ /\A((>=|<=|<>|\!=|<|=|>)|((not\s+like|like|lt|le|eq|ne|ge|gt)\s+))/
           unless allowed.include?(:op)
             @errors << clause_error(clause, rest, res) 
             return
           end
           op = $1.strip
           rest = rest[op.size..-1]
-          op = {'lt' => '<','le' => '<=','eq' => '=','ne' => '<>','ge' => '>=','gt' => '>','like' => 'LIKE', 'not like' => 'NOT LIKE'}[op] || $1
+          op = {'lt' => '<', 'le' => '<=', 'eq' => '=', 'ne' => '<>', '!=' => '<>', 'ge' => '>=', 'gt' => '>', 'like' => 'LIKE', 'not like' => 'NOT LIKE'}[op] || $1
           res << op
           allowed = [:value, :par_open]
         elsif rest =~ /\A("|')([^\1]*?)\1/  
@@ -374,7 +374,7 @@ class QueryBuilder
       if par_count > 0
         @errors << "invalid clause #{clause.inspect}: missing closing ')'"
       elsif allowed.include?(:value)
-        @errors << "include clause #{clause.inspect}"
+        @errors << "invalid clause #{clause.inspect}"
       else
         @where << (has_or ? "(#{res})" : res)
       end
@@ -462,13 +462,18 @@ class QueryBuilder
       end
     end
     
-    def add_table(table_name)
-      if !@table_counter[table_name]
-        @table_counter[table_name] = 0
-        @tables << table_name
+    def add_table(use_name, table_name = nil)
+      table_name ||= use_name
+      if !@table_counter[use_name]
+        @table_counter[use_name] = 0
+        if use_name != table_name
+          @tables << "#{table_name} as #{use_name}"
+        else
+          @tables << table_name
+        end
       else  
-        @table_counter[table_name] += 1
-        @tables << "#{table_name} AS #{table(table_name)}"
+        @table_counter[use_name] += 1
+        @tables << "#{table_name} AS #{table(use_name)}"
       end
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: querybuilder
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-09 00:00:00 +02:00
+date: 2009-06-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,7 +74,7 @@ files:
 - test/test_helper.rb
 - test/test_QueryBuilder.rb
 has_rdoc: true
-homepage: http://github.com/zena/querybuilder/tree/master
+homepage: http://zenadmin.org/524
 post_install_message: 
 rdoc_options: 
 - --main