oracle-sql-parser 0.9.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 14516df0bf4d0246870b6c5562a6d15ad728d722
-  data.tar.gz: d065209079f19de48af5fff9b16084b2218303ea
+SHA256:
+  metadata.gz: 98917b9db5c07a4eaca954c8bc6ee03c0df9c0707e7254f95b4e919689ab1c25
+  data.tar.gz: 48d4ad3e9cba9352d6c9f886528db58cf4002e3c461dcb657c8076e6fb2bcf87
 SHA512:
-  metadata.gz: ac8b4437bc7d8c1128cfe3301a81962006813c17d6f8ec71ea12ebc4499188d8835a82c9e438229b936928f2c531668f8b477fef1b04b0213b686d1a59db3cb1
-  data.tar.gz: 94e34a58144479026131f0b75ead2f38fb6ce80caadac5bbd4078621d05eabf5c337734a0b4aea2d47146a79ee9ecd28d1dee161e908f7108d6b9ed30dcc5b59
+  metadata.gz: 84c0018522bb8521891ab21b3cbee518d8545ea8b5b2606ec28e00b87418ba211b17a117fdecab8b69e51baa79ce76b67f4530e440558fd01c1751c0f8dcfffe
+  data.tar.gz: c8785d66eab254a49486ef3e1abaee8d404b16b76f4d086b5217079a522e60c8f4b0e6bca9f87036a0e89283a262010fe533980a60a98ce8c96e0a990518933f

data/HISTORY.md

@@ -1,3 +1,10 @@
+### 0.9.2
+* bug fix method not found "keys" on hash
+
+### 0.9.1
+* Syntax
+  * Three or more ANDs in WHERE clause fails parsing https://github.com/jksy/sql_parser/issues/16
+
 ### 0.9.0
 * Syntax
   * added cursor expression

data/docker-compose.yml

@@ -0,0 +1,23 @@
+version: '3'
+
+services:
+  oracle:
+    image: jksy/oracle-database:18.4.0-xe
+    build: ./docker/oracle
+    shm_size: 1g
+    environment:
+      ORACLE_SID: XE
+      ORACLE_PWD: secret
+      ORACLE_CHARACTERSET: AL32UTF8
+    ports:
+      - 11521:1521
+
+  test:
+    image: jksy/ruby-with-oracle-instant-client:2.6.5
+    build: ./docker/test
+    volumes:
+      - ".:/opt/work"
+    # command: /bin/bash --login -c 'sleep 600'
+    command: /bin/bash --login -c 'cd /opt/work && rbenv exec bundle update --bundler && rbenv exec bundle install --path ./vendor && bundle exec rake gen; bundle exec rake test ; /bin/bash'
+
+

data/docker/oracle/Dockerfile

@@ -0,0 +1,3 @@
+FROM oracle/database:18.4.0-xe
+
+EXPOSE 11521

data/docker/test/Dockerfile

@@ -0,0 +1,21 @@
+FROM oraclelinux:7-slim as instantclient
+
+ENV VERSION="2.6.5"
+
+RUN yum install -y oracle-release-el7
+RUN yum update -y
+RUN yum install -y --enablerepo=ol7_oracle_instantclient oracle-instantclient18.3-basic oracle-instantclient18.3-devel oracle-instantclient18.3-sqlplus && \
+    yum clean all
+
+# install ruby
+RUN yum -y install git openssl-devel readline-devel zlib-devel libcurl-devel bzip2 gcc make
+RUN git clone https://github.com/sstephenson/rbenv.git /usr/local/rbenv
+RUN git clone https://github.com/sstephenson/ruby-build.git /usr/local/rbenv/plugins/ruby-build
+RUN echo 'export RBENV_ROOT="/usr/local/rbenv"' >> /etc/profile.d/rbenv.sh
+RUN echo 'export PATH="${RBENV_ROOT}/bin:${PATH}"' >> /etc/profile.d/rbenv.sh
+RUN echo 'eval "$(rbenv init -)"' >> /etc/profile.d/rbenv.sh
+
+RUN source /etc/profile.d/rbenv.sh; rbenv install ${VERSION} && rbenv global ${VERSION}
+RUN source /etc/profile.d/rbenv.sh; gem update --system && gem install bundler
+
+RUN echo 'export LD_LIBRARY_PATH=/usr/lib/oracle/18.3/client64/lib/' >> /etc/profile.d/oracle.sh

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

@@ -13,6 +13,9 @@ require 'oracle-sql-parser/ast/query_block.rb'
 require 'oracle-sql-parser/ast/inner_cross_join_clause.rb'
 require 'oracle-sql-parser/ast/inner_join_clause.rb'
 require 'oracle-sql-parser/ast/outer_join_clause.rb'
+require 'oracle-sql-parser/ast/row_limiting_clause.rb'
+require 'oracle-sql-parser/ast/fetch.rb'
+require 'oracle-sql-parser/ast/offset.rb'
 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'

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

