oracle-sql-parser 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c22d14e6cc145a7909642ce9fbf5ee1ed4505dce
-  data.tar.gz: bcbf3e19c992400efb172bc4991cd10cae160b03
+  metadata.gz: 06f11ebfa70f31aa92b69ef030d96237fc3260da
+  data.tar.gz: cbed0b80bfeb24be973d852c87746a982a7b5c6a
 SHA512:
-  metadata.gz: 26aa6a1d48cae2f2d7e75cc1913fcdd55bdd423a3d90136978d490d466e118a8e573759c80ce5217ebc8fefe18338360f053b2fd98aecb713dfcf351574ffaf9
-  data.tar.gz: 2ea9c404658076bc7c69a1c9ac74ed7b59a365ba738ac78364b400a8cfd90a09485996900a0e14809469c8915998e51e071990cc51eae8967b33c7889c266fb8
+  metadata.gz: 686cb870a07ec984d265515e38a65fa8d106ded9e65c92d2e1bf256940bbde33f908d26a533da1de96b97867ca5cfaf6b89f566659a5587fd59622dc3b45f117
+  data.tar.gz: 4c39e070b5d14881aaa806d32f17cab0e3f6adb7393f35bb93126f6a9b5c5dd4e9c456dd726f877cbad251f81f245d6ec78a919db3ae4a0dba8a5f27bb282c6a

data/.gitignore

@@ -8,13 +8,16 @@
 /spec/reports/
 /tmp/
 lib/oracle-sql-parser/grammar/condition.rb
+lib/oracle-sql-parser/grammar/condition/*.rb
 lib/oracle-sql-parser/grammar/delete.rb
 lib/oracle-sql-parser/grammar/expression.rb
+lib/oracle-sql-parser/grammar/expression/*.rb
 lib/oracle-sql-parser/grammar/grammar.rb
 lib/oracle-sql-parser/grammar/insert.rb
 lib/oracle-sql-parser/grammar/reserved_word.rb
 lib/oracle-sql-parser/grammar/reserved_word.treetop
 lib/oracle-sql-parser/grammar/select.rb
+lib/oracle-sql-parser/grammar/select/*.rb
 lib/oracle-sql-parser/grammar/update.rb
 test/oracle_enhanced-adapter/connection_params.yml
 *.sw?

data/HISTORY.md

@@ -1,3 +1,9 @@
+### 0.9.0
+* Syntax
+  * added cursor expression
+  * added datetime expression
+  * added interval expression
+
 ### 0.8.1
 * Fix README.md
 

data/Rakefile

@@ -2,7 +2,7 @@ require "bundler/gem_tasks"
 require 'rake'
 require 'rake/testtask'
 
-GRAMMAR_FILES = FileList['lib/oracle-sql-parser/grammar/*.treetop']
+GRAMMAR_FILES = FileList['lib/oracle-sql-parser/grammar/**/*.treetop']
 
 desc "generate parser files"
 task :gen do
@@ -30,16 +30,8 @@ end
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = FileList[
-                    'test/grammar/select_test.rb',
-                    'test/grammar/update_test.rb',
-                    'test/grammar/expression_test.rb',
-                    'test/grammar/condition_test.rb',
-                    'test/grammar/delete_test.rb',
-                    'test/grammar/insert_test.rb',
-                    'test/ast/replace_literal_test.rb',
-                    'test/ast/number_literal_test.rb',
-                    'test/ast/text_literal_test.rb',
-                    'test/ast/text_literal_test.rb',
+                    'test/grammar/*_test.rb',
+                    'test/ast/*_test.rb',
                     'test/oracle_enhanced-adapter/select_test.rb'
                     ]
   t.verbose = true

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

@@ -17,7 +17,7 @@ require 'oracle-sql-parser/ast/on_clause.rb'
 require 'oracle-sql-parser/ast/using_clause.rb'
 require 'oracle-sql-parser/ast/cross_natural_join_clause.rb'
 require 'oracle-sql-parser/ast/where_clause.rb'
-require 'oracle-sql-parser/ast/simple_comparision_condition.rb'
+require 'oracle-sql-parser/ast/simple_comparison_condition.rb'
 require 'oracle-sql-parser/ast/logical_condition.rb'
 require 'oracle-sql-parser/ast/like_condition.rb'
 require 'oracle-sql-parser/ast/regexp_condition.rb'
