hipster_sql_to_hbase 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8f7de19de530e43d65fbb34022c20b589158c99
-  data.tar.gz: 2f618ebe82db8ccc67f78a35448c981a50f1b97b
+  metadata.gz: 2a64e4c9a48c5328824939eb0c1e2f9298e8154c
+  data.tar.gz: 285e51b8f9508b1e657e9e6bbecca9c033a6291a
 SHA512:
-  metadata.gz: af120d262c539e082624bf1af5addbdbc8e29dbfd01162530585ba30ffc88ee54e2b1d643d17b2c907b6e932ade7587e4b539adaf73e5c9cb29a4db09eec8acc
-  data.tar.gz: 41223aa5cd25db917af38b0cc4766a4716a6026a21f44e9449ec1b959820fddc1243ec395992fd69bc9646047bb4c37c1439e3846c9254bad6addbbda2b7103d
+  metadata.gz: ff411219b4f4e9508346ead60e19bfb22905005584db758f1e16911755acfa3536e5995f478b587731704bf32e59516f3ab24f7efd496f7cc09358305bd945bd
+  data.tar.gz: f13efc205066e78011bc4e35728fcb5be5bb3126d5449b26853b01e9c284611c85e367ac376a41766e5d6830a4f2ecdcda0c33460279471aa58c063f06c95c39

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

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.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jean Lescure"]

data/lib/sql_parser/sql.treetop

@@ -9,6 +9,7 @@ grammar SQL
   include SQLShowCreate
   include SQLCreateTable
   include SQLCreateIndex
+  include SQLUpdate
 
   rule sql_statement
     select_expression     /
@@ -20,6 +21,7 @@ grammar SQL
     show_tables           /
     show_create           /
     create_table          /
-    create_index
+    create_index          /
+    update
   end
 end

data/lib/sql_parser/sql_insert.treetop

@@ -1,5 +1,4 @@
 grammar SQLInsert
-  include SQLPrimitives
   include SQLRowSupport
   include SQLHelpers
 

data/lib/sql_parser/sql_row_support.treetop

@@ -4,7 +4,8 @@ grammar SQLRowSupport
   rule 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]
+        result1, result2 = table_name.eval, one_or_more_table_names.eval
+        [result1, result2].flatten
       end
     } 
     / 
