querybuilder 1.1.2 → 1.1.3

data/History.txt

@@ -1,3 +1,8 @@
+== 1.1.3 2012-08-30
+
+* Major enhancement
+  * Added support for types in select and custom queries "nodes select created_at as foo:time".
+
 == 1.1.2 2012-08-24
 
 * Minor enhancement

data/lib/query_builder/info.rb

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

data/lib/query_builder/processor.rb

@@ -758,6 +758,10 @@ module QueryBuilder
       def prepare_custom_query_arguments(key, value)
         if key == :main_class
           resolve_main_class(value)
+        elsif key == :types
+          value.each do |k,v|
+            value[k] = v.to_sym
+          end
         elsif value.kind_of?(Array)
           value.map {|e| parse_custom_query_argument(key, e)}
         elsif value.kind_of?(Hash)

data/lib/query_builder/query.rb

@@ -2,9 +2,10 @@ require 'active_record'
 
 module QueryBuilder
   class Query
+    SELECT_WITH_TYPE_REGEX = /^(.*):(.*)$/
     attr_accessor :processor_class, :distinct, :select, :tables, :table_alias, :where,
                   :limit, :offset, :page_size, :order, :group, :error, :attributes_alias,
-                  :pagination_key, :main_class, :context, :key_value_tables, :having
+                  :pagination_key, :main_class, :context, :key_value_tables, :having, :types
 
     class << self
       def adapter
@@ -19,6 +20,8 @@ module QueryBuilder
       @join_tables = {}
       @needed_join_tables = {}
       @attributes_alias   = {}
+      # Custom select foo as bar:time or 'types:' field in custom query.
+      @types              = {}
       @key_value_tables   = {}
       @where = []
     end
@@ -56,10 +59,18 @@ module QueryBuilder
       @where << filter
     end
 
-    # Return all explicit selected keys (currently selection is only available in custom queries)
+    # Return all explicit selected keys
     # For example, sql such as "SELECT form.*, MAX(form.date) AS last_date" would provice 'last_date' key.
     def select_keys
-      @select_keys ||= @attributes_alias.keys.compact
+      @select_keys ||= begin
+        keys = @attributes_alias.keys.compact
+        # When rebuilding select_keys, we rebuild @types
+        keys.each do |k|
+          # Default type is string
+          @types[k] ||= :string
+        end
+        keys
+      end
     end
 
     # Convert query object to a string. This string should then be evaluated.
@@ -131,6 +142,10 @@ module QueryBuilder
     end
 
     def add_select(field, fname)
+      if fname =~ SELECT_WITH_TYPE_REGEX
+        fname, type = $1, $2
+        @types[fname] = type.to_sym
+      end
       @select ||= ["#{main_table}.*"]
       @select << "#{field} AS #{quote_column_name(fname)}"
       @attributes_alias[fname] = field

data/querybuilder.gemspec

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

data/test/mock/custom_queries/test.yml

@@ -19,6 +19,8 @@ DummyProcessor:
       - a
       - 34 AS number
       - c
+    types:
+      number: integer
     tables:
       - test
     where:

data/test/querybuilder_test.rb

@@ -78,6 +78,10 @@ class DummyQueryBuilder < Test::Unit::TestCase
     should 'respond to select_keys' do
       assert_equal %w{a c number}, subject.select_keys.sort
     end
+    
+    should 'return type of custom key' do
+      assert_equal :integer, subject.types['number']
+    end
 
     should 'not include star keys' do
       assert !subject.select_keys.include?('*')

metadata

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