@@ -45,6 +45,10 @@ 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'
+require 'oracle-sql-parser/ast/cursor_expression.rb'
+require 'oracle-sql-parser/ast/datetime_expression.rb'
+require 'oracle-sql-parser/ast/interval_expression.rb'
+require 'oracle-sql-parser/ast/timezone_clause.rb'
 require 'oracle-sql-parser/ast/current_of.rb'
 require 'oracle-sql-parser/ast/delete_statement.rb'
 require 'oracle-sql-parser/ast/delete_target.rb'

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

@@ -0,0 +1,13 @@
+module OracleSqlParser::Ast
+  class CursorExpression < Hash
+    def to_sql(options = {})
+      [
+        @ast[:cursor],
+        '(',
+        @ast[:subquery],
+        ')',
+      ].map(&:to_sql).join
+    end
+  end
+end
+

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

@@ -0,0 +1,8 @@
+module OracleSqlParser::Ast
+  class DatetimeExpression < Hash
+    def to_sql(options = {})
+      @ast.values_at(:expr, :at, :local, :timezone).compact.map(&:to_sql).join(' ')
+    end
+  end
+end
+

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

@@ -0,0 +1,27 @@
+module OracleSqlParser::Ast
+  class IntervalExpression < Hash
+    def to_sql(options = {})
+      result = []
+      result << '('
+      result << @ast[:left]
+      result << '-'
+      result << @ast[:right]
+      result << ')'
+      result << (@ast[:day] || @ast[:year])
+      if @ast[:leading_field_precision]
+        result << '('
+        result << @ast[:leading_field_precision]
+        result << ')'
+      end
+      result << @ast[:to]
+      result << (@ast[:second] || @ast[:month])
+      if @ast[:fractional_second_precision]
+        result << '('
+        result << @ast[:fractional_second_precision]
+        result << ')'
+      end
+      result.compact.map(&:to_sql).join(' ')
+    end
+  end
+end
+

data/lib/oracle-sql-parser/ast/{simple_comparision_condition.rb → simple_comparison_condition.rb}

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

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

@@ -0,0 +1,8 @@
+module OracleSqlParser::Ast
+  class TimezoneClause < Hash
+    def to_sql(options = {})
+      @ast.values_at(:time, :zone, :expr).map(&:to_sql).join(' ')
+    end
+  end
+end
+

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

@@ -1,8 +1,32 @@
 module OracleSqlParser::Grammar
 end
 require "oracle-sql-parser/grammar/reserved_word.rb"
+require "oracle-sql-parser/grammar/expression/simple.rb"
+require "oracle-sql-parser/grammar/expression/compound.rb"
+require "oracle-sql-parser/grammar/expression/function.rb"
+require "oracle-sql-parser/grammar/expression/case.rb"
+require "oracle-sql-parser/grammar/expression/simple.rb"
+require "oracle-sql-parser/grammar/expression/cursor.rb"
+require "oracle-sql-parser/grammar/expression/datetime.rb"
+require "oracle-sql-parser/grammar/expression/interval.rb"
 require "oracle-sql-parser/grammar/expression.rb"
+require "oracle-sql-parser/grammar/condition/comparison.rb"
+require "oracle-sql-parser/grammar/condition/floating_point.rb"
+require "oracle-sql-parser/grammar/condition/multiset.rb"
+require "oracle-sql-parser/grammar/condition/pattern_matching.rb"
+require "oracle-sql-parser/grammar/condition/null.rb"
+require "oracle-sql-parser/grammar/condition/compound.rb"
+require "oracle-sql-parser/grammar/condition/between.rb"
+require "oracle-sql-parser/grammar/condition/exists.rb"
+require "oracle-sql-parser/grammar/condition/in.rb"
+require "oracle-sql-parser/grammar/condition/is_of_type.rb"
 require "oracle-sql-parser/grammar/condition.rb"
+require "oracle-sql-parser/grammar/select/group.rb"
+require "oracle-sql-parser/grammar/select/order.rb"
+require "oracle-sql-parser/grammar/select/join.rb"
+require "oracle-sql-parser/grammar/select/for_update.rb"
+require "oracle-sql-parser/grammar/select/union.rb"
+require "oracle-sql-parser/grammar/select/query_block.rb"
 require "oracle-sql-parser/grammar/select.rb"
 require "oracle-sql-parser/grammar/update.rb"
 require "oracle-sql-parser/grammar/delete.rb"

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

