Merge

Author: Ary Borenszweig

README.markdown

@@ -40,6 +40,8 @@ Extensions
 Rgviz supports the following extra functions:
 
 * *concat*: converts each of its arguments to a string and then concatenates them. For example: <tt>concat(1, '-', '2')</tt> returns <tt>'1-2'</tt>. Can also receive just a single argument to convert it to a string.
+* *floor*
+* *round*
 
 These new functions are not part of Google's query language, but they are very handy so we added them. These functions are also supported by [rgviz-rails](https://github.com/asterite/rgviz-rails).
 

lib/rgviz/lexer.rb

@@ -60,6 +60,7 @@ def next_token
           elsif scan /desc\b/i then Token::Desc
           elsif scan /ends\b/i then Token::Ends
           elsif scan /false\b/i then Token::False
+          elsif scan /floor\b/i then Token::Floor
           elsif scan /format\b/i then Token::Format
           elsif scan /group\b/i then Token::Group
           elsif scan /hour\b/i then Token::Hour
@@ -85,6 +86,7 @@ def next_token
           elsif scan /order\b/i then Token::Order
           elsif scan /pivot\b/i then Token::Pivot
           elsif scan /quarter\b/i then Token::Quarter
+          elsif scan /round\b/i then Token::Round
           elsif scan /second\b/i then Token::Second
           elsif scan /select\b/i then Token::Select
           elsif scan /starts\b/i then Token::Starts

lib/rgviz/memory_executor.rb

@@ -454,6 +454,10 @@ def visit_scalar_function_column(node)
           @value = val1.sec
         when ScalarFunctionColumn::Quarter
           @value = (val1.month / 3.0).ceil
+        when ScalarFunctionColumn::Round
+          @value = val1.round
+        when ScalarFunctionColumn::Floor
+          @value = val1.floor
         when ScalarFunctionColumn::Millisecond
           raise "Millisecond is not implemented"
         when ScalarFunctionColumn::Lower

lib/rgviz/nodes.rb

@@ -422,6 +422,8 @@ class ScalarFunctionColumn
     Product = Token::STAR
     Quarter = Token::Quarter
     Quotient = Token::SLASH
+    Round = Token::Round
+    Floor = Token::Floor
     Second = Token::Second
     Sum = Token::PLUS
     ToDate = Token::ToDate

lib/rgviz/parser.rb

@@ -386,7 +386,8 @@ def parse_atomic_column
       when Token::Year, Token::Month, Token::Day,
            Token::Hour, Token::Minute, Token::Second, Token::Millisecond,
            Token::Now, Token::DateDiff, Token::Lower, Token::Upper,
-           Token::Quarter, Token::DayOfWeek, Token::ToDate, Token::Concat
+           Token::Quarter, Token::DayOfWeek, Token::ToDate, Token::Concat,
+           Token::Round,Token::Floor
         function = @token.value
         string = @token.string
         next_token
@@ -428,12 +429,12 @@ def check!(*token_values)
       check *token_values
       next_token
     end
-    
+
   protected
     def parse_date(date_string)
       Date.parse(date_string)
     end
-    
+
     def parse_time(time_string)
       Time.parse(time_string)
     end

lib/rgviz/token.rb

@@ -16,6 +16,7 @@ class Token
     DayOfWeek = :dayOfWeek
     Ends = :ends
     False = :false
+    Floor = :floor
     Format = :format
     Group = :group
     Hour = :hour
@@ -41,6 +42,7 @@ class Token
     Order = :order
     Pivot = :pivot
     Quarter = :quarter
+    Round = :round
     Second = :second
     Select = :select
     Starts = :starts
@@ -53,17 +55,17 @@ class Token
     Where = :where
     With = :with
     Year = :year
-    
+
     ID = :ID
     INTEGER = :INTEGER
     DECIMAL = :DECIMAL
     STRING = :STRING
-    
+
     PLUS = :'+'
     MINUS = :'-'
     STAR = :'*'
     SLASH = :'/'
-    
+
     COMMA = :','
     LPAREN = :'('
     RPAREN = :')'
@@ -73,9 +75,9 @@ class Token
     GT = :'>'
     GTE = :'>='
     NEQ = :'!='
-    
+
     EOF = :'<EOF>'
-    
+
     attr_accessor :start
     attr_accessor :value
     attr_accessor :string

rgviz.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{rgviz}
-  s.version = "0.45"
+  s.version = "0.46"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ary Borenszweig"]

spec/rgviz/lexer_spec.rb

@@ -9,14 +9,14 @@ def self.it_lexes_keyword(str, token_value)
       tok = lex.next_token
       tok.value.should == token_value
     end
-    
+
     it "lexes #{str} upcase" do
       lex = Lexer.new str.upcase
       tok = lex.next_token
       tok.value.should == token_value
     end
   end
-  
+
   def self.it_lexes_id(str, id = str)
     it "lexes identifier #{str}" do
       lex = Lexer.new str
