oracle-sql-parser 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82f6a4205d237428121e76ccf0673b91fa2593eb
-  data.tar.gz: c171a4f9d250597bb80c751fbe4d34a3b876d06e
+  metadata.gz: c837374a732fc2668270aeda336b61a01370e4bb
+  data.tar.gz: 7b3a68ffe18ef9433fdaed74261474e555d944a2
 SHA512:
-  metadata.gz: f893677527f57c266f24dac86b181eb25dbde97706e1dc9af5adc3f3a39184dbbd1ba9c6466878a6e643c5d43638d27ad2068a6ab676851306ed4781a65bae86
-  data.tar.gz: cfac1b47be19e92e10072fab6386e8edcd5494e61d201d3889aa9c3d27feb39de05e7158e0dbd2d33aa40d4331bb07df4b50e40de70866b0d6af880e9891506d
+  metadata.gz: 06d395ede2b2bd56ab772adb3fd648371a8725de851475afd7de5547c229feb8532bd732a9320d041b39ea3a20d104494829ac9142c4f8664c913d56525eec99
+  data.tar.gz: e2e5bf837cbf9a41066becb3ba9f3bb4b098005114d342a2b314b50021defea7a9999aeeae60ea05d9f31b90f4dd9a824eeb517f7e50bb0625d188eaa781d521

data/README.md

@@ -24,15 +24,14 @@ Or install it yourself as:
 query = "select 1 from dual"
 parser = OracleSqlParser::Grammar::GrammarParser.new
 syntax_tree = parser.parse query