@@ -1,5 +1,16 @@
 module OracleSqlParser::Grammar
   grammar Condition
+    include OracleSqlParser::Grammar::Condition::Comparison
+    include OracleSqlParser::Grammar::Condition::FloatingPoint
+    include OracleSqlParser::Grammar::Condition::Multiset
+    include OracleSqlParser::Grammar::Condition::PatternMatching
+    include OracleSqlParser::Grammar::Condition::Null
+    include OracleSqlParser::Grammar::Condition::Compound
+    include OracleSqlParser::Grammar::Condition::Between
+    include OracleSqlParser::Grammar::Condition::Exists
+    include OracleSqlParser::Grammar::Condition::In
+    include OracleSqlParser::Grammar::Condition::IsOfType
+
     # where
     rule where_clause
       where_keyword space? logical_condition {
@@ -10,7 +21,7 @@ module OracleSqlParser::Grammar
     end
 
     rule condition
-      comparision_condition /
+      comparison_condition /
       floating_point_condition /
       model_condition /
       mutiset_condition /
@@ -54,301 +65,13 @@ module OracleSqlParser::Grammar
       }
     end
 
-    rule comparision_condition
-      (
-        simple_comparision_condition /
-        group_comparision_condition
-      ) {
-        def ast
-          super
-        end
-      }
-    end
-
-    rule group_comparision_condition
-      'group_comparision_condition'
-    end
-
-    rule simple_comparision_condition
-      (
-        left:expr space? op:('!=' / '^=' / '<>' / '>=' / '<=' / '=' / '>' / '<') space? right:expr /
-        '(' space? left:exprs space? ')' op:space? ('!=' / '^=' / '<>' / '=') space? '(' space? right:subquery space? ')'
-      ) {
-        def ast
-          OracleSqlParser::Ast::SimpleComparisionCondition[
-            :left => left.ast,
-            :op => op.text_value,
-            :right => right.ast]
-        end
-      }
-    end
-
-    rule floating_point_condition
-      expr space? is_keyword space? not_keyword:not_keyword? space?
-      value:(
-        nan_keyword /
-        infinite_keyword
-      ) {
-        def ast
-          OracleSqlParser::Ast::FloatingPointCondition[
-            :target => expr.ast,
-            :is => is_keyword.ast,
-            :not => not_keyword.ast,
-            :value => value.ast
-          ]
-        end
-      }
-    end
-
     rule model_condition
       'model_condition'
     end
 
-    rule mutiset_condition
-      is_a_set_condition /
-      is_empty_condition /
-      member_condition /
-      submultiset_condition {
-        def ast
-          super
-        end
-      }
-    end
-
-    rule nested_table
-      ident {
-        def ast
-          super
-        end
-      }
-    end
-
-    rule is_a_set_condition
-      nested_table space? is_keyword space? not_keyword:not_keyword? space? a:[Aa] space? set_keyword {
-        def ast
-          OracleSqlParser::Ast::IsASetCondition[
-            :target => nested_table.ast,
-            :is => is_keyword.ast,
-            :not => not_keyword.ast,
-            :a => OracleSqlParser::Ast::Keyword[:name => a.text_value],
-            :set => set_keyword.ast
-          ]
-        end
-      }
-    end
-
-    rule is_empty_condition
-      nested_table space? is_keyword space? not_keyword:not_keyword? space? empty_keyword {
-        def ast
-          OracleSqlParser::Ast::IsEmptyCondition[
-            :target => nested_table.ast,
-            :is => is_keyword.ast,
-            :not => not_keyword.ast,
-            :empty => empty_keyword.ast
-          ]
-        end
-      }
-    end
-
-    rule member_condition
-      expr space? not_keyword:not_keyword? space? member_keyword space? of_keyword space? nested_table {
-        def ast
-          OracleSqlParser::Ast::MemberCondition[
-            :target => expr.ast,
-            :not => not_keyword.ast,
-            :member => member_keyword.ast,
-            :of => of_keyword.ast,
-            :table => nested_table.ast
-          ]
-        end
-      }
-    end
-
-    rule submultiset_condition
-      table1:nested_table space?
-      not_keyword:not_keyword? space?
-      submultiset_keyword space?
-      of_keyword:of_keyword? space?
-      table2:nested_table {
-        def ast
-          OracleSqlParser::Ast::SubmultisetCondition[
-            :target => table1.ast,
-            :not => not_keyword.ast,
-            :submultiset => submultiset_keyword.ast,
-            :of => of_keyword.ast,
-            :table => table2.ast
-          ]
-        end
-      }
-    end
-
-    rule pattern_maching_condition
-      (
-        like_condition /
-        regexp_like_condition
-      ) {
-        def ast
-          super
-        end
-      }
-    end
-
-    rule like_condition
-      target:ident space
-      n:(not_keyword:not_keyword space)?
-      like:(like_keyword / like2_keyword / like4_keyword / likec_keyword) space
-      text:text_literal
-      e:(space escape_keyword space escape_text:text_literal)? {
-        def ast
-          OracleSqlParser::Ast::LikeCondition[
-            :target => target.ast,
-            :not => not_keyword.ast,
-            :like => like.ast,
-            :text => text.ast,
-            :escape => escape_text.ast]
-        end
-
-        def not_keyword
-          n.elements && n.elements.first
-        end
-
-        def escape_text
-          if e.respond_to? :escape_text
-            e.escape_text
-          end
-        end
-      }
-    end
-
-    rule regexp_like_condition
-      regexp_like_keyword '(' space? target:ident space? ',' space? regexp:text_literal space? ')' {
-        def ast
-          OracleSqlParser::Ast::RegexpCondition[
-            :target => target.ast,
-            :regexp => regexp.ast]
-        end
-      }
-    end
-
-    rule null_condition
-      expr space is_keyword space n:(not_keyword space)? null_keyword {
-        def ast
-          OracleSqlParser::Ast::NullCondition[
-            :target => expr.ast,
-            :not => not_keyword.ast]
-        end
-
-        def not_keyword
-          n.elements && n.elements.first
-        end
-      }
-    end
-
     rule xml_condition
       'xml_condition'
     end
 
