oracle-sql-parser 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec4ae7a3a58995d3526662584d0bfce9b1e8e12a
-  data.tar.gz: aeb8943ab1e0d845be0d9413dae2390073757d2d
+  metadata.gz: 82f6a4205d237428121e76ccf0673b91fa2593eb
+  data.tar.gz: c171a4f9d250597bb80c751fbe4d34a3b876d06e
 SHA512:
-  metadata.gz: 6be02b972cc72b5b2d8cdb5e958bc1378156cda08f9bec5ac751bda59bee71aa762692e6da98c03e612e0841489045df6c16cbc34239128fbdb20079bff28f95
-  data.tar.gz: 701d2a80fc8a992bd139f8669922109899fcb075ae7cec80b57cb2de5339fc357dde2cc0fa5ff6425fc57c11cdaabd62b43ca97d5231fddb18554f5ed2854f2f
+  metadata.gz: f893677527f57c266f24dac86b181eb25dbde97706e1dc9af5adc3f3a39184dbbd1ba9c6466878a6e643c5d43638d27ad2068a6ab676851306ed4781a65bae86
+  data.tar.gz: cfac1b47be19e92e10072fab6386e8edcd5494e61d201d3889aa9c3d27feb39de05e7158e0dbd2d33aa40d4331bb07df4b50e40de70866b0d6af880e9891506d

data/.gitignore

@@ -17,3 +17,4 @@ lib/oracle-sql-parser/grammar/reserved_word.treetop
 lib/oracle-sql-parser/grammar/select.rb
 lib/oracle-sql-parser/grammar/update.rb
 *.sw?
+*.gem

data/README.md

@@ -1,4 +1,4 @@
-# SqlParser
+# OracleSqlParser
 
 SQL Parser for Oracle
 
@@ -7,7 +7,7 @@ SQL Parser for Oracle
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'sql_parser'
+gem 'oracle-sql-parser'
 ```
 
 And then execute:
@@ -16,13 +16,13 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install sql_parser
+    $ gem install oracle-sql-parser
 
 ## Usage
 
 ```ruby
 query = "select 1 from dual"
-parser = SqlParser::Oracle::OracleParser.new
+parser = OracleSqlParser::Grammar::GrammarParser.new
 syntax_tree = parser.parse query
 if syntax_tree
   message = "\n#{query}\n" + " " * (parser.failure_column.to_i-1) + "*\n"
@@ -32,16 +32,16 @@ ast = syntax_tree.ast
 ```
 <pre>
 irb(main):008:0> ast
-=> #&lt;SqlParser::Ast::SelectStatement
-  :subquery =&gt; #&lt;SqlParser::Ast::Subquery
-    :query_block =&gt; #&lt;SqlParser::Ast::QueryBlock
+=> #&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;SqlParser::Ast::Array [
-        #&lt;SqlParser::Ast::NumberLiteral {:value=&gt;"1"}>
+      :select_list =&gt; #&lt;OracleSqlParser::Ast::Array [
+        #&lt;OracleSqlParser::Ast::NumberLiteral {:value=&gt;"1"}>
       ]>
       ,
-      :select_sources =&gt; #&lt;SqlParser::Ast::Identifier {:name=&gt;"dual"}>,
+      :select_sources =&gt; #&lt;OracleSqlParser::Ast::Identifier {:name=&gt;"dual"}>,
       :where_clause =&gt; nil,
       :group_by_clause =&gt; nil,
       :model_clause =&gt; nil}>
@@ -56,3 +56,6 @@ irb(main):008:0> ast
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/jksy/sql_parser.
 
+## Test Page
+
+http://dev.jksy.org/

data/Rakefile

@@ -2,29 +2,26 @@ require "bundler/gem_tasks"
 require 'rake'
 require 'rake/testtask'
 
+GRAMMAR_FILES = FileList['lib/oracle-sql-parser/grammar/*.treetop']
+
 task :gen do
-  sh "ruby lib/oracle-sql-parser/grammar/reserved_word_generator.rb"
-  tt "lib/oracle-sql-parser/grammar/reserved_word.treetop"
-  tt "lib/oracle-sql-parser/grammar/expression.treetop"
-  tt "lib/oracle-sql-parser/grammar/condition.treetop"
-  tt "lib/oracle-sql-parser/grammar/select.treetop"
-  tt "lib/oracle-sql-parser/grammar/update.treetop"
-  tt "lib/oracle-sql-parser/grammar/delete.treetop"
-  tt "lib/oracle-sql-parser/grammar/insert.treetop"
-  tt "lib/oracle-sql-parser/grammar/grammar.treetop"
+  generate_parser_files(false)
 end
 
-def tt(f, force = false)
-  output_file_name = "#{f.gsub(/\.treetop$/,'')}.rb"
+task :gen_force do
+  generate_parser_files(true)
+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}"
+task :clean do
+  GRAMMAR_FILES.each do |f|
+    file = "#{f.gsub(/\.treetop$/,'')}.rb"
+    File.unlink file if File.exists? file
   end
 end
 
-
-#task :test => [:generate]
+task :build_gem => [:gen_force] do
+  sh 'gem build oracle-sql-parser.gemspec'
+end
 
 Rake::TestTask.new do |t|
   t.libs << "test"
@@ -39,3 +36,20 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
+
+def generate_parser_files(force = false)
+  sh "ruby lib/oracle-sql-parser/grammar/reserved_word_generator.rb"
+  GRAMMAR_FILES.each do |f|
+    tt(f, force)
+  end
+end
+
+def tt(f, force = false)
+  output_file_name = "#{f.gsub(/\.treetop$/,'')}.rb"
+
+  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}"
+  end
+end
+

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

@@ -3,5 +3,17 @@ module OracleSqlParser::Ast
     def inspect
       "#<#{self.class.name} #{@ast.inspect}>"
     end
+
+    def quoted?
+      @ast[:quoted] == true
+    end
+
+    def to_sql
+      if quoted?
+        "\"#{@ast[:name]}\""
+      else
+        @ast[:name]
+      end
+    end
   end
 end

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

@@ -21,9 +21,29 @@ module OracleSqlParser::Grammar
     end
 
     rule ident
-      !keyword [a-zA-Z] [a-zA-Z0-9_]* {
+      !keyword
+      i:(
+        c:ident_content_with_double_quote /
+        c:ident_content
+      ) {
+        def ast
+          i.c.ast
+        end
+      }
+    end
+
+    rule ident_content
+      [a-zA-Z] [a-zA-Z0-9_]* {
+        def ast
+          OracleSqlParser::Ast::Identifier[:name => text_value]
+        end
+      }
+    end
+
+    rule ident_content_with_double_quote
+      '"' name:[^"]* '"' {
         def ast
-          OracleSqlParser::Ast::Identifier.new(:name => text_value)
+          OracleSqlParser::Ast::Identifier[:name => name.text_value, :quoted => true]
         end
       }
     end
@@ -118,7 +138,11 @@ module OracleSqlParser::Grammar
         table_name
       ) ('@' dblink)? {
         def ast
-          OracleSqlParser::Ast::Identifier.new(:name => text_value)
+          if(!respond_to?(:schema_name) || !respond_to?(:dblink))
+            OracleSqlParser::Ast::Identifier.new(:name => text_value)
+          else
+            table_name.ast
+          end
         end
       }
     end

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

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

data/oracle-sql-parser.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 1.9.0'
   spec.add_dependency "bundler", "~> 1.10"
   spec.add_dependency "rake", "~> 10.0"
   spec.add_dependency "test-unit", "~> 3.1.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oracle-sql-parser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Junichiro Kasuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -161,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="