oracle-sql-parser 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 809b6d47e50c4330d56e67f5b5e466280868e868
-  data.tar.gz: 85083da0a0d2743e599c3a8998b057e0ed807f0a
+  metadata.gz: 2ca85fca6a5a499cfd899ec639203fd2ec3cd499
+  data.tar.gz: ffa6d405cc453774b56b5c304835aff5e26aa41b
 SHA512:
-  metadata.gz: c019067407242c554ccc49f97401e99f9c896ab4369b637fcd93b8f67e65b6ad95dfc72d5ea47aaac7e8aefcb0d4c58a839825bc5c2c94a7b25d377df02599b2
-  data.tar.gz: 6911dd676c0398c238f42bd1d0e41443ed883d0a0eb70705ea0a9112b14f1876fe3bf29dbe19ca53a3cf11e7eb996e852cdd7bf320b1568a911315eda9a8ecce
+  metadata.gz: 4e104b3c6ffac399c5b022871c6305eae5b84cdba4a6b3a84a29d6b5a8ad197c428946c5ac3321491b98c3d6e985b09a13d1c910b5e6c92ca223d371e9e671b5
+  data.tar.gz: 39ee53de849e013c2a86399fd6780a201729b4fbd68f7c2e24ee76edca4b08fa914e97c933a1ecd7be9ba1dbbb80487e73636ab646fb8afab9bdebf75f5489ce

data/HISTORY.md

@@ -1,11 +1,24 @@
+<<<<<<< HEAD
+### next version
+* Syntax
+  * subquery https://github.com/jksy/sql_parser/issues/8
+    * "select col1 from table1 union select col2 from table2 union select col3 from table3"
+    * "select col1 from table1 union (select col2 from table2)"
+  * compound expression https://github.com/jksy/sql_parser/issues/8
+    * "select 1-1 from table1"
+* Broken changes
+  * select_list.
+    Ast::Array[ Ast::Ident[..], Ast::Ident[..]] Ast::Array[ Ast::SelectColumn[:expr => Ast::Ident[..]],...]
+
 ### 0.7.0
-* Enchancement
-  * added syntax table alias, like "select a.* from table1 a". https://github.com/jksy/sql_parser/issues/8
+* Syntax
+  * table alias, like "select a.* from table1 a". https://github.com/jksy/sql_parser/issues/8
 
 ### 0.6.0
 * Enchancement
   * added travis-ci
   * added oracle enhanced adapter query(select, includes, joins, where)
+* Syntax
   * added syntax for column_alias
 
 ### 0.5.1
@@ -17,17 +30,17 @@
   * added NumberLiteral#to_cecimal, TextLiteral#to_s
 
 ### 0.4.0
-* Enchancement
+* Bugfix
   * rename ParameternizedQuery#query -> ParameternizedQuery#to_sql
-  * added grammer
-    * union [all]
-    * intersect
-    * minus
-    * [inner|outer] join
-    * conditions
-      * floating point condition
-      * multiset condition
-      * is_of_type condition
+* Syntax
+  * union [all]
+  * intersect
+  * minus
+  * [inner|outer] join
+  * conditions
+    * floating point condition
+    * multiset condition
+    * is_of_type condition
 
 ### 0.3.0
 * Enchancement
@@ -42,7 +55,7 @@
   * refactor test cases
 
 ### 0.1.1
-* Enchancement
+* Syntax
   * support double-quoted identifer
 
 ### 0.1.0

data/README.md

