oracle-sql-parser 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c837374a732fc2668270aeda336b61a01370e4bb
-  data.tar.gz: 7b3a68ffe18ef9433fdaed74261474e555d944a2
+  metadata.gz: 9a9130b843c652c403f5d864ded3d2e23d7bf1c4
+  data.tar.gz: 1c80886a500a13230d17feaf356eee6e54377fe9
 SHA512:
-  metadata.gz: 06d395ede2b2bd56ab772adb3fd648371a8725de851475afd7de5547c229feb8532bd732a9320d041b39ea3a20d104494829ac9142c4f8664c913d56525eec99
-  data.tar.gz: e2e5bf837cbf9a41066becb3ba9f3bb4b098005114d342a2b314b50021defea7a9999aeeae60ea05d9f31b90f4dd9a824eeb517f7e50bb0625d188eaa781d521
+  metadata.gz: 7e7933ce7a6b024a0c8e8d338017c76289a7004cf2015e82c86eb05d9ca25ff9e4d579648cca4a22328a639cbc9453f9b08fcb2c6b271cfce390cf91ce6db779
+  data.tar.gz: a2b5f51fc41a1bbcb5d7408318abb922b178aca68e74789ee4f4ab835d747eea655652346f9e68a84eb550d6566454b85c6598c20ee01bf46bc566b367e5f107

data/README.md

@@ -37,17 +37,17 @@ ast = syntax_tree.ast
       :hint => nil,
       :modifier => nil,
       :select_list => #<OracleSqlParser::Ast::Array [
-        #<OracleSqlParser::Ast::NumberLiteral {:value=>"1"}>
-      ]>
+        #<OracleSqlParser::Ast::NumberLiteral {:value=>"1"}>
+      ]>
       ,
-      :select_sources => #<OracleSqlParser::Ast::Identifier {:name=>"dual"}>,
+      :select_sources => #<OracleSqlParser::Ast::TableReference {:schema_name=>nil, :table_name=>#<OracleSqlParser::Ast::Identifier {:name=>"dual"}>, :dblink=>nil}>,
       :where_clause => nil,
       :group_by_clause => nil,
-      :model_clause => nil}>
+      :model_clause => nil}>
     ,
-    :order_by_clause => nil}>
+    :order_by_clause => nil}>
   ,
