oracle-sql-parser 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d6c10d39c8d0989988d45e58feeb0e5e72e73d5
-  data.tar.gz: 4a7b76b8f73c5d76eafb80017f186d8b91f5cb16
+  metadata.gz: e8298f6ea76a3b8ad33bbdaa2ee4c2d8055a266c
+  data.tar.gz: 6bf031d20d4ee9d2718d6c17d6ca4f9abfce4a6e
 SHA512:
-  metadata.gz: c0dd268d036d3351d8d07fd112f8af285d6f64912efcd0f93105ed7a040ffe4019bd59cbb974cb369aacb9e6ee54d286be91b6f4bd3f30581be07c33271dabee
-  data.tar.gz: 365786271e19e2492e83902b75a4664fc51f0de6badd606867b9dc87558d70e7b99e7e5dfaded0b93747e85ea89ef6b2c956bbd5a24e6f89d1d8b5855715d623
+  metadata.gz: 4bed5224575dc5ab3873878f843d93bcd1568232b52bc9b8f11193c72281b73f0561b4da16833d27c1014560331391c956c4d7a5b0ca77a6f66c67d7481a7100
+  data.tar.gz: 9f1a55461fc0aa234fb01a1503217c61648ddf00ae8e9dd1781fe37ea96e9337dd2176dbbe8c767b0dab5c23f0f68ee6032e812807d1e7805976e32c22f547f2

data/.gitignore

@@ -16,5 +16,6 @@ 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/update.rb
+test/oracle_enhanced-adapter/connection_params.yml
 *.sw?
 *.gem

data/HISTORY.md

@@ -1,3 +1,9 @@
+### 0.6.0
+* Enchancement
+  * added travis-ci
+  * added oracle enhanced adapter query(select, includes, joins, where)
+  * added syntax for column_alias
+
 ### 0.5.1
 * Bug fix
   * fix spell. to_pameternized is deprecated and will be removed. use to_parameterized 

data/Rakefile

@@ -35,6 +35,8 @@ Rake::TestTask.new do |t|
                     '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/oracle_enhanced-adapter/select_test.rb'
                     ]
   t.verbose = true
 end

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

@@ -1,7 +1,7 @@
 module OracleSqlParser::Ast
-  class CompoundCondition < Base
+  class CompoundCondition < Hash
     def to_sql(options = {})
-      "(#{@ast.to_sql})"
+      "(#{@ast[:condition].to_sql})"
     end
   end
 end

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

@@ -47,6 +47,10 @@ module OracleSqlParser::Ast
       self.new(value)
     end
 
+    def []=(name, value)
+      @ast[name] = value
+    end
+
     def method_missing(name, *args)
       return @ast.send(:[], name) if @ast.has_key? name
       raise "no method:#{name}, #{@ast.class} in #{self.class}"

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

@@ -9,11 +9,15 @@ module OracleSqlParser::Ast
     end
 
     def to_sql(options = {})
+      result = []
       if quoted?
-        "\"#{@ast[:name]}\""
+        result << "\"#{@ast[:name]}\""
       else
-        @ast[:name]
+        result << @ast[:name]
       end
+      result << @ast[:as] if @ast[:as]
+      result << @ast[:alias] if @ast[:alias]
+      result.map(&:to_sql).join(' ')
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module OracleSqlParser::Ast
-  class SearchedCaseExpression < Base
+  class SearchedCaseExpression < Hash
     def else_clause=(ast)
       @ast[:else_clause] = ast
     end

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

@@ -251,7 +251,7 @@ module OracleSqlParser::Grammar
     rule compound_condition
       '(' logical_condition ')' {
         def ast
-          OracleSqlParser::Ast::CompoundCondition[logical_condition.ast]
+          OracleSqlParser::Ast::CompoundCondition[:condition => logical_condition.ast]
         end
       }
     end

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

@@ -1,20 +1,26 @@
 module OracleSqlParser::Grammar
   grammar Expression
     rule sql_expression
-      function_expression /
-      case_expression /
-      cursor_expression /
-      compound_expression /
-      datetime_expression /
-      interval_expression /
-      object_access_expression /
-      scalar_subquery_expression /
-      model_expression /
-      type_constructor_expression /
-      simple_expression /
-      variable_expression {
-        def ast
-          super
+      ex:(
+        function_expression /
+        case_expression /
+        cursor_expression /
+        compound_expression /
+        datetime_expression /
+        interval_expression /
+        object_access_expression /
+        scalar_subquery_expression /
+        model_expression /
+        type_constructor_expression /
+        simple_expression /
+        variable_expression)
+        alias_name:(space as_keyword space ident)?
+      {
+        def ast
+          tree = ex.ast
+          tree[:as] = alias_name.try(:as_keyword).try(:ast)
+          tree[:alias] = alias_name.try(:ident).try(:ast)
+          tree
         end
       }
     end

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

@@ -1,3 +1,3 @@
 module OracleSqlParser
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/oracle-sql-parser.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/jksy/sql_parser"
   spec.licenses      = ["MIT"]
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test)/|.travis}) }
   spec.files         += `echo lib/oracle-sql-parser/grammar/*.rb`.split(" ")
   spec.require_paths = ["lib"]
 
@@ -23,4 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   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 "ruby-oci8", "~> 2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oracle-sql-parser
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Junichiro Kasuya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-02 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -66,6 +66,48 @@ 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
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: ruby-oci8
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: SQL Parser for Oracle
 email:
 - junichiro.kasuya@gmail.com
@@ -74,7 +116,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - HISTORY.md
 - README.md

data/.travis.yml

@@ -1,8 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.3
-  - 2.2.2
-before_install: gem install bundler -v 1.10.5
-script:
-  - rake gen_force
-  - rake test