@@ -33,23 +33,31 @@ end
 ast = syntax_tree.ast
 ```
 <pre>
-=&gt; #&lt;OracleSqlParser::Ast::SelectStatement
-  :subquery =&gt; #&lt;OracleSqlParser::Ast::Subquery
-    :query_block =&gt; #&lt;OracleSqlParser::Ast::QueryBlock
-      :hint =&gt; nil,
-      :modifier =&gt; nil,
-      :select_list =&gt; #&lt;OracleSqlParser::Ast::Array [
-        #&lt;OracleSqlParser::Ast::NumberLiteral {:value=&gt;"1"}&gt;
-      ]&gt;
-      ,
-      :select_sources =&gt; #&lt;OracleSqlParser::Ast::TableReference {:schema_name=&gt;nil, :table_name=&gt;#&lt;OracleSqlParser::Ast::Identifier {:name=&gt;"dual"}&gt;, :dblink=&gt;nil}&gt;,
-      :where_clause =&gt; nil,
-      :group_by_clause =&gt; nil,
-      :model_clause =&gt; nil}&gt;
+=&gt; #&lt;OracleSqlParser::Ast::SelectStatement {:subquery=&gt;#&lt;OracleSqlParser::Ast::Subquery
+  :has_parenthesis =&gt; nil,
+  :query_block =&gt; #&lt;OracleSqlParser::Ast::QueryBlock
+    :hint =&gt; nil,
+    :modifier =&gt; nil,
+    :select_list =&gt; #&lt;OracleSqlParser::Ast::Array [
+      #&lt;OracleSqlParser::Ast::SelectColumn
+        :expr =&gt; #&lt;OracleSqlParser::Ast::NumberLiteral {:value=&gt;"1"}&gt;,
+        :as =&gt; nil,
+        :c_alias =&gt; nil}&gt;
+
+    ]&gt;
     ,
-    :order_by_clause =&gt; nil}&gt;
+    :select_sources =&gt; #&lt;OracleSqlParser::Ast::Array [
+      #&lt;OracleSqlParser::Ast::TableReference {:schema_name=&gt;nil, :table_name=&gt;#&lt;OracleSqlParser::Ast::Identifier {:name=&gt;"dual"}&gt;, :dblink=&gt;nil, :subquery=&gt;nil, :table_alias=&gt;nil}&gt;
+    ]&gt;
+    ,
+    :where_clause =&gt; nil,
+    :group_by_clause =&gt; nil,
+    :model_clause =&gt; nil}&gt;
   ,
-  :for_update_clause =&gt; nil}&gt;
+  :subqueries =&gt; nil,
+  :subquery =&gt; nil,
+  :order_by_clause =&gt; nil}&gt;
+, :for_update_clause=&gt;nil}&gt;=> nil
 </pre>
 
 ```ruby

data/Rakefile

@@ -47,18 +47,29 @@ end
 
 
 def generate_parser_files(force = false)
-  sh "ruby lib/oracle-sql-parser/grammar/reserved_word_generator.rb"
+  word_generator = "lib/oracle-sql-parser/grammar/reserved_word_generator.rb"
+  output = "lib/oracle-sql-parser/grammar/reserved_word.treetop"
+  do_if_changed(word_generator, output, force) do
+    sh "ruby #{word_generator}"
+  end
+
   GRAMMAR_FILES.each do |f|
     tt(f, force)
   end
 end
 
 def tt(f, force = false)
-  output_file_name = "#{f.gsub(/\.treetop$/,'')}.rb"
+  output = "#{f.gsub(/\.treetop$/,'')}.rb"
+
+  do_if_changed(f, output, force) do
+    sh "tt #{f} -f -o #{output}"
+  end
+end
 
-  force = true unless File.exists?(output_file_name)
-  if force || File::Stat.new(f).mtime >= File::Stat.new(output_file_name).mtime
-    sh "tt #{f} -f -o #{output_file_name}"
+def do_if_changed(src, output, force = false, &block)
+  force = true unless File.exists?(output)
+  if force || File::Stat.new(src).mtime >= File::Stat.new(output).mtime
+    yield
   end
 end
 

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

@@ -7,6 +7,7 @@ require 'oracle-sql-parser/ast/base.rb'
 require 'oracle-sql-parser/ast/array.rb'
 require 'oracle-sql-parser/ast/hash.rb'
 require 'oracle-sql-parser/ast/select_statement.rb'
+require 'oracle-sql-parser/ast/select_column.rb'
 require 'oracle-sql-parser/ast/subquery.rb'
 require 'oracle-sql-parser/ast/query_block.rb'
 require 'oracle-sql-parser/ast/inner_cross_join_clause.rb'
@@ -40,6 +41,7 @@ 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/compound_expression.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'

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

@@ -0,0 +1,15 @@
+module OracleSqlParser::Ast
+  class CompoundExpression < Hash
+    def to_sql(options = {})
+      r = @ast.values_at(:left,
+                         :op,
+                         :right,
+                        ).map(&:to_sql)
+      if @ast[:has_parenthesis]
+        r.unshift('(')
+        r.push(')')
+      end
+      r.compact.join(' ')
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 module OracleSqlParser::Ast
   class CrossNaturalJoinClause < InnerCrossJoinClause
-    def to_sql
+    def to_sql(options = {})
       @ast.values_at(:table1, :cross, :natural, :inner, :join, :table2).
         compact.map(&:to_sql).join(' ')
     end

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

@@ -1,5 +1,5 @@
 module OracleSqlParser::Ast