@@ -96,24 +97,12 @@ grammar SQLRowSupport
   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 {
+    one_column_name SPACES "AS" SPACES alias_column_name {
       def eval
         {
-          :column => column_name.eval,
+          :column => one_column_name.eval,
           :alias_hash => {
-            :column => column_name.eval,
+            :column => one_column_name.eval,
             :alias => alias_column_name.eval
           }
         }

data/lib/sql_parser/sql_select.treetop

@@ -12,8 +12,8 @@ grammar SQLSelect
     select
     from_or_empty
     where_tree
-    limit_condition_or_empty
     order_by_condition_or_empty
+    limit_condition_or_empty
     {      
       def query_type
         :select
@@ -24,16 +24,25 @@ grammar SQLSelect
         
         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?
+        where_tree_val = where_tree.eval
+        result[:where] = where_tree_val unless where_tree_val.nil?
+        
+        order_by_val = order_by_condition_or_empty.eval
+        result[:order_by] = order_by_val unless order_by_val.nil?
+        
+        limit_val = limit_condition_or_empty.eval
+        result[:limit] = limit_val unless limit_val.nil?
+        
+        result[:select] = selectables unless all_selectables_nil?(selectables)
         result[:aliases] = selectables[:aliases] unless selectables[:aliases].nil?
+        result[:from] = from_or_empty.tables if defined? from_or_empty.tables
         
         result
       end
+      
+      def all_selectables_nil?(selectables)
+        selectables[:columns].nil? && selectables[:numbers].nil?
+      end
     }
   end
 end

data/lib/sql_parser/sql_update.treetop

@@ -1,82 +1,66 @@
 grammar SQLUpdate
-
-  rule parts
-    update / simple_where_clause / assignment_list / assignment / quoted_string / text / identifier
-  end
+  include SQLRowSupport
+  include SQLWhereCondition
+  include SQLOrderByClause
+  include SQLLimit
+  include SQLHelpers
 
   rule update
-    "UPDATE" space identifier space "SET" space assignment_list space simple_where_clause {
-      def table_name
-        identifier.text_value
-      end
-      def id
-        simple_where_clause.id
-      end
-      def items
-        assignment_list.items
+    "UPDATE" SPACES (low_priority SPACES)? (ignore SPACES)? table_name SPACES
+    "SET" SPACES col_val_pairs 
+    where_tree 
+    order_by_condition_or_empty
+    limit_condition_or_empty {
+      def query_type
+        :update
       end
-    }
-  end
+      def tree
+        result = {
+          :update => table_name.eval,
+          :set => col_val_pairs.eval
+        }
 
-  rule simple_where_clause
-    "WHERE" space identifier space "=" space quoted_string {
-      def id
-        quoted_string.text_value
+        where_tree_val = where_tree.eval
+        result[:where] = where_tree_val unless where_tree_val.nil?
+        
+        order_by_val = order_by_condition_or_empty.eval
+        result[:order_by] = order_by_val unless order_by_val.nil?
+        
+        limit_val = limit_condition_or_empty.eval
+        result[:limit] = limit_val unless limit_val.nil?
+        
+        result
       end
     }
   end
-
-  rule assignment_list
-    a1:assignment space "," space a2:assignment_list {
-      def items
-        a1.items.merge(a2.items)
+  
+  rule col_val_pairs
+    col_val_pair optional_spaces COMMA optional_spaces col_val_pairs {
+      def eval
+        result1, result2 = col_val_pair.eval, col_val_pairs.eval
+        [result1,result2].flatten
       end
     }
     /
-    assignment
+    col_val_pair
   end
-
-  rule assignment
-    identifier space "=" space quoted_string {
-
-      def items
-        { key => value }
-      end
-
-      def key
-        identifier.text_value
-      end
-
-      def value
-        quoted_string.text_value
+  
+  rule col_val_pair
+    one_column_name optional_spaces "=" optional_spaces simple_primitive {
+      def eval
+        [{
+          :column => one_column_name.eval,
+          :value => simple_primitive.eval
+          }]
       end
     }
   end
-
-  rule quoted_string
-    "'" text "'" {
-      def text_value
-        text.text_value
-      end
-    }
-    /
-    "''" {
-      def text_value
-        ""
-      end
-    }
+  
+  rule low_priority
+    "LOW_PRIORITY"
   end
-
-  rule text
-    ( "''" / !"'" . )+
-  end
-
-  rule identifier
-    (!("'" / "=" / " ") .)+
+  
+  rule ignore
+    "IGNORE"
   end
-
-  rule space
-    ' '*
-  end
-
 end

data/spec/hipster_sql_to_hbase_spec.rb

@@ -3,8 +3,6 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'sql_sentence_types'))
 
 require 'spec_helper'
 
-
-
 describe "HipsterSqlToHbase.parse_syntax method" do 
   
   context "when parse_syntax is run against SELECT FROM query without table hierarchy or backticks" do
@@ -66,14 +64,14 @@ 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][: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][:select][:columns].class).to eq(Array)
+      expect(response[:query_hash][:select][:columns].length).to eq(1)
+      expect(response[:query_hash][:select][: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
+      expect(response[:query_hash][:where]).to be_nil
+      expect(response[:query_hash][:limit]).to be_nil
+      expect(response[:query_hash][:order]).to be_nil
     end
   end
   
@@ -83,14 +81,14 @@ 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][: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][:select][:columns].class).to eq(Array)
+      expect(response[:query_hash][:select][:columns].length).to eq(1)
+      expect(response[:query_hash][:select][: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
+      expect(response[:query_hash][:where]).to be_nil
+      expect(response[:query_hash][:limit]).to be_nil
+      expect(response[:query_hash][:order]).to be_nil
     end
   end
   
@@ -100,14 +98,14 @@ 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][: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][:select][:columns].class).to eq(Array)
+      expect(response[:query_hash][:select][:columns].length).to eq(1)
+      expect(response[:query_hash][:select][: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
+      expect(response[:query_hash][:where]).to be_nil
+      expect(response[:query_hash][:limit]).to be_nil
+      expect(response[:query_hash][:order]).to be_nil
     end
   end
   
@@ -156,7 +154,7 @@ describe "HipsterSqlToHbase.parse_tree method" do
   context "when query is only a lower-case 'select'" do
     let(:response) { HipsterSqlToHbase.parse_tree("select") }
     it "does not succeed" do
-      response.should be_nil
+      expect(response).to be_nil
     end
   end
   
@@ -167,7 +165,7 @@ describe "HipsterSqlToHbase.parse method" do
   context "when query is only a lower-case 'select'" do
     let(:response) { HipsterSqlToHbase.parse("select") }
     it "does not succeed" do
-      response.should be_nil
+      expect(response).to be_nil
     end
   end
   

metadata

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