hipster_sql_to_hbase 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e9b6ec47f4bf7ea5891b324f89503e45cf8c3eb
-  data.tar.gz: c5e995d9ff7c8cf4518a9721c799316ce991bcad
+  metadata.gz: c8f7de19de530e43d65fbb34022c20b589158c99
+  data.tar.gz: 2f618ebe82db8ccc67f78a35448c981a50f1b97b
 SHA512:
-  metadata.gz: 69e228786d1539ea179445b1b73160d109fe111348748cbd761790a3ec38f7a4199351023895aeb2322dd96ad5899dc4565167524de8464fc624ce9d0898742d
-  data.tar.gz: 01d0174443732c50f334f6d145f80a2d1d5e0b1f5eb3915311d6afeb39a1c05201da54a0591ef884d1bf6f547c387b4223cb5f645feeeb315f7a650a799bf16d
+  metadata.gz: af120d262c539e082624bf1af5addbdbc8e29dbfd01162530585ba30ffc88ee54e2b1d643d17b2c907b6e932ade7587e4b539adaf73e5c9cb29a4db09eec8acc
+  data.tar.gz: 41223aa5cd25db917af38b0cc4766a4716a6026a21f44e9449ec1b959820fddc1243ec395992fd69bc9646047bb4c37c1439e3846c9254bad6addbbda2b7103d

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.2

data/hipster_sql_to_hbase.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "hipster_sql_to_hbase"
-  s.version = "0.2.0"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jean Lescure"]

data/lib/hipster_sql_to_hbase.rb

@@ -143,7 +143,13 @@ module HipsterSqlToHbase
     #
     # === Note: the main difference between **parse_tree** and **parse_hash** is that a **ResultTree** can be further converted to Thrift calls while a **Hash** cannot.
     def parse_tree(string)
-      HipsterSqlToHbase::ResultTree.new(parse_hash(string))
+      parsed_hash = parse_hash(string)
+      
+      if parsed_hash.nil?
+        nil
+      else
+        HipsterSqlToHbase::ResultTree.new(parsed_hash)
+      end
     end
     
     # Generate a <b>HipsterSqlToHbase</b>::<b>ThriftCallGroup</b> from a valid, SQL string.

data/lib/sql_parser/sql_create_table.treetop

@@ -56,6 +56,7 @@ grammar SQLCreateTable
   rule optional_column_feature
     optional_primary_key /
     optional_auto_increment /
+    optional_default /
     optional_not_null
   end
   
@@ -65,6 +66,12 @@ grammar SQLCreateTable
     SPACES "primary" SPACES "key"
   end
   
+  rule optional_default
+    SPACES "DEFAULT" SPACES (quoted_string / NULL_KEYWORD / MINUS_OR_DIGIT+)
+    /
+    SPACES "default" SPACES (quoted_string / NULL_KEYWORD / MINUS_OR_DIGIT+)
+  end
+  
   rule optional_auto_increment
     SPACES "AUTO_INCREMENT"
     /

data/lib/sql_parser/sql_from_clause.treetop

@@ -1,5 +1,4 @@
 grammar SQLFromClause
-  include SQLPrimitives
   include SQLRowSupport
 
   rule from
@@ -9,4 +8,10 @@ grammar SQLFromClause
       end
     }
   end
+  
+  rule from_or_empty
+    from
+    /
+    EMPTY_STRING
+  end
 end

data/lib/sql_parser/sql_primitives.treetop

@@ -43,6 +43,22 @@ grammar SQLPrimitives
     }
   end
 
+  rule string
+    STRING_CHARS+ {
+      def eval
+        text_value
+      end
+    }
+  end
+
+  rule column_string
+    STRING_CHARS_W_NON_XCLUSIVE_NUMS+ {
+      def eval
+        text_value.downcase
+      end
+    }
+  end
+
   rule backtick_string
     BACKTICK string BACKTICK {
       def eval
@@ -51,10 +67,10 @@ grammar SQLPrimitives
     }
   end
 