-  class FunctionExpressoin < Hash
+  class FunctionExpression < Hash
     def to_sql(options = {})
       sql = []
       sql << @ast[:name].to_sql

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

@@ -1,6 +1,6 @@
 module OracleSqlParser::Ast
   class InnerJoinClause < InnerCrossJoinClause
-    def to_sql
+    def to_sql(options = {})
       @ast.values_at(:table1, :inner, :join, :table2, :on_or_using_clause).
            map(&:to_sql).compact.join(' ')
     end

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

@@ -4,7 +4,7 @@ module OracleSqlParser::Ast
       @ast[:table1] = value
     end
 
-    def to_sql
+    def to_sql(options = {})
       @ast.values_at(:table1, :natural, :join_type, :outer, :join, :table2, :on_or_using_clause).
         compact.map(&:to_sql).join(' ')
     end

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

@@ -5,9 +5,9 @@ module OracleSqlParser::Ast
         "select",
         @ast[:hint],
         @ast[:modifier],
-        @ast[:select_list].map(&:to_sql).join(','),
+        @ast[:select_list].to_sql(:separator => ','),
         "from",
-        @ast[:select_sources],
+        @ast[:select_sources].to_sql(:separator => ','),
         @ast[:where_clause],
         @ast[:group_by_clause],
         @ast[:model_clause]

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

@@ -0,0 +1,7 @@
+module OracleSqlParser::Ast
+  class SelectColumn < Hash
+    def to_sql(options = {})
+      @ast.values_at(:expr, :as, :c_alias).compact.map(&:to_sql).join(' ')
+    end
+  end
+end

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

@@ -1,9 +1,7 @@
 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
+      @ast.values_at(:subquery, :for_update_clause).compact.map(&:to_sql).join(' ')
     end
   end
 end

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

@@ -1,23 +1,15 @@
 module OracleSqlParser::Ast
   class Subquery < Hash
     def to_sql(options = {})
-      if @ast[:union]
-        [
-          @ast[:query_block1],
-          @ast[:union].map(&:to_sql).join(' '),
-          @ast[:query_block2],
-          @ast[:order_by_clause],
-        ].compact.map(&:to_sql).join(' ')
-      else
-        [
-          @ast[:query_block],
-          @ast[:order_by_clause]
-        ].compact.map(&:to_sql).join(' ')
+      result = @ast.values_at(:query_block,
+                              :subqueries,
+                              :subquery,
+                              :order_by_clause).map(&:to_sql)
+      if @ast[:has_parenthesis]
+        result.unshift('(')
+        result.push(')')
       end
-    end
-
-    def order_by_clause=(value)
-      @ast[:order_by_clause] = value
+      result.compact.map(&:to_sql).join(' ')
     end
   end
 end

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

@@ -8,8 +8,9 @@ module OracleSqlParser::Ast
     def to_sql(options = {})
       result = ''
       result += "#{@ast[:schema_name].to_sql}." if @ast[:schema_name]
-      result += @ast[:table_name].to_sql
+      result += @ast[:table_name].to_sql if @ast[:table_name]
       result += "@#{@ast[:dblink].to_sql}" if @ast[:dblink]
+      result += @ast[:subquery].to_sql if @ast[:subquery]
       result += " #{@ast[:table_alias].to_sql}" if @ast[:table_alias]
       result
     end

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

@@ -1,9 +1,8 @@
 module OracleSqlParser::Grammar
   grammar Delete
     rule delete_statement
-      delete_keyword space?
-      delete_from_clause space?
-      delete_condition:delete_condition?
+      delete_keyword space delete_from_clause
+      condition:(space delete_condition)?
       returning_clause:returning_clause? {
         def ast
           OracleSqlParser::Ast::DeleteStatement[
@@ -11,11 +10,15 @@ module OracleSqlParser::Grammar
             :where_clause => delete_condition.ast
           ]
         end
+
+        def delete_condition
+          condition.delete_condition if condition.respond_to? :delete_condition
+        end
       }
     end
 
     rule delete_from_clause