@@ -25,7 +25,7 @@ def self.it_lexes_id(str, id = str)
       tok.string.should == id
     end
   end
-  
+
   def self.it_lexes_string(str, id = str)
     it "lexes string #{str}" do
       lex = Lexer.new str
@@ -34,15 +34,15 @@ def self.it_lexes_string(str, id = str)
       tok.string.should == id
     end
   end
-  
+
   def self.it_lexes_token(str, token_value)
     it "lexes #{str}" do
       lex = Lexer.new str
       tok = lex.next_token
       tok.value.should == token_value
     end
   end
-  
+
   def self.it_lexes_integer(str, number)
     it "lexes #{str}" do
       lex = Lexer.new str
@@ -51,7 +51,7 @@ def self.it_lexes_integer(str, number)
       tok.number.should == number
     end
   end
-  
+
   def self.it_lexes_decimal(str, number)
     it "lexes #{str}" do
       lex = Lexer.new str
@@ -60,15 +60,15 @@ def self.it_lexes_decimal(str, number)
       tok.number.should == number
     end
   end
-  
+
   def self.it_lexes_eof(str)
     it "lexes eof #{str}" do
       lex = Lexer.new str
       tok = lex.next_token
       tok.value.should == Token::EOF
     end
   end
-  
+
   def self.it_lexes_error(str)
     it "lexes error #{str}" do
       lex = Lexer.new "x#{str}"
@@ -78,7 +78,7 @@ def self.it_lexes_error(str)
       lambda { lex.next_token }.should raise_error(ParseException)
     end
   end
-  
+
   it_lexes_keyword 'and', Token::And
   it_lexes_keyword 'asc', Token::Asc
   it_lexes_keyword 'avg', Token::Avg
@@ -130,7 +130,7 @@ def self.it_lexes_error(str)
   it_lexes_keyword 'where', Token::Where
   it_lexes_keyword 'with', Token::With
   it_lexes_keyword 'year', Token::Year
-  
+
   it_lexes_id 'selected'
   it_lexes_id '  selected  ', 'selected'
   it_lexes_id '`selected`', 'selected'
@@ -139,12 +139,12 @@ def self.it_lexes_error(str)
   it_lexes_id 'hello_123_bye'
   it_lexes_string "'hello world'", "hello world"
   it_lexes_string '"hello world"', "hello world"
-  
+
   it_lexes_token '+', Token::PLUS
   it_lexes_token '-', Token::MINUS
   it_lexes_token '*', Token::STAR
   it_lexes_token '/', Token::SLASH
-  
+
   it_lexes_token ',', Token::COMMA
   it_lexes_token '(', Token::LPAREN
   it_lexes_token ')', Token::RPAREN
@@ -155,19 +155,21 @@ def self.it_lexes_error(str)
   it_lexes_token '>=', Token::GTE
   it_lexes_token '!=', Token::NEQ
   it_lexes_token '<>', Token::NEQ
-  
+
   it_lexes_integer '1', 1
   it_lexes_integer '0123', 123
   it_lexes_integer '45678791230', 45678791230
   it_lexes_decimal '123.456', 123.456
   it_lexes_decimal '.456', 0.456
-  
+
   it_lexes_eof ''
   it_lexes_eof "   \t\n\r"
-  
+
   it_lexes_error '!'
   it_lexes_error '?'
   it_lexes_error ':'
 
   it_lexes_keyword 'concat', Token::Concat
+  it_lexes_keyword 'round', Token::Round
+  it_lexes_keyword 'floor', Token::Floor
 end

spec/rgviz/memory_executor_spec.rb

@@ -95,6 +95,10 @@ def self.it_processes_single_select_column(query, id, type, value, label, test_o
   it_processes_single_select_column "minute(datetime '2010-01-02 10:11:12')", 'c0', :number, 11, "minute(datetime '2010-01-02 10:11:12')"
   it_processes_single_select_column "second(datetime '2010-01-02 10:11:12')", 'c0', :number, 12, "second(datetime '2010-01-02 10:11:12')"
   it_processes_single_select_column "quarter(datetime '2010-04-02 10:11:12')", 'c0', :number, 2, "quarter(datetime '2010-04-02 10:11:12')"
+  it_processes_single_select_column "round(1.2)", 'c0', :number, 1, "round(1.2)", :extensions => true
+  it_processes_single_select_column "round(1.9)", 'c0', :number, 2, "round(1.9)", :extensions => true
+  it_processes_single_select_column "floor(1.2)", 'c0', :number, 1, "floor(1.2)", :extensions => true
+  it_processes_single_select_column "floor(1.9)", 'c0', :number, 1, "floor(1.9)", :extensions => true
   it_processes_single_select_column "lower('FOO')", 'c0', :string, 'foo', "lower('FOO')"
   it_processes_single_select_column "upper('foo')", 'c0', :string, 'FOO', "upper('foo')"
   it_processes_single_select_column "toDate(date '2010-10-12')", 'c0', :date, '2010-10-12', "toDate(date '2010-10-12')"