@@ -0,0 +1,12 @@
+module OracleSqlParser::Ast
+  class Fetch < Hash
+    def to_sql(options = {})
+      @ast.values_at(
+        :fetch, :first,
+        :rowcount, :percentage, :percentage_keyword,
+        :rows, :only, :with, :ties,
+      ).compact.map(&:to_sql).join(' ')
+    end
+  end
+end
+

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

@@ -5,7 +5,7 @@ module OracleSqlParser::Ast
     end
 
     def to_decimal
-      BigDecimal.new(@ast[:value])
+      BigDecimal(@ast[:value])
     end
   end
 end

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

@@ -0,0 +1,11 @@
+module OracleSqlParser::Ast
+  class Offset < Hash
+    def to_sql(options = {})
+      @ast.values_at(
+        :offset_keyword, :offset,
+        :row_keyword, :rows_keyword,
+      ).compact.map(&:to_sql).join(' ')
+    end
+  end
+end
+

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

@@ -0,0 +1,10 @@
+module OracleSqlParser::Ast
+  class RowLimitingClause < Hash
+    def to_sql(options = {})
+      @ast.values_at(
+        :offset,
+        :fetch,
+      ).compact.map(&:to_sql).join(' ')
+    end
+  end
+end

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

@@ -1,10 +1,14 @@
 module OracleSqlParser::Ast
   class Subquery < Hash
     def to_sql(options = {})
-      result = @ast.values_at(:query_block,
-                              :subqueries,
-                              :subquery,
-                              :order_by_clause).map(&:to_sql)
+      result = @ast.values_at(
+        :query_block,
+        :subqueries,
+        :subquery,
+        :order_by_clause,
+        :row_limiting_clause,
+      ).map(&:to_sql)
+
       if @ast[:has_parenthesis]
         result.unshift('(')
         result.push(')')

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

@@ -27,6 +27,7 @@ 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/row_limit.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/comparison.treetop

@@ -12,6 +12,7 @@ module OracleSqlParser::Grammar::Condition
     end
 
     rule group_comparison_condition
+      # not implemented
       'group_comparison_condition'
     end
 

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

@@ -78,10 +78,6 @@ module OracleSqlParser::Grammar
       'json_object_access_expression' # not implemented
     end
 
-    rule object_access_expression
-      'object_access_expression' # not implemented
-    end
-
     rule expression_list  # from grouping_expression_list
       (
         '(' e:exprs ')' /

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

@@ -150,14 +150,6 @@ module OracleSqlParser::Grammar
       }
     end
 
-    rule t_alias
-      ident {
-        def ast
-          super
-        end
-      }
-    end
-
     rule current_of
       current_of_keyword space? cursor_name {
         def ast

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

@@ -130,6 +130,7 @@ EOS
           'ESCAPE',
           'EXCLUSIVE',
           'EXISTS',
+          'FETCH',
           'FILE',
           'FIRST',
           'FLOAT',
@@ -173,6 +174,7 @@ EOS
           'NAN',
           'NATURAL',
           'NESTED_TABLE_ID',
+          'NEXT',
           'NEXTVAL',
           'NOAUDIT',
           'NOCOMPRESS',
@@ -183,6 +185,7 @@ EOS
           'NUMBER',
           'OF',
           'OFFLINE',
+          'OFFSET',
           'ON',
           'ONLINE',
           'ONLY',
@@ -191,6 +194,7 @@ EOS
           'ORDER',
           'OUTER',
           'PCTFREE',
+          'PERCENT',
           'PRIOR',
           'PRIVILEGES',
           'PUBLIC',
@@ -222,6 +226,7 @@ EOS
           'SYSTIMESTAMP',
           'TABLE',
           'THEN',
+          'TIES',
           'TIME',
           'TO',
           'TRIGGER',
@@ -241,6 +246,7 @@ EOS
           'WHEN',
           'WHENEVER',
           'WHERE',
+          'WITH',
           'YEAR',
           'ZONE',
         ]

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

@@ -6,6 +6,7 @@ module OracleSqlParser::Grammar
     include OracleSqlParser::Grammar::Select::ForUpdate
     include OracleSqlParser::Grammar::Select::Union
     include OracleSqlParser::Grammar::Select::QueryBlock
+    include OracleSqlParser::Grammar::Select::RowLimit
 
     rule select_statement
       space? subquery for_update:(space for_update_clause)? space? {
@@ -24,7 +25,8 @@ module OracleSqlParser::Grammar
         query_block !(space union_or_intersect_or_minus) /
         subqueries:subqueries_with_union
       )