-if syntax_tree
+if syntax_tree.nil?
   message = "\n#{query}\n" + " " * (parser.failure_column.to_i-1) + "*\n"
   raise parser.failure_reason + message
 end
 ast = syntax_tree.ast
 ```
 <pre>
-irb(main):008:0> ast
-=> #&lt;OracleSqlParser::Ast::SelectStatement
+=&gt; #&lt;OracleSqlParser::Ast::SelectStatement
   :subquery =&gt; #&lt;OracleSqlParser::Ast::Subquery
     :query_block =&gt; #&lt;OracleSqlParser::Ast::QueryBlock
       :hint =&gt; nil,
@@ -51,6 +50,13 @@ irb(main):008:0> ast
   :for_update_clause =&gt; nil}>
 </pre>
 
+```ruby
+ast.to_sql
+```
+
+<pre>
+=&gt; "select 1 from dual"
+</pre>
 
 ## Contributing
 

data/lib/oracle-sql-parser/ast.rb

@@ -25,6 +25,7 @@ require 'oracle-sql-parser/ast/order_by_clause.rb'
 require 'oracle-sql-parser/ast/order_by_clause_item.rb'
 require 'oracle-sql-parser/ast/update_statement.rb'
 require 'oracle-sql-parser/ast/update_set_column.rb'
+require 'oracle-sql-parser/ast/update_set_clause.rb'
 require 'oracle-sql-parser/ast/simple_case_expression.rb'
 require 'oracle-sql-parser/ast/searched_case_expression.rb'
 require 'oracle-sql-parser/ast/function_expression.rb'
@@ -32,7 +33,10 @@ require 'oracle-sql-parser/ast/current_of.rb'
 require 'oracle-sql-parser/ast/delete_statement.rb'
 require 'oracle-sql-parser/ast/delete_target.rb'
 require 'oracle-sql-parser/ast/insert_statement.rb'
+require 'oracle-sql-parser/ast/insert_values_clause.rb'
 require 'oracle-sql-parser/ast/identifier.rb'
 require 'oracle-sql-parser/ast/text_literal.rb'
 require 'oracle-sql-parser/ast/number_literal.rb'
+require 'oracle-sql-parser/ast/table_reference.rb'
+require 'oracle-sql-parser/ast/compound_condition.rb'
 require 'oracle-sql-parser/ast/keyword.rb'

data/lib/oracle-sql-parser/ast/array.rb

@@ -2,8 +2,16 @@ require 'forwardable'
 
 module OracleSqlParser::Ast
   class Array < Base
-    extend Forwardable
-    def_delegator :@ast, :each, :[]
+    include Enumerable
+
+    def each(&block)
+      @ast.each(&block)
+    end
+
+    def [](index)
+      @ast[index]
+    end
+
     def self.[](*values)
       self.new(*values)
     end
@@ -12,14 +20,14 @@ module OracleSqlParser::Ast
       @ast = args
     end
 
-    def to_sql
+    def to_sql(options = {:separator => ' '})
       @ast.map do |v|
         if v.respond_to? :to_sql
           v.to_sql
         else
           v.to_s
         end
-      end.compact.join(" ")
+      end.compact.join(options[:separator])
     end
 
     def remove_nil_values!

data/lib/oracle-sql-parser/ast/base.rb

@@ -2,12 +2,32 @@ def nil.ast
   nil
 end
 
-def nil.to_sql
+def nil.to_sql(options = {})
   nil
 end
 
+def nil.until_nil(&block)
+
+end
+
+unless Object.respond_to? :try
+  class Object
+    def try(name, *args)
+      if respond_to? name
+        send(name, *args)
+      else
+        nil
+      end
+    end
+
+    def until_nil(&block)
+      block.call(self)
+    end
+  end
+end
+
 class String
-  def to_sql
+  def to_sql(options ={})
     self
   end
 end
@@ -35,9 +55,9 @@ module OracleSqlParser::Ast
       raise "do not call ast method"
     end
 
-    def to_sql
+    def to_sql(options ={})
       if @ast.respond_to? :to_sql
-        @ast.to_sql
+        @ast.to_sql(options)
       else
         @ast.to_s
       end

data/lib/oracle-sql-parser/ast/between_condition.rb

@@ -1,4 +1,14 @@
 module OracleSqlParser::Ast
   class BetweenCondition < Hash
+    def to_sql(options = {})
+      [
+        @ast[:target],
+        @ast[:not],
+        "between",
+        @ast[:from],
+        "and",
+        @ast[:to]
+      ].map(&:to_sql).compact.join(' ')
+    end
   end
 end

data/lib/oracle-sql-parser/ast/compound_condition.rb

@@ -0,0 +1,7 @@
+module OracleSqlParser::Ast
+  class CompoundCondition < Base
+    def to_sql(options = {})
+      "(#{@ast.to_sql})"
+    end
+  end
+end

data/lib/oracle-sql-parser/ast/current_of.rb

@@ -1,4 +1,7 @@
 module OracleSqlParser::Ast
   class CurrentOf < Hash
+    def to_sql
+      "current_of #{@ast[:cursor].to_sql}"
+    end
   end
 end

data/lib/oracle-sql-parser/ast/delete_statement.rb

@@ -1,5 +1,12 @@
 module OracleSqlParser::Ast
   class DeleteStatement < Hash
-
+    def to_sql
+      sql = []
+      sql << "delete"
+      sql << "from"
+      sql << @ast[:target]
+      sql << @ast[:where_clause] if @ast[:where_clause]
+      sql.map(&:to_sql).join(' ')
+    end
   end
 end

data/lib/oracle-sql-parser/ast/delete_target.rb

@@ -1,6 +1,16 @@
 module OracleSqlParser::Ast
   class DeleteTarget < Hash
-
+    def to_sql
+      result = []
+      result << @ast[:table] if @ast[:table]
+      if @ast[:name].instance_of? Subquery
+        result << "(#{@ast[:name].to_sql})"
+      else
+        result << @ast[:name]
+      end
+      result << @ast[:alias] if @ast[:alias]
+      result.map(&:to_sql).join(" ")
+    end
   end
 end
 

data/lib/oracle-sql-parser/ast/exists_condition.rb

@@ -1,4 +1,7 @@
 module OracleSqlParser::Ast
   class ExistsCondition < Hash
+    def to_sql(options = {})
+      "exists (#{@ast[:target].to_sql})"
+    end
   end
 end

data/lib/oracle-sql-parser/ast/for_update_clause.rb

@@ -1,4 +1,11 @@
 module OracleSqlParser::Ast
   class ForUpdateClause < Hash
+    def to_sql(options = {})
+      sql = []
+      sql << "for update"
+      sql << "of #{@ast[:columns].to_sql(:separator => ',')}" if @ast[:columns]
+      sql << @ast.values_at(:wait, :time).map(&:to_sql).compact.join(" ") if @ast[:wait]
+      sql.join(" ")
+    end
   end
 end

data/lib/oracle-sql-parser/ast/function_expression.rb

@@ -1,4 +1,14 @@
 module OracleSqlParser::Ast
   class FunctionExpressoin < Hash
+    def to_sql(options = {})
+      sql = []
+      sql << @ast[:name].to_sql
+      sql << '('
+      if @ast[:args]
+        sql << @ast[:args].map(&:to_sql).join(',')
+      end
+      sql << ')'
+      sql.join()
+    end
   end
 end

data/lib/oracle-sql-parser/ast/group_by_clause.rb

@@ -1,4 +1,11 @@
 module OracleSqlParser::Ast
   class GroupByClause < Hash
+    def to_sql(options ={})
+      result = "group by #{@ast[:targets].to_sql(:separator => ',')}"
+      if @ast[:having]
+        result += " having #{@ast[:having].to_sql}"
+      end
+      result
+    end
   end
 end

data/lib/oracle-sql-parser/ast/hash.rb

@@ -22,14 +22,14 @@ module OracleSqlParser::Ast
       "}>\n"
     end
 
-    def to_sql
+    def to_sql(options = {:separator => ' '})
       @ast.map do |k,v|
         if v.respond_to? :to_sql
           v.to_sql
         else
           v.to_s
         end
-      end.compact.join(" ")
+      end.compact.join(options[:separator])
     end
 
     def self.[](value)

data/lib/oracle-sql-parser/ast/identifier.rb

@@ -8,7 +8,7 @@ module OracleSqlParser::Ast
       @ast[:quoted] == true
     end
 
-    def to_sql
+    def to_sql(options = {})
       if quoted?
         "\"#{@ast[:name]}\""
       else

data/lib/oracle-sql-parser/ast/in_condition.rb

@@ -1,4 +1,12 @@
 module OracleSqlParser::Ast
   class InCondition < Hash
+    def to_sql(options = {})
+      [
+        @ast[:target],
+        @ast[:not],
+        "in",
+        "(#{@ast[:values].to_sql(:separator => ",")})"
+      ].map(&:to_sql).compact.join(' ')
+    end
   end
 end

data/lib/oracle-sql-parser/ast/insert_statement.rb

@@ -1,5 +1,13 @@
 module OracleSqlParser::Ast
   class InsertStatement < Hash
-
+    def to_sql
+      result = []
+      result << "insert into"
+      result << @ast[:insert]
+      result << @ast[:alias]
+      result << "(#{@ast[:columns].map(&:to_sql).join(',')})" if @ast[:columns]
+      result << @ast[:values]
+      result.compact.map(&:to_sql).join(' ')
+    end
   end
 end

data/lib/oracle-sql-parser/ast/insert_values_clause.rb

@@ -0,0 +1,7 @@
+module OracleSqlParser::Ast
+  class InsertValuesClause < Array
+    def to_sql
+      "values(#{@ast.map(&:to_sql).join(',')})"
+    end
+  end
+end

data/lib/oracle-sql-parser/ast/like_condition.rb

@@ -1,4 +1,17 @@
 module OracleSqlParser::Ast
   class LikeCondition < Hash
+    def to_sql(options = {})
+      sql = [
+        @ast[:target],
+        @ast[:not],
+        @ast[:like],
+        @ast[:text],
+      ]
+      if @ast[:escape]
+        sql << "escape"
+        sql << @ast[:escape]
+      end
+      sql.map(&:to_sql).compact.join(' ')
+    end
   end
 end

data/lib/oracle-sql-parser/ast/null_condition.rb

@@ -1,4 +1,12 @@
 module OracleSqlParser::Ast
   class NullCondition < Hash
+    def to_sql(options = {})
+      [
+        @ast[:target],
+        "is",
+        @ast[:not],
+        "null"
+      ].compact.map(&:to_sql).join(' ')
+    end
   end
 end

data/lib/oracle-sql-parser/ast/order_by_clause.rb

@@ -1,4 +1,12 @@
 module OracleSqlParser::Ast
   class OrderByClause < Hash
+    def to_sql
+      sql = []
+      sql << "order"
+      @ast[:siblings].until_nil {|v| sql << v.to_sql}
+      sql << "by"
+      sql << @ast[:items].to_sql(:separator => ',')
+      sql.join(" ")
+    end
   end
 end

data/lib/oracle-sql-parser/ast/order_by_clause_item.rb

@@ -1,4 +1,9 @@
 module OracleSqlParser::Ast
   class OrderByClauseItem < Hash
+    def to_sql(options = {})
+      sql = @ast.values_at(:target, :asc).map(&:to_sql).compact.join(" ")
+      @ast[:nulls].until_nil {|v| sql += " nulls #{v.to_sql}"}
+      sql
+    end
   end
 end

data/lib/oracle-sql-parser/ast/query_block.rb

@@ -1,6 +1,6 @@
 module OracleSqlParser::Ast
   class QueryBlock < Hash
-    def to_sql
+    def to_sql(options = {})
       [
         "select",
         @ast[:hint],

data/lib/oracle-sql-parser/ast/regexp_condition.rb

@@ -1,4 +1,7 @@
 module OracleSqlParser::Ast
   class RegexpCondition < Hash
+    def to_sql(options = {})
+      "regexp_like(#{@ast[:target].to_sql},#{@ast[:regexp].to_sql})"
+    end
   end
 end

data/lib/oracle-sql-parser/ast/rollup_cube_clause.rb

@@ -1,4 +1,7 @@
 module OracleSqlParser::Ast
   class RollupCubeClause < Hash
+    def to_sql(options = {})
+      "#{@ast[:func_name].to_sql}(#{@ast[:args].to_sql(:separator => ',')})"
+    end
   end
 end

data/lib/oracle-sql-parser/ast/searched_case_expression.rb

@@ -1,8 +1,20 @@
 module OracleSqlParser::Ast
   class SearchedCaseExpression < Base
-
     def else_clause=(ast)
       @ast[:else_clause] = ast
     end
+
+    def to_sql(options = {})
+      sql = []
+      sql << 'case'
+      sql << 'when'
+      sql << @ast[:when_condition]
+      sql << 'then'
+      sql << @ast[:return_expr]
+      sql << 'else'
+      sql << @ast[:else_clause]
+      sql << 'end'
+      sql.compact.map(&:to_sql).join(' ')
+    end
   end
 end

data/lib/oracle-sql-parser/ast/select_statement.rb

@@ -1,5 +1,9 @@
 module OracleSqlParser::Ast
   class SelectStatement < Hash
-
+    def to_sql(options = {})
+      sql = @ast[:subquery].to_sql
+      sql += " #{@ast[:for_update_clause].to_sql}" if @ast[:for_update_clause]
+      sql
+    end
   end
 end

data/lib/oracle-sql-parser/ast/simple_case_expression.rb

@@ -3,5 +3,18 @@ module OracleSqlParser::Ast
     def else_clause=(ast)
       @ast[:else_clause] = ast
     end
+
+    def to_sql(options = {})
+      sql = []
+      sql << 'case'
+      sql << @ast[:condition]
+      sql << @ast[:when_clauses].map{|v| "when #{v.when_expr.to_sql} then #{v.return_expr.to_sql}"}.join(' ')
+      if @ast[:else_clause]
+        sql << 'else'
+        sql << @ast[:else_clause]
+      end
+      sql << 'end'
+      sql.compact.map(&:to_sql).join(' ')
+    end
   end
 end

data/lib/oracle-sql-parser/ast/simple_comparision_condition.rb

@@ -1,4 +1,7 @@
 module OracleSqlParser::Ast
   class SimpleComparisionCondition < Hash
+    def to_sql(options ={})
+      @ast.values_at(:left, :op, :right).map(&:to_sql).join(' ')
+    end
   end
 end

data/lib/oracle-sql-parser/ast/table_reference.rb

@@ -0,0 +1,16 @@
+module OracleSqlParser::Ast
+  class TableReference < Hash
+    
+    def inspect
+      "#<#{self.class.name} #{@ast.inspect}>"
+    end
+
+    def to_sql(options = {})
+      result = ''
+      result += "#{@ast[:schema_name].to_sql}." if @ast[:schema_name]
+      result += @ast[:table_name].to_sql
+      result += "@#{@ast[:dblink].to_sql}" if @ast[:dblink]
+      result
+    end
+  end
+end

data/lib/oracle-sql-parser/ast/text_literal.rb

@@ -3,5 +3,9 @@ module OracleSqlParser::Ast
     def inspect
       "#<#{self.class.name} #{@ast.inspect}>"
     end
+
+    def to_sql(options = {})
+      "'#{@ast[:value]}'"
+    end
   end
 end

data/lib/oracle-sql-parser/ast/update_set_clause.rb

@@ -0,0 +1,7 @@
+module OracleSqlParser::Ast
+  class UpdateSetClause < Array
+    def to_sql
+      "set #{@ast.map(&:to_sql).join(',')}"
+    end
+  end
+end

data/lib/oracle-sql-parser/ast/update_set_column.rb

@@ -1,4 +1,7 @@
 module OracleSqlParser::Ast
   class UpdateSetColumn < Hash
+    def to_sql
+      @ast.values_at(:column_name, :op, :value).map(&:to_sql).join(' ')
+    end
   end
 end

data/lib/oracle-sql-parser/ast/update_statement.rb

@@ -1,4 +1,12 @@
 module OracleSqlParser::Ast
   class UpdateStatement < Hash
+    def to_sql
+      result = []
+      result << "update"
+      result << @ast[:target]
+      result << @ast[:set]
+      result << @ast[:where_clause]
+      result.compact.map(&:to_sql).join(' ')
+    end
   end
 end

data/lib/oracle-sql-parser/ast/where_clause.rb

@@ -1,4 +1,7 @@
 module OracleSqlParser::Ast
   class WhereClause < Hash
+    def to_sql(options = {})
+      "where #{@ast[:condition].to_sql}"
+    end
   end
 end

data/lib/oracle-sql-parser/grammar/condition.treetop

@@ -169,7 +169,7 @@ module OracleSqlParser::Grammar
     rule compound_condition
       '(' logical_condition ')' {
         def ast
-          logical_condition.ast
+          OracleSqlParser::Ast::CompoundCondition[logical_condition.ast]
         end
       }
     end

data/lib/oracle-sql-parser/grammar/delete.treetop

@@ -8,7 +8,7 @@ module OracleSqlParser::Grammar
         def ast
           OracleSqlParser::Ast::DeleteStatement[
             :target => delete_from_clause.ast,
-            :condition => delete_condition.ast
+            :where_clause => delete_condition.ast
           ]
         end
       }
@@ -29,18 +29,26 @@ module OracleSqlParser::Grammar
       ) space?
       t_alias:t_alias? {
         def ast
-          OracleSqlParser::Ast::DeleteTarget[
-            :name => t.ast,
-            :alias => t_alias.ast
-          ]
+          table_or_subquery = t.ast
+          if table_or_subquery.instance_of? OracleSqlParser::Ast::DeleteTarget
+            table_or_subquery
+          else
+            OracleSqlParser::Ast::DeleteTarget[
+              :name => t.ast,
+              :alias => t_alias.ast
+            ]
+          end
         end
       }
     end
 
     rule delete_target_subquery
-      (table_keyword space)? '(' space? subquery space? ')' {
+      t:(table_keyword space)? '(' space? subquery space? ')' {
         def ast
-          subquery.ast
+          OracleSqlParser::Ast::DeleteTarget[
+            :table => t.try(:table_keyword).ast,
+            :name => subquery.ast
+          ]
         end
       }
     end
@@ -49,18 +57,18 @@ module OracleSqlParser::Grammar
       where_keyword space?
       where:(
         search_condition /
-        current_of
+        delete_current_of
       ) {
         def ast
-          where.ast
+          OracleSqlParser::Ast::WhereClause[:condition => where.ast]
         end
       }
     end
 
-    rule current_of
-      current_of_keyword space? cursor_name {
+    rule delete_current_of
+      current_of {
         def ast
-          cursor_name.ast
+          super
         end
       }
     end

data/lib/oracle-sql-parser/grammar/grammar.treetop

@@ -133,16 +133,26 @@ module OracleSqlParser::Grammar
     end
 
     rule table_reference
-      (
-        schema_name '.' table_name /
-        table_name
-      ) ('@' dblink)? {
+      t:(
+        schema_name:schema_name '.' table_name:table_name /
+        table_name:table_name
+      ) l:('@' dblink)? {
         def ast
-          if(!respond_to?(:schema_name) || !respond_to?(:dblink))
-            OracleSqlParser::Ast::Identifier.new(:name => text_value)
-          else
-            table_name.ast
-          end
+          OracleSqlParser::Ast::TableReference[
+            :schema_name => t.try(:schema_name).ast,
+            :table_name => t.try(:table_name).ast,
+            :dblink => l.try(:dblink).ast
+          ]
+        end
+      }
+    end
+
+    rule current_of
+      current_of_keyword space? cursor_name {
+        def ast
+          OracleSqlParser::Ast::CurrentOf[
+            :cursor => cursor_name.ast
+          ]
         end
       }
     end
@@ -166,7 +176,7 @@ module OracleSqlParser::Grammar
     rule sequence
       ident space? '.' space? n:(currval_keyword / nextval_keyword) {
         def ast
-          OracleSqlParser::Ast::Identifier[:value => text_value]
+          OracleSqlParser::Ast::Identifier[:name => text_value]
         end
       }
     end

data/lib/oracle-sql-parser/grammar/insert.treetop

@@ -24,6 +24,7 @@ module OracleSqlParser::Grammar
           insert_into_ast = insert_into_clause.ast
           OracleSqlParser::Ast::InsertStatement[
             :insert => insert_into_ast.table,
+            :alias => insert_into_ast.alias,
             :columns => insert_into_ast.column,
             :values => values.ast
           ]
@@ -38,11 +39,12 @@ module OracleSqlParser::Grammar
     rule insert_into_clause
       into_keyword space
       dml_table_expression_clause space
-      (t_alias space)?
+      table_alias:(t_alias space)?
       insert_column_names:insert_column_names? {
         def ast
           OracleSqlParser::Ast::Hash[
             :table => dml_table_expression_clause.ast,
+            :alias => try(:table_alias).try(:t_alias).ast,
             :column => insert_column_names.ast
           ]
         end
@@ -72,7 +74,10 @@ module OracleSqlParser::Grammar
     rule insert_values
       expr_or_default more:(space? ',' space? e:expr_or_default)* {
         def ast
-          OracleSqlParser::Ast::Array[expr_or_default.ast, *more_expr_or_defaults.map(&:ast)]
+          OracleSqlParser::Ast::InsertValuesClause[
+            expr_or_default.ast,
+            *more_expr_or_defaults.map(&:ast)
+          ]
         end
 
         def more_expr_or_defaults
@@ -90,13 +95,10 @@ module OracleSqlParser::Grammar
     end
 
     rule dml_table_expression_clause
-      (
-        schema_name '.' table_name '@' dblink /
-        schema_name '.' table_name /
-        table_name
-      ) {
+      table_reference
+      {
         def ast
-          OracleSqlParser::Ast::Identifier[:name => text_value]
+          super
         end
       }
     end

data/lib/oracle-sql-parser/grammar/select.treetop

@@ -162,30 +162,18 @@ module OracleSqlParser::Grammar
     rule for_update_clause
       for_keyword space?
       update_keyword space?
-      f:(of_keyword space for_update_clause_columns)?
-      wait:(wait_with_integer / nowait_keyword)? {
+      of:(of_keyword space for_update_clause_columns space?)?
+      wait:(
+        w:wait_keyword space? time:integer / 
+        w:nowait_keyword
+      )? {
         def ast
           OracleSqlParser::Ast::ForUpdateClause[
-            :columns => for_update_clause_columns.ast,
-            :wait => wait.ast
+            :columns => of.try(:for_update_clause_columns).ast,
+            :wait => wait.try(:w).ast,
+            :time => wait.try(:time).ast
           ].remove_nil_values!
         end
-
-        def for_update_clause_columns
-          if f.respond_to? :for_update_clause_columns
-            f.for_update_clause_columns
-          else
-            nil
-          end
-        end
-      }
-    end
-
-    rule wait_with_integer
-      wait_keyword space? integer {
-        def ast
-          integer.ast
-        end
       }
     end
 

data/lib/oracle-sql-parser/grammar/update.treetop

@@ -42,17 +42,11 @@ module OracleSqlParser::Grammar
     end
 
     rule update_set_clause
-      set_keyword space update_target_columns space? {
+      set_keyword space update_target_column  more:(space? ',' space? c:update_target_column)* {
         def ast
-          update_target_columns.ast
-        end
-      }
-    end
-
-    rule update_target_columns
-      update_target_column more:(space? ',' space? c:update_target_column)* {
-        def ast
-          OracleSqlParser::Ast::Array[update_target_column.ast, *more_update_target_columns.map(&:ast)]
+          OracleSqlParser::Ast::UpdateSetClause[
+            update_target_column.ast, *more_update_target_columns.map(&:ast)
+          ]
         end
 
         def more_update_target_columns
@@ -61,6 +55,18 @@ module OracleSqlParser::Grammar
       }
     end
 
+#    rule update_target_columns
+#      update_target_column more:(space? ',' space? c:update_target_column)* {
+#        def ast
+#          OracleSqlParser::Ast::Array[update_target_column.ast, *more_update_target_columns.map(&:ast)]
+#        end
+#
+#        def more_update_target_columns
+#          more.elements.map(&:c)
+#        end
+#      }
+#    end
+
     rule update_target_column
       column_name space? op:'=' space? sql_expression {
         def ast
@@ -93,11 +99,9 @@ module OracleSqlParser::Grammar
     end
 
     rule update_current_of
-      current_of_keyword space? cursor_name {
+      current_of {
         def ast
-          OracleSqlParser::Ast::CurrentOf[
-            :cursor_name => cursor_name.ast
-          ]
+          super
         end
       }
     end

data/lib/oracle-sql-parser/version.rb

@@ -1,3 +1,3 @@
 module OracleSqlParser
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oracle-sql-parser
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Junichiro Kasuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,6 +99,7 @@ files:
 - lib/oracle-sql-parser/ast/array.rb
 - lib/oracle-sql-parser/ast/base.rb
 - lib/oracle-sql-parser/ast/between_condition.rb
+- lib/oracle-sql-parser/ast/compound_condition.rb
 - lib/oracle-sql-parser/ast/current_of.rb
 - lib/oracle-sql-parser/ast/delete_statement.rb
 - lib/oracle-sql-parser/ast/delete_target.rb
@@ -110,6 +111,7 @@ files:
 - lib/oracle-sql-parser/ast/identifier.rb
 - lib/oracle-sql-parser/ast/in_condition.rb
 - lib/oracle-sql-parser/ast/insert_statement.rb
+- lib/oracle-sql-parser/ast/insert_values_clause.rb
 - lib/oracle-sql-parser/ast/keyword.rb
 - lib/oracle-sql-parser/ast/like_condition.rb
 - lib/oracle-sql-parser/ast/logical_condition.rb
@@ -125,7 +127,9 @@ files:
 - lib/oracle-sql-parser/ast/simple_case_expression.rb
 - lib/oracle-sql-parser/ast/simple_comparision_condition.rb
 - lib/oracle-sql-parser/ast/subquery.rb
+- lib/oracle-sql-parser/ast/table_reference.rb
 - lib/oracle-sql-parser/ast/text_literal.rb
+- lib/oracle-sql-parser/ast/update_set_clause.rb
 - lib/oracle-sql-parser/ast/update_set_column.rb
 - lib/oracle-sql-parser/ast/update_statement.rb
 - lib/oracle-sql-parser/ast/where_clause.rb