-    rule compound_condition
-      '(' logical_condition ')' {
-        def ast
-          OracleSqlParser::Ast::CompoundCondition[:condition => logical_condition.ast]
-        end
-      }
-    end
-
-    rule between_condition
-      target:expr space n:(not_keyword space)? between_keyword space from:expr space and_keyword space to:expr {
-        def ast
-          OracleSqlParser::Ast::BetweenCondition[
-            :target => target.ast,
-            :not => not_keyword.ast,
-            :from => from.ast,
-            :to => to.ast
-          ]
-        end
-
-        def not_keyword
-          n.elements && n.elements.first
-        end
-      }
-    end
-
-    rule exists_condition
-      exists_keyword space? '(' space? subquery space? ')' {
-        def ast
-          OracleSqlParser::Ast::ExistsCondition[
-            :target => subquery.ast
-          ]
-        end
-      }
-    end
-
-    rule in_condition
-      target:expr space n:(not_keyword space)? in_keyword space? '(' space? values:( exprs / subquery ) space? ')' {
-        def ast
-          OracleSqlParser::Ast::InCondition[
-            :target => target.ast,
-            :not => not_keyword.ast,
-            :values =>  values.ast
-          ]
-        end
-
-        def not_keyword
-          n.elements && n.elements.first
-        end
-      }
-    end
-
-    rule is_of_type_condition
-      expr space?
-      is_keyword space?
-      not_keyword:not_keyword? space?
-      of_keyword space?
-      type_keyword:type_keyword? space?
-      '(' space? types space? ')' {
-        def ast
-          OracleSqlParser::Ast::IsOfTypeCondition[
-            :target => expr.ast,
-            :is => is_keyword.ast,
-            :not => not_keyword.ast,
-            :of => of_keyword.ast,
-            :type => type_keyword.ast,
-            :types => types.ast
-          ]
-        end
-      }
-    end
-
-    rule types
-      only_and_type space? more:(',' space? only_and_type space?)* {
-        def ast
-          OracleSqlParser::Ast::Array[only_and_type.ast, *more_only_and_types.map(&:ast)]
-        end
-
-        def more_only_and_types
-          more.elements.map(&:only_and_type)
-        end
-      }
-    end
-
-    rule only_and_type
-      only_keyword:only_keyword? space? type {
-        def ast
-          OracleSqlParser::Ast::OnlyAndType[
-            :only => only_keyword.ast,
-            :type => type.ast
-          ]
-        end
-      }
-    end
-
-    rule type
-      schema_name '.' ident /
-      ident {
-        def ast
-          OracleSqlParser::Ast::Identifier[:name => text_value]
-        end
-      }
-    end
   end
 end