-  :for_update_clause => nil}>
+  :for_update_clause => nil}>
 </pre>
 
 ```ruby

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "sql_parser"
+require "oracle-sql-parser"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/oracle-sql-parser.rb

@@ -2,6 +2,7 @@ module OracleSqlParser
 end
 require 'treetop'
 require 'oracle-sql-parser/version.rb'
+require 'oracle-sql-parser/util.rb'
 require 'oracle-sql-parser/ast.rb'
 require 'oracle-sql-parser/treetop_ext.rb'
 require 'oracle-sql-parser/grammar.rb'

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

@@ -39,4 +39,5 @@ require 'oracle-sql-parser/ast/text_literal.rb'
 require 'oracle-sql-parser/ast/number_literal.rb'
 require 'oracle-sql-parser/ast/table_reference.rb'
 require 'oracle-sql-parser/ast/compound_condition.rb'
+require 'oracle-sql-parser/ast/variable.rb'
 require 'oracle-sql-parser/ast/keyword.rb'

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

@@ -16,6 +16,15 @@ module OracleSqlParser::Ast
       self.new(*values)
     end
 
+    def map_ast!(&block)
+      @ast = @ast.map do |v|
+        if v.is_a? OracleSqlParser::Ast::Base
+          v.map_ast!(&block)
+        end
+        block.call(v)
+      end
+    end
+
     def initialize(*args)
       @ast = args
     end

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

@@ -6,8 +6,28 @@ def nil.to_sql(options = {})
   nil
 end
 
-def nil.until_nil(&block)
+def nil.duplicable?
+  false
+end
+
+def true.duplicable?
+  false
+end
+
+def false.duplicable?
+  false
+end
+
+class Symbol
+  def duplicable?
+    false
+  end
+end
 
+class Numeric
+  def duplicable?
+    false
+  end
 end
 
 unless Object.respond_to? :try
@@ -20,8 +40,8 @@ unless Object.respond_to? :try
       end
     end
 
-    def until_nil(&block)
-      block.call(self)
+    def duplicable?
+      true
     end
   end
 end
@@ -34,6 +54,7 @@ end
 
 module OracleSqlParser::Ast
   class Base
+    include OracleSqlParser::Util::Parameternizable
     def initialize(arg)
       if arg.instance_of?(Array) || arg.instance_of?(Hash)
         raise "cant assign #{arg.class} Base.new()"
@@ -41,6 +62,49 @@ module OracleSqlParser::Ast
       @ast = arg
     end
 
+    def initialize_copy(original)
+      if @ast.nil?
+        self.class.new
+      else
+        self.class.new(original.instance_variable_get(:@ast).dup)
+      end
+    end
+
+    def self.deep_dup(original)
+      if original.is_a? OracleSqlParser::Ast::Base
+        original.deep_dup
+      elsif original.is_a? ::Hash
+        ::Hash[ original.map {|k, v| [k, deep_dup(v)]} ]
+      elsif original.is_a? ::Array
+        original.map {|v| deep_dup(v)}
+      elsif original.duplicable?
+        original.dup
+      else
+        original
+      end
+    end
+
+    def deep_dup
+      copy = self.class.new
+      original_ast = self.instance_variable_get(:@ast)
+      copy_ast = self.class.deep_dup(original_ast)
+      copy.instance_variable_set(:@ast, copy_ast)
+      copy
+    end
+
+    def map_ast(&block)
+      duplicated = self.deep_dup
+      duplicated.map_ast!(&block)
+      duplicated
+    end
+
+    def map_ast!(&block)
+      if @ast.is_a? OracleSqlParser::Ast::Base
+        @ast.map_ast!(&block)
+      end
+      @ast = block.call(@ast)
+    end
+
     def remove_nil_values!
       @ast.remove_nil_values! if @ast.respond_to? :remove_nil_values!
       self

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

@@ -5,8 +5,8 @@ module OracleSqlParser::Ast
     extend Forwardable
     def_delegator :@ast, :keys, :[]
 
-    def initialize(value)
-      raise "only ::Hash instance" unless value.instance_of? ::Hash
+    def initialize(value = {})
+      raise "only ::Hash instance #{value.inspect}" unless value.instance_of? ::Hash
       @ast = value
     end
 
@@ -16,6 +16,17 @@ module OracleSqlParser::Ast
       self
     end
 
+    def map_ast!(&block)
+      mapped = @ast.class.new
+      @ast.each do |k, v|
+        if v.is_a? OracleSqlParser::Ast::Base
+          v.map_ast!(&block)
+        end
+        mapped[k] = block.call(v)
+      end
+      @ast = mapped
+    end
+
     def inspect
       "#<#{self.class.name}\n" + 
       @ast.map{|k,v| "#{k.inspect} => #{v.inspect}"}.join(",\n").gsub(/^/, '  ') +

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

@@ -3,7 +3,7 @@ module OracleSqlParser::Ast
     def to_sql
       sql = []
       sql << "order"
-      @ast[:siblings].until_nil {|v| sql << v.to_sql}
+      sql << @ast[:siblings].to_sql if @ast[:siblings]
       sql << "by"
       sql << @ast[:items].to_sql(:separator => ',')
       sql.join(" ")

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

@@ -2,7 +2,7 @@ module OracleSqlParser::Ast
   class OrderByClauseItem < Hash
     def to_sql(options = {})
       sql = @ast.values_at(:target, :asc).map(&:to_sql).compact.join(" ")
-      @ast[:nulls].until_nil {|v| sql += " nulls #{v.to_sql}"}
+      sql += " nulls #{@ast[:nulls].to_sql}" if @ast[:nulls]
       sql
     end
   end

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

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

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

@@ -0,0 +1,7 @@
+module OracleSqlParser::Ast
+  class Variable < Base
+    def to_sql
+      ":#{@ast[:name]}"
+    end
+  end
+end

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

@@ -0,0 +1,2 @@
+require 'oracle-sql-parser/util/parameternizable.rb'
+require 'oracle-sql-parser/util/parameternized_query.rb'

data/lib/oracle-sql-parser/util/parameternizable.rb

@@ -0,0 +1,7 @@
+module OracleSqlParser::Util
+  module Parameternizable
+    def to_parameternized
+      ParameternizedQuery.new(self)
+    end
+  end
+end

data/lib/oracle-sql-parser/util/parameternized_query.rb

@@ -0,0 +1,28 @@
+module OracleSqlParser::Util
+  class ParameternizedQuery
+    attr_reader :ast, :params
+    def initialize(original)
+      @index = 0
+      @params = {}
+      @ast = original.map_ast do |v|
+        case v
+        when OracleSqlParser::Ast::NumberLiteral, OracleSqlParser::Ast::TextLiteral
+          assign_parameter(v)
+        else 
+          v
+        end
+      end
+    end
+
+    def query
+      ast.to_sql
+    end
+
+    def assign_parameter(value)
+      name = "a#{@index}"
+      @index += 1
+      @params[name] = value
+      OracleSqlParser::Ast::Variable[:name =>name] 
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
 module OracleSqlParser
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oracle-sql-parser
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Junichiro Kasuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,6 +132,7 @@ files:
 - lib/oracle-sql-parser/ast/update_set_clause.rb
 - lib/oracle-sql-parser/ast/update_set_column.rb
 - lib/oracle-sql-parser/ast/update_statement.rb
+- lib/oracle-sql-parser/ast/variable.rb
 - lib/oracle-sql-parser/ast/where_clause.rb
 - lib/oracle-sql-parser/grammar.rb
 - lib/oracle-sql-parser/grammar/condition.rb
@@ -151,6 +152,9 @@ files:
 - lib/oracle-sql-parser/grammar/update.rb
 - lib/oracle-sql-parser/grammar/update.treetop
 - lib/oracle-sql-parser/treetop_ext.rb
+- lib/oracle-sql-parser/util.rb
+- lib/oracle-sql-parser/util/parameternizable.rb
+- lib/oracle-sql-parser/util/parameternized_query.rb
 - lib/oracle-sql-parser/version.rb
 - oracle-sql-parser.gemspec
 homepage: https://github.com/jksy/sql_parser