oracle-sql-parser 0.9.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 14516df0bf4d0246870b6c5562a6d15ad728d722
-  data.tar.gz: d065209079f19de48af5fff9b16084b2218303ea
+SHA256:
+  metadata.gz: 799c6ff0310cf192261588ddf5ba07eb0aac1b5034b369b8dbbdf15d7decd9aa
+  data.tar.gz: b67a6a2237d6e7651ee4697e88dd2f4f6fd284ce840e25cdb186e15f9fff28f9
 SHA512:
-  metadata.gz: ac8b4437bc7d8c1128cfe3301a81962006813c17d6f8ec71ea12ebc4499188d8835a82c9e438229b936928f2c531668f8b477fef1b04b0213b686d1a59db3cb1
-  data.tar.gz: 94e34a58144479026131f0b75ead2f38fb6ce80caadac5bbd4078621d05eabf5c337734a0b4aea2d47146a79ee9ecd28d1dee161e908f7108d6b9ed30dcc5b59
+  metadata.gz: 3e528a35215101f8475613ac2fdafa5408db2d91f58c9b01caa06a03e7556d13f3eb3752ec7ad2eedae3ea52e9e0b558c24d68ed6c341ac03de5f3fbc0663f4f
+  data.tar.gz: 06b56b949569df4b737af0edb00b29ab71daad9ef14711775c3ff09a9750f4367ac1b9bc2ddf2e1f169c2743de3cb853ca0dea1073df5faa43de8c2b910c8972

data/CHANGELOG.md