-      order:(space order_by_clause)? {
+      order:(space order_by_clause)?
+      row_limit:(space row_limiting_clause:row_limiting_clause)? {
         def ast
           OracleSqlParser::Ast::Subquery[
             :has_parenthesis => query.try(:left_parenthesis) ? true : nil,
@@ -32,6 +34,7 @@ module OracleSqlParser::Grammar
             :subqueries => query.try(:subqueries).ast,
             :subquery => query.try(:subquery).ast,
             :order_by_clause => order.try(:order_by_clause).ast,
+            :row_limiting_clause => row_limit.try(:row_limiting_clause).ast,
           ]
         end
       }

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

@@ -0,0 +1,49 @@
+module OracleSqlParser::Grammar::Select
+  grammar RowLimit
+    rule row_limiting_clause
+      fetch:fetch {
+        def ast
+          OracleSqlParser::Ast::RowLimitingClause[
+            :fetch => fetch.ast
+          ]
+        end
+      }
+    end
+
+    rule offset
+      offset_keyword space offset:number_literal space row:(row_keyword / rows_keyword) {
+        def ast
+          OracleSqlParser::Ast::Offset[
+            :offset_keyword => offset_keyword,
+            :offset => offset,
+            :row_keyword => row.try(:row_keyword),
+            :rows_keyword => row.try(:rows_keyword),
+          ]
+        end
+      }
+    end
+
+    rule fetch
+      fetch_keyword space
+        first:(first_keyword / next_keyword) space
+        rowcount:(rowcount:integer / percentage:integer percentage_keyword) space
+        rows:(row_keyword / rows_keyword) space
+        only:(only_keyword:only_keyword / with_keyword:with_keyword space ties_keyword:ties_keyword)
+      {
+        def ast
+          OracleSqlParser::Ast::Fetch[
+            fetch: fetch_keyword.ast,
+            first: first.ast,
+            rowcount: rowcount.try(:rowcount).ast,
+            percentage: rowcount.try(:percentage).ast,
+            percentage_keyword: rowcount.try(:percentage_keyword).ast,
+            rows: rows.ast,
+            only: only.try(:only_keyword).ast,
+            with: only.try(:with_keyword).ast,
+            ties: only.try(:ties_keyword).ast,
+          ]
+        end
+      }
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
 module OracleSqlParser
-  VERSION = "0.9.2"
+  VERSION = "1.0.0"
 end

data/oracle-sql-parser.gemspec

@@ -19,14 +19,13 @@ Gem::Specification.new do |spec|
   spec.files         += `echo lib/oracle-sql-parser/grammar/*.rb`.split(" ")
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 1.9.3'
+  spec.required_ruby_version = '>= 2.3.0'
   spec.add_runtime_dependency "treetop", "~> 1.6"
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "test-unit", "~> 3.1"
-  spec.add_development_dependency "activerecord", "~> 4.2"
-  spec.add_development_dependency "activerecord-oracle_enhanced-adapter", "~> 1.6.0"
+  spec.add_development_dependency "activerecord-oracle_enhanced-adapter", "~> 1.8.2"
   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 "pry-byebug", "3.7.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.9.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Junichiro Kasuya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-29 00:00:00.000000000 Z
+date: 2020-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,34 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: activerecord-oracle_enhanced-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.8.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: ruby-oci8
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +100,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +134,9 @@ files:
 - HISTORY.md
 - README.md
 - Rakefile
+- docker-compose.yml
+- docker/oracle/Dockerfile
+- docker/test/Dockerfile
 - lib/oracle-sql-parser.rb
 - lib/oracle-sql-parser/ast.rb
 - lib/oracle-sql-parser/ast/array.rb
@@ -162,6 +151,7 @@ files:
 - lib/oracle-sql-parser/ast/delete_statement.rb
 - lib/oracle-sql-parser/ast/delete_target.rb
 - lib/oracle-sql-parser/ast/exists_condition.rb
+- lib/oracle-sql-parser/ast/fetch.rb
 - lib/oracle-sql-parser/ast/floating_point_condition.rb
 - lib/oracle-sql-parser/ast/for_update_clause.rb
 - lib/oracle-sql-parser/ast/function_expression.rb
@@ -183,6 +173,7 @@ files:
 - lib/oracle-sql-parser/ast/member_condition.rb
 - lib/oracle-sql-parser/ast/null_condition.rb
 - lib/oracle-sql-parser/ast/number_literal.rb
+- lib/oracle-sql-parser/ast/offset.rb
 - lib/oracle-sql-parser/ast/on_clause.rb
 - lib/oracle-sql-parser/ast/only_and_type.rb
 - lib/oracle-sql-parser/ast/order_by_clause.rb
@@ -191,6 +182,7 @@ files:
 - lib/oracle-sql-parser/ast/query_block.rb
 - lib/oracle-sql-parser/ast/regexp_condition.rb
 - lib/oracle-sql-parser/ast/rollup_cube_clause.rb
+- lib/oracle-sql-parser/ast/row_limiting_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
@@ -266,6 +258,8 @@ files:
 - lib/oracle-sql-parser/grammar/select/order.treetop
 - lib/oracle-sql-parser/grammar/select/query_block.rb
 - lib/oracle-sql-parser/grammar/select/query_block.treetop
+- lib/oracle-sql-parser/grammar/select/row_limit.rb
+- lib/oracle-sql-parser/grammar/select/row_limit.treetop
 - lib/oracle-sql-parser/grammar/select/union.rb
 - lib/oracle-sql-parser/grammar/select/union.treetop
 - lib/oracle-sql-parser/grammar/update.rb
@@ -288,15 +282,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: SQL Parser for Oracle