-  rule string
-    STRING_CHARS+ {
+  rule backtick_column_string
+    BACKTICK column_string BACKTICK {
       def eval
-        text_value
+        column_string.eval
       end
     }
   end
@@ -64,7 +80,15 @@ grammar SQLPrimitives
   end
 
   rule integer
-    MINUS_OR_DIGIT DIGIT* {
+    DASH? DIGIT* {
+      def eval
+        text_value.to_i
+      end
+    }
+  end
+  
+  rule positive_integer
+    DIGIT* {
       def eval
         text_value.to_i
       end
@@ -72,7 +96,7 @@ grammar SQLPrimitives
   end
 
   rule float
-    integer "." integer {
+    integer "." positive_integer {
       def eval
         text_value.to_f
       end

data/lib/sql_parser/sql_row_support.treetop

@@ -2,39 +2,76 @@ grammar SQLRowSupport
   include SQLPrimitives
 
   rule one_or_more_table_names
-    table_name "," SPACE one_or_more_table_names {
+    table_name COMMA SPACES one_or_more_table_names {
       def eval
         [table_name.eval, one_or_more_table_names.eval]
       end
     } 
     / 
-    table_name
+    EMPTY_STRING table_name {
+      def eval
+        [table_name.eval]
+      end
+    }
   end
-
-  rule one_or_more_column_names_with_sort
-    one_column_name_with_sort "," SPACE one_or_more_column_names {
+  
+  rule one_or_more_numbers
+    number optional_spaces COMMA optional_spaces one_or_more_numbers {
       def eval
-        result1, result2 = one_column_name.eval, one_or_more_column_names.eval
+        result1, result2 = number.eval, one_or_more_numbers.eval
         [result1, result2].flatten
       end
     }
-    / 
-    one_column_name_with_sort
+    /
+    EMPTY_STRING number {
+      def eval
+        [number.eval]
+      end
+    }
   end
-
-  rule one_or_more_column_names
-    one_column_name SPACE? "," SPACE? one_or_more_column_names {
+  
+  rule one_number_with_alias
+    number SPACES "AS" SPACES alias_column_name {
       def eval
-        result1, result2 = one_column_name.eval, one_or_more_column_names.eval
+        {
+          :number => number.eval,
+          :alias_hash => {
+            :number => number.eval,
+            :alias => alias_column_name.eval
+          }
+        }
+      end
+    }
+  end
+  
+  rule one_or_more_number_with_alias
+    one_number_with_alias optional_spaces COMMA optional_spaces one_or_more_number_with_alias {
+      def eval
+        result1, result2 = one_number_with_alias.eval, one_or_more_number_with_alias.eval
         [result1, result2].flatten
       end
     }
     / 
-    one_column_name
+    EMPTY_STRING one_number_with_alias {
+      def eval
+        [one_number_with_alias.eval]
+      end
+    }
   end
 
+  #rule one_or_more_column_names_with_sort
+  #  one_column_name_with_sort COMMA SPACES one_or_more_column_names {
+  #    def eval
+  #      result1, result2 = one_column_name.eval, one_or_more_column_names.eval
+  #      [result1, result2].flatten
+  #    end
+  #  }
+  #  / 
+  #  one_column_name_with_sort
+  #end
+
   rule one_column_name
-    table_name dot column_name {
+    table_name DOT column_name {
       def eval
         column_name.eval
       end
@@ -43,8 +80,68 @@ grammar SQLRowSupport
     column_name
   end
 
+  rule one_or_more_column_names
+    one_column_name optional_spaces COMMA optional_spaces one_or_more_column_names {
+      def eval
+        result1, result2 = one_column_name.eval, one_or_more_column_names.eval
+        [result1, result2].flatten
+      end
+    }
+    / 
+    EMPTY_STRING one_column_name {
+      def eval
+        [one_column_name.eval]
+      end
+    }
+  end
+  
+  rule one_column_name_with_alias
+    table_name DOT column_name SPACES "AS" SPACES alias_column_name {
+      def eval
+        {
+          :column => column_name.eval,
+          :alias_hash => {
+            :column => column_name.eval,
+            :alias => alias_column_name.eval
+          }
+        }
+      end
+    }
+    /
+    column_name SPACES "AS" SPACES alias_column_name {
+      def eval
+        {
+          :column => column_name.eval,
+          :alias_hash => {
+            :column => column_name.eval,
+            :alias => alias_column_name.eval
+          }
+        }
+      end
+    }
+  end
+  
+  rule one_or_more_column_name_with_alias
+    one_column_name_with_alias optional_spaces COMMA optional_spaces one_or_more_column_name_with_alias {
+      def eval
+        result1, result2 = one_column_name_with_alias.eval, one_or_more_column_name_with_alias.eval
+        [result1, result2].flatten
+      end
+    }
+    / 
+    EMPTY_STRING one_column_name_with_alias {
+      def eval
+        [one_column_name_with_alias.eval]
+      end
+    }
+  end
+
   rule column_name
-    backtick_string / column_string / all_columns
+    backtick_column_string / column_string / all_columns
+  end
+
+  rule alias_column_name
+    column_name
   end
   
   rule index_name
@@ -58,18 +155,6 @@ grammar SQLRowSupport
     string
   end
 
-  rule column_string
-    string {
-      def eval
-        text_value.downcase
-      end
-    }
-  end
-
-  rule dot
-    "." { def eval; "."; end }
-  end
-
   rule all_columns
     "*" { def eval; "*"; end }
   end

data/lib/sql_parser/sql_select.treetop

@@ -10,35 +10,29 @@ grammar SQLSelect
 
   rule select_expression
     select
-    from 
+    from_or_empty
     where_tree
     limit_condition_or_empty
     order_by_condition_or_empty
-    {
-      def eval
-        SelectExpression.new({
-          :string => self.text_value,
-
-          :select => select.eval,
-          :from   => from.eval,
-          :where  => where_tree.where_condition_or_empty.eval,
-          :limit  => limit_condition_or_empty.eval,
-          :order_by => order_by_condition_or_empty.eval
-        })
-      end
-      
+    {      
       def query_type
         :select
       end
       
       def tree
-        {
-          :select => select.columns,
-          :from   => from.tables,
-          :where  => where_tree.eval,
-          :limit  => limit_condition_or_empty.eval,
-          :order_by => order_by_condition_or_empty.eval
-        }
+        result = {}
+        
+        selectables = select.eval
+        
+        result[:limit] = limit_condition_or_empty.eval unless limit_condition_or_empty.eval.nil?
+        result[:order_by] = order_by_condition_or_empty.eval unless order_by_condition_or_empty.eval.nil?
+        result[:from] = from_or_empty.tables if defined? from_or_empty.tables
+        result[:where] = where_tree.eval unless where_tree.eval.nil?
+        result[:columns] = selectables[:columns] unless selectables[:columns].nil?
+        result[:numbers] = selectables[:numbers] unless selectables[:numbers].nil?
+        result[:aliases] = selectables[:aliases] unless selectables[:aliases].nil?
+        
+        result
       end
     }
   end

data/lib/sql_parser/sql_select_clause.treetop

@@ -1,17 +1,112 @@
 grammar SQLSelectClause
-  include SQLPrimitives
   include SQLRowSupport
 
   rule select
-    "SELECT" SPACES one_or_more_column_names optional_spaces { 
-       def columns
-         result = one_or_more_column_names.eval
-         if result.kind_of?(Array)
-           result
-         else
-           [result]
-         end
-       end 
+    "SELECT" SPACES selectable_list optional_spaces { 
+      def eval
+        result = selectable_list.eval
+        result
+      end 
+    }
+  end
+  
+  rule selectable_list
+    selectables optional_spaces COMMA selectable_list {
+      def eval
+        result = {}
+        one_result = selectables.eval
+        list_result = selectable_list.eval
+        
+        result[:columns] = []
+        result[:columns] += one_result[:columns] unless one_result[:columns].nil?
+        result[:columns] += list_result[:columns] unless list_result[:columns].nil?
+        result.delete(:columns) if result[:columns].empty?
+        
+        result[:numbers] = []
+        result[:numbers] += one_result[:numbers] unless one_result[:numbers].nil?
+        result[:numbers] += list_result[:numbers] unless list_result[:numbers].nil?
+        result.delete(:numbers) if result[:numbers].empty?
+        
+        result[:aliases] = []
+        result[:aliases] += one_result[:aliases] unless one_result[:aliases].nil?
+        result[:aliases] += list_result[:aliases] unless list_result[:aliases].nil?
+        result.delete(:aliases) if result[:aliases].empty?
+        
+        result
+      end
+    }
+    /
+    selectables
+  end
+  
+  rule selectables
+    selectable_columns_with_alias
+    /
+    selectable_columns
+    /
+    selectable_numbers_with_alias
+    /
+    selectable_numbers
+  end
+  
+  rule selectable_columns_with_alias
+    optional_spaces one_or_more_column_name_with_alias {
+      def eval
+        result = {
+          :columns => [],
+          :aliases => []
+        }
+        num_alias_pairs = one_or_more_column_name_with_alias.eval
+        
+        num_alias_pairs.each do |num_alias_pair|
+          result[:columns] << num_alias_pair[:column]
+          result[:aliases] << num_alias_pair[:alias_hash]
+        end
+        
+        result
+      end
+    }
+  end
+  
+  rule selectable_columns
+    optional_spaces one_or_more_column_names {
+      def eval
+        {
+          :columns => one_or_more_column_names.eval
+        }
+      end
+    }
+  end
+  
+  rule selectable_numbers_with_alias
+    optional_spaces one_or_more_number_with_alias {
+      def eval
+        result = {
+          :numbers => [],
+          :aliases => []
+        }
+        num_alias_pairs = one_or_more_number_with_alias.eval
+        
+        num_alias_pairs.each do |num_alias_pair|
+          result[:numbers] << num_alias_pair[:number]
+          result[:aliases] << num_alias_pair[:alias_hash]
+        end
+        
+        result
+      end
+    }
+  end
+  
+  rule selectable_numbers
+    optional_spaces one_or_more_numbers {
+      def eval
+        result_nums = one_or_more_numbers.eval
+        result_nums = [result_nums] unless result_nums.is_a? Array
+        
+        {
+          :numbers => result_nums
+        }
+      end
     }
   end
 end

data/lib/sql_parser/sql_tokens.treetop

@@ -44,17 +44,25 @@ grammar SQLTokens
   end
 
   rule BACKTICK
-    "`"
+    "`" { def eval; nil; end }
   end
   
   rule COMMA
     ","
   end
   
+  rule DOT
+    "." { def eval; "."; end }
+  end
+  
   rule STRING_CHARS
     [0-9a-zA-Z\$_:]
   end
   
+  rule VALID_NON_NUM_CHARS
+    [a-zA-Z\$_:]
+  end
+  
   rule ALPHA_CHARS
     [a-zA-Z]
   end
@@ -63,12 +71,12 @@ grammar SQLTokens
     [0-9]
   end
   
-  rule DASH
-    "-" { def eval; nil; end }
+  rule STRING_CHARS_W_NON_XCLUSIVE_NUMS
+    DIGIT* VALID_NON_NUM_CHARS+ DIGIT*
   end
   
-  rule MINUS_OR_DIGIT
-    DASH / DIGIT
+  rule DASH
+    "-" { def eval; nil; end }
   end
 
   rule REAL_KEYWORD

data/spec/hipster_sql_to_hbase_spec.rb

@@ -1,4 +1,7 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'sql_sentence_types'))
+
+require 'spec_helper'
 
 
 
@@ -63,11 +66,11 @@ describe "HipsterSqlToHbase.parse_tree method" do
       expect(response.class).to eq(HipsterSqlToHbase::ResultTree)
       expect(response[:query_type]).to eq(:select)
       expect(response[:query_hash].class).to eq(Hash)
-      expect(response[:query_hash][:select].class).to eq(Array)
-      expect(response[:query_hash][:select].length).to eq(1)
-      expect(response[:query_hash][:select][0]).to eq('user')
-      expect(response[:query_hash][:from].class).to eq(String)
-      expect(response[:query_hash][:from]).to eq('users')
+      expect(response[:query_hash][:columns].class).to eq(Array)
+      expect(response[:query_hash][:columns].length).to eq(1)
+      expect(response[:query_hash][:columns][0]).to eq('user')
+      expect(response[:query_hash][:from].class).to eq(Array)
+      expect(response[:query_hash][:from][0]).to eq('users')
       response[:query_hash][:where].should be_nil
       response[:query_hash][:limit].should be_nil
       response[:query_hash][:order].should be_nil
@@ -80,11 +83,11 @@ describe "HipsterSqlToHbase.parse_tree method" do
       expect(response.class).to eq(HipsterSqlToHbase::ResultTree)
       expect(response[:query_type]).to eq(:select)
       expect(response[:query_hash].class).to eq(Hash)
-      expect(response[:query_hash][:select].class).to eq(Array)
-      expect(response[:query_hash][:select].length).to eq(1)
-      expect(response[:query_hash][:select][0]).to eq('user')
-      expect(response[:query_hash][:from].class).to eq(String)
-      expect(response[:query_hash][:from]).to eq('users')
+      expect(response[:query_hash][:columns].class).to eq(Array)
+      expect(response[:query_hash][:columns].length).to eq(1)
+      expect(response[:query_hash][:columns][0]).to eq('user')
+      expect(response[:query_hash][:from].class).to eq(Array)
+      expect(response[:query_hash][:from][0]).to eq('users')
       response[:query_hash][:where].should be_nil
       response[:query_hash][:limit].should be_nil
       response[:query_hash][:order].should be_nil
@@ -97,11 +100,11 @@ describe "HipsterSqlToHbase.parse_tree method" do
       expect(response.class).to eq(HipsterSqlToHbase::ResultTree)
       expect(response[:query_type]).to eq(:select)
       expect(response[:query_hash].class).to eq(Hash)
-      expect(response[:query_hash][:select].class).to eq(Array)
-      expect(response[:query_hash][:select].length).to eq(1)
-      expect(response[:query_hash][:select][0]).to eq('user')
-      expect(response[:query_hash][:from].class).to eq(String)
-      expect(response[:query_hash][:from]).to eq('users')
+      expect(response[:query_hash][:columns].class).to eq(Array)
+      expect(response[:query_hash][:columns].length).to eq(1)
+      expect(response[:query_hash][:columns][0]).to eq('user')
+      expect(response[:query_hash][:from].class).to eq(Array)
+      expect(response[:query_hash][:from][0]).to eq('users')
       response[:query_hash][:where].should be_nil
       response[:query_hash][:limit].should be_nil
       response[:query_hash][:order].should be_nil

data/spec/spec_helper.rb

@@ -1,3 +1,2 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'hipster_sql_to_hbase'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hipster_sql_to_hbase
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Jean Lescure