@@ -0,0 +1,213 @@
+# Changelog
+
+> This file covers releases up to v1.0.0 and is no longer updated. Release
+> notes for later versions live on
+> [GitHub Releases](https://github.com/jksy/sql_parser/releases).
+
+## [v1.0.0](https://github.com/jksy/sql_parser/tree/v1.0.0) (2020-02-28)
+
+[Full Changelog](https://github.com/jksy/sql_parser/compare/v0.9.2...v1.0.0)
+
+**Merged pull requests:**
+
+- version 1.0.0 [\#22](https://github.com/jksy/sql_parser/pull/22) ([jksy](https://github.com/jksy))
+- Feature/support rails5 [\#21](https://github.com/jksy/sql_parser/pull/21) ([jksy](https://github.com/jksy))
+- v0.9.2 [\#20](https://github.com/jksy/sql_parser/pull/20) ([jksy](https://github.com/jksy))
+
+## [v0.9.2](https://github.com/jksy/sql_parser/tree/v0.9.2) (2017-12-28)
+
+[Full Changelog](https://github.com/jksy/sql_parser/compare/v0.9.1...v0.9.2)
+
+**Merged pull requests:**
+
+- fix method not found "keys" on hash [\#19](https://github.com/jksy/sql_parser/pull/19) ([jksy](https://github.com/jksy))
+- Feature/update ruby versions [\#18](https://github.com/jksy/sql_parser/pull/18) ([jksy](https://github.com/jksy))
+
+## [v0.9.1](https://github.com/jksy/sql_parser/tree/v0.9.1) (2017-09-18)
+
+[Full Changelog](https://github.com/jksy/sql_parser/compare/v0.9.0...v0.9.1)
+
+**Closed issues:**
+
+- Three or more ANDs in WHERE clause fails parsing [\#16](https://github.com/jksy/sql_parser/issues/16)
+
+**Merged pull requests:**
+
+- fix https://github.com/jksy/sql\_parser/issues/16 [\#17](https://github.com/jksy/sql_parser/pull/17) ([jksy](https://github.com/jksy))
+- ruby 2.4.1 [\#15](https://github.com/jksy/sql_parser/pull/15) ([jksy](https://github.com/jksy))
+
+## [v0.9.0](https://github.com/jksy/sql_parser/tree/v0.9.0) (2016-09-03)
+
+[Full Changelog](https://github.com/jksy/sql_parser/compare/v0.8.1...v0.9.0)
+
+**Closed issues:**
+
+- Parser fails when parsing table aliases. [\#8](https://github.com/jksy/sql_parser/issues/8)
+
+**Merged pull requests:**
+
+- release v0.9.0 [\#14](https://github.com/jksy/sql_parser/pull/14) ([jksy](https://github.com/jksy))
+- Feature/expression [\#13](https://github.com/jksy/sql_parser/pull/13) ([jksy](https://github.com/jksy))
+
+## [v0.8.1](https://github.com/jksy/sql_parser/tree/v0.8.1) (2016-08-14)
+
+[Full Changelog](https://github.com/jksy/sql_parser/compare/v0.8.0...v0.8.1)
+
+## [v0.8.0](https://github.com/jksy/sql_parser/tree/v0.8.0) (2016-08-14)
+
+[Full Changelog](https://github.com/jksy/sql_parser/compare/v0.7.0...v0.8.0)
+
+**Merged pull requests:**
+
+- Feature/compound expression [\#11](https://github.com/jksy/sql_parser/pull/11) ([jksy](https://github.com/jksy))
+- Feature/subqueries [\#10](https://github.com/jksy/sql_parser/pull/10) ([jksy](https://github.com/jksy))
+
+## [v0.7.0](https://github.com/jksy/sql_parser/tree/v0.7.0) (2016-07-02)
+
+[Full Changelog](https://github.com/jksy/sql_parser/compare/v0.6.0...v0.7.0)
+
+**Merged pull requests:**
+
+- added table alias syntax [\#9](https://github.com/jksy/sql_parser/pull/9) ([jksy](https://github.com/jksy))
+
+## [v0.6.0](https://github.com/jksy/sql_parser/tree/v0.6.0) (2016-01-13)
+
+[Full Changelog](https://github.com/jksy/sql_parser/compare/v0.5.1...v0.6.0)
+
+## [v0.5.1](https://github.com/jksy/sql_parser/tree/v0.5.1) (2016-01-02)
+
+[Full Changelog](https://github.com/jksy/sql_parser/compare/v0.5.0...v0.5.1)
+
+**Merged pull requests:**
+
+- Support rails query [\#7](https://github.com/jksy/sql_parser/pull/7) ([jksy](https://github.com/jksy))
+- Fix spell [\#6](https://github.com/jksy/sql_parser/pull/6) ([jksy](https://github.com/jksy))
+- added Travis-CI [\#5](https://github.com/jksy/sql_parser/pull/5) ([jksy](https://github.com/jksy))
+- refactor gemspec [\#4](https://github.com/jksy/sql_parser/pull/4) ([jksy](https://github.com/jksy))
+- added history.md [\#3](https://github.com/jksy/sql_parser/pull/3) ([jksy](https://github.com/jksy))
+
+## [v0.5.0](https://github.com/jksy/sql_parser/tree/v0.5.0) (2015-12-28)
+
+[Full Changelog](https://github.com/jksy/sql_parser/compare/v0.4.0...v0.5.0)
+
+**Merged pull requests:**
+
+- added NumberLiteral\#to\_cecimal, TextLiteral\#to\_s [\#2](https://github.com/jksy/sql_parser/pull/2) ([jksy](https://github.com/jksy))
+
+## [v0.4.0](https://github.com/jksy/sql_parser/tree/v0.4.0) (2015-09-01)
+
+[Full Changelog](https://github.com/jksy/sql_parser/compare/v0.3.1...v0.4.0)
+
+## [v0.3.1](https://github.com/jksy/sql_parser/tree/v0.3.1) (2015-08-27)
+
+[Full Changelog](https://github.com/jksy/sql_parser/compare/v0.3.0...v0.3.1)
+
+## [v0.3.0](https://github.com/jksy/sql_parser/tree/v0.3.0) (2015-08-27)
+
+[Full Changelog](https://github.com/jksy/sql_parser/compare/v0.2.0...v0.3.0)
+
+## [v0.2.0](https://github.com/jksy/sql_parser/tree/v0.2.0) (2015-08-24)
+
+[Full Changelog](https://github.com/jksy/sql_parser/compare/v0.1.1...v0.2.0)
+
+## [v0.1.1](https://github.com/jksy/sql_parser/tree/v0.1.1) (2015-08-12)
+
+[Full Changelog](https://github.com/jksy/sql_parser/compare/v0.1.0...v0.1.1)
+
+## [v0.1.0](https://github.com/jksy/sql_parser/tree/v0.1.0) (2015-08-03)
+
+[Full Changelog](https://github.com/jksy/sql_parser/compare/131eba24eb79a0617c59210535da5d00dd6ee012...v0.1.0)
+
+**Merged pull requests:**
+
+- racc -\> treetop [\#1](https://github.com/jksy/sql_parser/pull/1) ([jksy](https://github.com/jksy))
+
+## Release notes (formerly HISTORY.md)
+
+### 1.0.0
+* Pass test on Rails 5.1.7
+* Drop support version before 2.3.8
+* Added grammer for "SELECT * FROM {table_name} FETCH FIRST {number} ROWS ONLY".
+* The grammer is used by Model.limit(10) with Oracle 18g through ActiveRecord
+* Remove code for Ruby version 1.9.x
+
+### 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
+  * added datetime expression
+  * added interval expression
+
+### 0.8.1
+* Fix README.md
+
+### 0.8.0
+* 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
+* 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
+* Bug fix
+  * fix spell. to_pameternized is deprecated and will be removed. use to_parameterized
+
+### 0.5.0
+* Enchancement
+  * added NumberLiteral#to_cecimal, TextLiteral#to_s
+
+### 0.4.0
+* Bugfix
+  * rename ParameternizedQuery#query -> ParameternizedQuery#to_sql
+* Syntax
+  * union [all]
+  * intersect
+  * minus
+  * [inner|outer] join
+  * conditions
+    * floating point condition
+    * multiset condition
+    * is_of_type condition
+
+### 0.3.0
+* Enchancement
+  * added to_parameternized method
+
+* Bug fix
+ * to_sql when select multiple column query parsed
+
+### 0.2.0
+* Bug fix
+  * Identifier[:value => ..] -> Identifier[:name => ..] when use sequence.nextval
+  * refactor test cases
+
+### 0.1.1
+* Syntax
+  * support double-quoted identifer
+
+### 0.1.0
+* Initial version
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Junichiro Kasuya
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,9 +1,16 @@
 # OracleSqlParser
 
-[![Build Status](https://travis-ci.org/jksy/sql_parser.svg?branch=master)](https://travis-ci.org/jksy/sql_parser)
+[![ci](https://github.com/jksy/sql_parser/actions/workflows/ci.yml/badge.svg)](https://github.com/jksy/sql_parser/actions/workflows/ci.yml)
+[![codecov](https://codecov.io/gh/jksy/sql_parser/branch/master/graph/badge.svg?token=0HSMBU0CD8)](https://codecov.io/gh/jksy/sql_parser)
 
 SQL Parser for Oracle
 
+## Requirements
+
+Ruby 3.2 or later (CI runs on 3.2, 3.3, 3.4 and 4.0). The gem itself does not
+need an Oracle client; only the connection tests described under
+[Development](#development) do.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -78,10 +85,66 @@ p.params.inspect
 => {"a0"=>#<OracleSqlParser::Ast::NumberLiteral {:value=>"1"}>}
 </pre>
 
+## Development
+
+    $ bundle install
+    $ bundle exec rake test:unit  # parser tests, no Oracle required
+
+The parsers under `lib/oracle-sql-parser/grammar/` are generated from the
+`.treetop` grammars next to them and the generated `.rb` files are committed.
+After editing a grammar (or `reserved_word_generator.rb`), regenerate and
+commit the result; CI fails if the committed parsers are out of date:
+
+    $ bundle exec rake gen_force  # compile **/*.treetop
+
+The tests under `test/oracle_enhanced-adapter` run real queries through
+[activerecord-oracle_enhanced-adapter](https://github.com/rsim/oracle-enhanced)
+and need Oracle Instant Client plus a reachable Oracle database. The easiest
+way to get both is the dev container in `.devcontainer/`, which starts
+[Oracle Database Free](https://github.com/gvenzl/oci-oracle-free) next to a
+Ruby container that has Instant Client installed. Open the repository in the
+container (VS Code "Reopen in Container", or the
+[devcontainer CLI](https://github.com/devcontainers/cli)) and run the tests:
+
+    $ devcontainer up --workspace-folder .
+    $ devcontainer exec --workspace-folder . bundle exec rake test  # test:unit and test:adapter
+
+The Oracle gems are managed with [Appraisal](https://github.com/thoughtbot/appraisal)
+so that a plain `bundle install` works without Oracle; `rake test:adapter`
+switches to `gemfiles/adapter_6.gemfile` by itself when the current bundle does
+not have them. There is one appraisal per ActiveRecord version the tests are
+run against (6.1, 7.2 and 8.1, see `Appraisals`); to run the tests with all of
+them:
+
+    $ bundle exec appraisal rake test:adapter:run
+
+To run against another Oracle database instead, install the appraisal gems and
+point the tests at it:
+
+    $ bundle exec appraisal install
+    $ export ORACLE_USERNAME=... ORACLE_PASSWORD=... ORACLE_HOST=localhost ORACLE_PORT=1521 ORACLE_SID=FREEPDB1
+    $ bundle exec rake test:adapter
+
+Connection settings can also be put in `test/oracle_enhanced-adapter/connection_params.yml`
+(ignored by git).
+
+## Release
+
+Release notes live on [GitHub Releases](https://github.com/jksy/sql_parser/releases)
+and are generated from the merged pull requests, grouped by label
+(`.github/release.yml`). `CHANGELOG.md` is kept for history only.
+
+1. Open a pull request that updates `lib/oracle-sql-parser/version.rb`, label
+   it `release` (so it is left out of the notes) and merge it.
+2. On `master`, run `bundle exec rake release`, which creates the `v<version>`
+   tag, pushes it and publishes the gem to [rubygems.org](https://rubygems.org).
+3. On GitHub, draft a release for the tag, click "Generate release notes" and
+   publish it.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/jksy/sql_parser.
 
-## Test Page
+## License
 
-http://dev.jksy.org/
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/Rakefile

@@ -3,6 +3,9 @@ require 'rake'
 require 'rake/testtask'
 
 GRAMMAR_FILES = FileList['lib/oracle-sql-parser/grammar/**/*.treetop']
+# The Oracle gems live in the appraisal gemfiles (see Appraisals); test:adapter
+# re-runs itself under this one when the current bundle does not have them.
+ADAPTER_GEMFILE = 'gemfiles/adapter_6.gemfile'.freeze
 
 desc "generate parser files"
 task :gen do
@@ -18,20 +21,69 @@ desc "clean files"
 task :clean do
   GRAMMAR_FILES.each do |f|
     file = "#{f.gsub(/\.treetop$/,'')}.rb"
-    File.unlink file if File.exists? file
+    File.unlink file if File.exist? file
   end
 end
 
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList[
-                    'test/grammar/*_test.rb',
-                    'test/ast/*_test.rb',
-                    'test/oracle_enhanced-adapter/select_test.rb'
-                    ]
-  t.verbose = true
+namespace :test do
+  Rake::TestTask.new(:unit) do |t|
+    t.description = "run parser tests (no Oracle required)"
+    t.libs << "test"
+    t.test_files = FileList[
+                      'test/grammar/*_test.rb',
+                      'test/ast/*_test.rb'
+                      ]
+    t.verbose = true
+  end
+
+  namespace :adapter do
+    Rake::TestTask.new(:run) do |t|
+      t.description = "run Oracle connection tests in the current bundle"
+      t.libs << "test"
+      t.test_files = FileList['test/oracle_enhanced-adapter/select_test.rb']
+      t.verbose = true
+    end
+  end
+
+  desc "run Oracle connection tests (needs an Oracle DB; uses #{ADAPTER_GEMFILE} unless the current bundle has the adapter)"
+  task :adapter do
+    if adapter_gems_available?
+      Rake::Task['test:adapter:run'].invoke
+    else
+      sh({ 'BUNDLE_GEMFILE' => ADAPTER_GEMFILE }, 'bundle', 'exec', 'rake', 'test:adapter:run')
+    end
+  end
+end
+
+# Name each SimpleCov run so results from test:unit and test:adapter merge.
+task 'test:unit:coverage_name' do
+  ENV['SIMPLECOV_COMMAND_NAME'] = 'unit'
+end
+task 'test:adapter:coverage_name' do
+  ENV['SIMPLECOV_COMMAND_NAME'] = 'adapter'
 end
+task 'test:unit' => 'test:unit:coverage_name'
+task 'test:adapter:run' => 'test:adapter:coverage_name'
 
+desc "run all tests (test:unit and test:adapter)"
+task :test => ['test:unit', 'test:adapter']
+
+desc "run RuboCop"
+task :rubocop do
+  sh "rubocop"
+end
+
+desc "run what CI runs: RuboCop and the parser tests"
+task :ci => [:rubocop, 'test:unit']
+
+task :default => 'test:unit'
+
+
+def adapter_gems_available?
+  Bundler.load.specs.any? { |spec| spec.name == 'activerecord-oracle_enhanced-adapter' }
+rescue Bundler::BundlerError
+  false
+end
 
 def generate_parser_files(force = false)
   word_generator = "lib/oracle-sql-parser/grammar/reserved_word_generator.rb"
@@ -54,7 +106,7 @@ def tt(f, force = false)
 end
 
 def do_if_changed(src, output, force = false, &block)
-  force = true unless File.exists?(output)
+  force = true unless File.exist?(output)
   if force || File::Stat.new(src).mtime >= File::Stat.new(output).mtime
     yield
   end

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/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/grammar/condition/between.rb

@@ -158,10 +158,12 @@ module OracleSqlParser::Grammar::Condition
       r0
     end
 
-  end
 
-  class BetweenParser < Treetop::Runtime::CompiledParser
-    include Between
+    class Parser < Treetop::Runtime::CompiledParser
+      include Between
+    end
   end
 
+  (remove_const(:BetweenParser) if const_defined?(:BetweenParser)) rescue nil; BetweenParser = Between::Parser
+
 end

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

@@ -443,10 +443,12 @@ module OracleSqlParser::Grammar::Condition
       r0
     end
 
-  end
 
-  class ComparisonParser < Treetop::Runtime::CompiledParser
-    include Comparison
+    class Parser < Treetop::Runtime::CompiledParser
+      include Comparison
+    end
   end
 
+  (remove_const(:ComparisonParser) if const_defined?(:ComparisonParser)) rescue nil; ComparisonParser = Comparison::Parser
+
 end

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/condition/compound.rb

@@ -70,10 +70,12 @@ module OracleSqlParser::Grammar::Condition
       r0
     end
 
-  end
 
-  class CompoundParser < Treetop::Runtime::CompiledParser
-    include Compound
+    class Parser < Treetop::Runtime::CompiledParser
+      include Compound
+    end
   end
 
+  (remove_const(:CompoundParser) if const_defined?(:CompoundParser)) rescue nil; CompoundParser = Compound::Parser
+
 end

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

@@ -107,10 +107,12 @@ module OracleSqlParser::Grammar::Condition
       r0
     end
 
-  end
 
-  class ExistsParser < Treetop::Runtime::CompiledParser
-    include Exists
+    class Parser < Treetop::Runtime::CompiledParser
+      include Exists
+    end
   end
 
+  (remove_const(:ExistsParser) if const_defined?(:ExistsParser)) rescue nil; ExistsParser = Exists::Parser
+
 end

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

@@ -124,10 +124,12 @@ module OracleSqlParser::Grammar::Condition
       r0
     end
 
-  end
 
-  class FloatingPointParser < Treetop::Runtime::CompiledParser
-    include FloatingPoint
+    class Parser < Treetop::Runtime::CompiledParser
+      include FloatingPoint
+    end
   end
 
+  (remove_const(:FloatingPointParser) if const_defined?(:FloatingPointParser)) rescue nil; FloatingPointParser = FloatingPoint::Parser
+
 end

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

@@ -179,10 +179,12 @@ module OracleSqlParser::Grammar::Condition
       r0
     end
 
-  end
 
-  class InParser < Treetop::Runtime::CompiledParser
-    include In
+    class Parser < Treetop::Runtime::CompiledParser
+      include In
+    end
   end
 
+  (remove_const(:InParser) if const_defined?(:InParser)) rescue nil; InParser = In::Parser
+
 end

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

@@ -442,10 +442,12 @@ module OracleSqlParser::Grammar::Condition
       r0
     end
 
-  end
 
-  class IsOfTypeParser < Treetop::Runtime::CompiledParser
-    include IsOfType
+    class Parser < Treetop::Runtime::CompiledParser
+      include IsOfType
+    end
   end
 
+  (remove_const(:IsOfTypeParser) if const_defined?(:IsOfTypeParser)) rescue nil; IsOfTypeParser = IsOfType::Parser
+
 end

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

@@ -556,11 +556,13 @@ module OracleSqlParser::Grammar::Condition
       r0
     end
 
-  end
 
-  class MultisetParser < Treetop::Runtime::CompiledParser
-    include Multiset
+    class Parser < Treetop::Runtime::CompiledParser
+      include Multiset
+    end
   end
 
+  (remove_const(:MultisetParser) if const_defined?(:MultisetParser)) rescue nil; MultisetParser = Multiset::Parser
+
 end