-      from_keyword space? delete_target {
+      from_keyword space delete_target {
         def ast
           delete_target.ast
         end
@@ -26,8 +29,8 @@ module OracleSqlParser::Grammar
       t:(
         table_reference /
         delete_target_subquery
-      ) space?
-      t_alias:t_alias? {
+      )
+      a:(space t_alias)? {
         def ast
           table_or_subquery = t.ast
           if table_or_subquery.instance_of? OracleSqlParser::Ast::DeleteTarget
@@ -39,6 +42,10 @@ module OracleSqlParser::Grammar
             ]
           end
         end
+
+        def t_alias
+          a.t_alias if a.respond_to? :t_alias
+        end
       }
     end
 
@@ -54,7 +61,7 @@ module OracleSqlParser::Grammar
     end
 
     rule delete_condition
-      where_keyword space?
+      where_keyword space
       where:(
         search_condition /
         delete_current_of

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

@@ -2,10 +2,10 @@ module OracleSqlParser::Grammar
   grammar Expression
     rule sql_expression
       ex:(
+        compound_expression /
         function_expression /
         case_expression /
         cursor_expression /
-        compound_expression /
         datetime_expression /
         interval_expression /
         object_access_expression /
@@ -13,14 +13,15 @@ module OracleSqlParser::Grammar
         model_expression /
         type_constructor_expression /
         simple_expression /
-        variable_expression)
-        alias_name:(space as_keyword space ident)?
-      {
+        variable_expression
+        ) {
         def ast
-          tree = ex.ast
-          tree[:as] = alias_name.try(:as_keyword).try(:ast)
-          tree[:alias] = alias_name.try(:ident).try(:ast)
-          tree
+          ex.ast
+#          super
+#          tree = ex.ast
+##          tree[:as] = alias_name.try(:as_keyword).try(:ast)
+#          tree[:alias] = alias_name.try(:ident).try(:ast)
+#          tree
         end
       }
     end
@@ -51,13 +52,63 @@ module OracleSqlParser::Grammar
       }
     end
 
+    rule not_compound_expressions
+      ex:(
+        function_expression /
+        case_expression /
+        cursor_expression /
+        datetime_expression /
+        interval_expression /
+        object_access_expression /
+        scalar_subquery_expression /
+        model_expression /
+        type_constructor_expression /
+        simple_expression /
+        variable_expression)
+      {
+        def ast
+          ex.ast
+        end
+      }
+    end
+
     rule compound_expression
-      'compound_expression' # not implemented
-#      (
-#        ('+' / '-' / prior_keyword) space? expr /
-#        (expr space? ('||' / '*' / '/' / '+' / '-') space? expr) /
-#        '(' space? expr space? ')'
-#      )
+      ex:(
+        left_parenthesis:'(' space? left:expr space? right_parenthesis:')' /
+        left:not_compound_expressions space? op:('*' / '/' / '+' / '-' / '||') space? right:expr /
+        !number_literal op:(prior_keyword / '-' / '+') space? right:expr
+      )
+
+        {
+          def ast
+            OracleSqlParser::Ast::CompoundExpression[
+              :has_parenthesis => ex.respond_to?(:left_parenthesis) ? true : nil,
+              :left => left.ast,
+              :op => op.ast,
+              :right => right.ast,
+            ]
+          end
+
+          def left
+            ex.left if ex.respond_to? :left
+          end
+
+          def not_compound_expressions
+            ex.not_compound_expressions if ex.respond_to? :not_compound_expressions
+          end
+
+          def op
+            ex.op if ex.respond_to? :op
+          end
+
+          def right
+            ex.right if ex.respond_to? :right
+          end
+
+          def right_parenthesis
+            ex.right_parenthesis if ex.respond_to? :right_parenthesis
+          end
+        }
     end
 
     rule case_expression
@@ -145,7 +196,7 @@ module OracleSqlParser::Grammar
     rule function_expression
       function_name space? '(' space? function_args:function_args? space? ')' {
         def ast
-          OracleSqlParser::Ast::FunctionExpressoin[
+          OracleSqlParser::Ast::FunctionExpression[
             :name => function_name.ast,
             :args => function_args.ast
           ]

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

@@ -134,6 +134,7 @@ module OracleSqlParser::Grammar
 
     rule table_reference
       t:(
+        &'(' space? subquery /
         schema_name:schema_name '.' table_name:table_name /
         table_name:table_name
       ) l:('@' dblink)? a:(space t_alias)? {
@@ -142,6 +143,7 @@ module OracleSqlParser::Grammar
             :schema_name => t.try(:schema_name).ast,
             :table_name => t.try(:table_name).ast,
             :dblink => l.try(:dblink).ast,
+            :subquery => t.try(:subquery).ast,
             :table_alias => a.try(:t_alias).ast,
           ]
         end

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

@@ -1,49 +1,63 @@
 module OracleSqlParser::Grammar
   grammar Select
     rule select_statement
-      subquery for_update_clause:for_update_clause? {
+      space? subquery for_update:(space for_update_clause)? space? {
         def ast
           OracleSqlParser::Ast::SelectStatement[
             :subquery => subquery.ast,
-            :for_update_clause => for_update_clause.ast]
+            :for_update_clause => for_update.try(:for_update_clause).ast
+          ]
         end
       }
     end
 
     rule subquery
       query:(
-        subquery_with_union /
-        subquery_only_query_block
+        left_parenthesis:'(' space? subquery space? right_parenthesis:')' /
+        query_block !(space union_or_intersect_or_minus) /
+        subqueries:subqueries_with_union
       )
-      space? order_by_clause:order_by_clause? {
+      order:(space order_by_clause)? {
         def ast
-          result = query.ast
-          result.order_by_clause = order_by_clause.ast
-          result
+          OracleSqlParser::Ast::Subquery[
+            :has_parenthesis => has_parenthesis,
+            :query_block => query_block.ast,
+            :subqueries => subqueries.ast,
+            :subquery => subquery.ast,
+            :order_by_clause => order.try(:order_by_clause).ast,
+          ]
+        end
+
+        def has_parenthesis
+          true if query.respond_to? :left_parenthesis
+        end
+
+        def query_block
+          query.query_block if query.respond_to? :query_block
+        end
+
+        def subqueries
+          query.subqueries if query.respond_to? :subqueries
+        end
+
+        def subquery
+          query.subquery if query.respond_to? :subquery
         end
       }
     end
 
-    rule subquery_only_query_block
-      '(' space? query_block:query_block space? ')' /
-      query_block:query_block {
+    rule subqueries_with_union
+      query_block space? more:(union_or_intersect_or_minus space? subquery)+
+      {
         def ast
-          OracleSqlParser::Ast::Subquery[
-            :query_block => query_block.ast
+          OracleSqlParser::Ast::Array[
+            query_block.ast,
+            *more_queries.map(&:ast),
           ]
         end
-      }
-    end
 
-    rule subquery_with_union
-      '(' query_block1:query_block space? union_or_intersect_or_minus space? query_block2:query_block ')' /
-      query_block1:query_block space? union_or_intersect_or_minus space? query_block2:query_block {
-        def ast
-          OracleSqlParser::Ast::Subquery[
-            :query_block1 => query_block1.ast,
-            :union => union_or_intersect_or_minus.ast,
-            :query_block2 => query_block2.ast
-            ]
+        def more_queries
+          more.elements.map{|e| [e.union_or_intersect_or_minus, e.subquery]}.flatten
         end
       }
     end
@@ -82,21 +96,21 @@ module OracleSqlParser::Grammar
       select_keyword space
       hint:hint?
       mod:(modifier:(all_keyword / distinct_keyword / unique_keyword) space)?
-      select_list space?
-      from_keyword space?
-      select_sources space?
-      where_clause:where_clause? space?
-      group_by_clause:group_by_clause? space?
-      model_clause:model_clause? space? {
+      select_list space
+      from_keyword
+      select:(space select_sources)?
+      where:(space where_clause)?
+      group:(space group_by_clause)?
+      model:(space model_clause)? {
         def ast
           OracleSqlParser::Ast::QueryBlock[
             :hint => hint.ast,
             :modifier => modifier.ast,
             :select_list => select_list.ast,
-            :select_sources => select_sources.ast,
-            :where_clause => where_clause.ast,
-            :group_by_clause => group_by_clause.ast,
-            :model_clause => model_clause.ast]
+            :select_sources => select.try(:select_sources).ast,
+            :where_clause => where.try(:where_clause).ast,
+            :group_by_clause => group.try(:group_by_clause).ast,
+            :model_clause => model.try(:model_clause).ast]
         end
 
         def modifier
@@ -106,9 +120,26 @@ module OracleSqlParser::Grammar
     end
 
     rule select_sources
+      select_source more:(space? ',' space? select_source)* {
+        def ast
+          OracleSqlParser::Ast::Array[
+            select_source.ast,
+            *more_select_sources.map(&:ast),
+          ]
+        end
+
+        def more_select_sources
+          more.elements.map(&:select_source)
+        end
+      }
+    end
+
+    rule select_source
       join_clause /
       '(' space? join_clause:join_clause space? ')' /
-      table_reference  {
+      table_reference /
+      subquery
+      {
         def ast
           if respond_to? :join_clause
             join_clause.ast
@@ -281,12 +312,11 @@ module OracleSqlParser::Grammar
     end
 
     rule for_update_clause
-      for_keyword space?
-      update_keyword space?
-      of:(of_keyword space for_update_clause_columns space?)?
+      for_keyword space update_keyword
+      of:(space of_keyword space for_update_clause_columns)?
       wait:(
-        w:wait_keyword space? time:integer /
-        w:nowait_keyword
+        space w:wait_keyword space time:integer /
+        space w:nowait_keyword
       )? {
         def ast
           OracleSqlParser::Ast::ForUpdateClause[
@@ -299,7 +329,7 @@ module OracleSqlParser::Grammar
     end
 
     rule for_update_clause_columns
-      for_update_clause_column more:(space? ',' space? more_for_update_clause_columns:for_update_clause_column)* {
+      for_update_clause_column more:(space? ',' space? for_update_clause_column)* {
         def ast
           OracleSqlParser::Ast::Array[
             for_update_clause_column.ast, *more_for_update_clause_columns.map(&:ast)
@@ -307,7 +337,7 @@ module OracleSqlParser::Grammar
         end
 
         def more_for_update_clause_columns
-          more.elements.map(&:more_for_update_clause_columns)
+          more.elements.map(&:for_update_clause_column)
         end
       }
     end
@@ -381,22 +411,21 @@ module OracleSqlParser::Grammar
     end
 
     rule select_list
-      select_one_column more_list:( space? ',' space? c:select_one_column space? )* {
+      select_one more_list:( space? ',' space? select_one)* {
         def ast
-          OracleSqlParser::Ast::Array[select_one_column.ast, *more_columns.map(&:ast)]
+          OracleSqlParser::Ast::Array[select_one.ast, *more_columns.map(&:ast)]
         end
 
         def more_columns
-          more_list.elements.map{|element| element.c}
+          more_list.elements.map(&:select_one)
         end
       }
     end
 
-    rule select_one_column
-      ( select_table /
-        expr /
+    rule select_one
+        select_table /
         select_column
-        ) {
+      {
         def ast
           super
         end
@@ -412,9 +441,25 @@ module OracleSqlParser::Grammar
     end
 
     rule select_column
-      sql_expression ( space ( as_keyword space )? c_alias )?  {
+      expr _alias:( space as:( as_keyword space )? c_alias )?  {
         def ast
-          sql_expression.ast
+          OracleSqlParser::Ast::SelectColumn[
+            :expr => expr.ast,
+            :as => as_keyword.ast,
+            :c_alias => c_alias.ast,
+          ]
+        end
+
+        def c_alias
+          if _alias.respond_to? :c_alias
+            _alias.c_alias
+          end
+        end
+
+        def as_keyword
+          if respond_to? :_alias and _alias.respond_to? :as
+            _alias.as.as_keyword
+          end
         end
       }
     end

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

@@ -1,3 +1,3 @@
 module OracleSqlParser
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/oracle-sql-parser.gemspec

@@ -26,4 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "activerecord", "~> 4.2"
   spec.add_development_dependency "activerecord-oracle_enhanced-adapter", "~> 1.6.0"
   spec.add_development_dependency "ruby-oci8", "~> 2.0"
+  spec.add_development_dependency "pry-byebug", "3.4.0" if RUBY_VERSION >= '2.0.0'
+  spec.add_development_dependency "colorize", "~> 0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oracle-sql-parser
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Junichiro Kasuya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-02 00:00:00.000000000 Z
+date: 2016-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -108,6 +108,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.4.0
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 description: SQL Parser for Oracle
 email:
 - junichiro.kasuya@gmail.com
@@ -126,6 +154,7 @@ files:
 - 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/compound_expression.rb
 - lib/oracle-sql-parser/ast/cross_natural_join_clause.rb
 - lib/oracle-sql-parser/ast/current_of.rb
 - lib/oracle-sql-parser/ast/delete_statement.rb
@@ -160,6 +189,7 @@ files:
 - lib/oracle-sql-parser/ast/regexp_condition.rb
 - lib/oracle-sql-parser/ast/rollup_cube_clause.rb
 - lib/oracle-sql-parser/ast/searched_case_expression.rb
+- lib/oracle-sql-parser/ast/select_column.rb
 - lib/oracle-sql-parser/ast/select_statement.rb
 - lib/oracle-sql-parser/ast/simple_case_expression.rb
 - lib/oracle-sql-parser/ast/simple_comparision_condition.rb