ddl_parser 0.0.14 → 0.0.15

data/Vagrantfile

@@ -1,9 +1,65 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = 'thoughtbot/ubuntu-14-04-server-with-laptop'
-end
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# -----
+$script = <<SCRIPT
+set -e
+set -x
+
+cd
+sudo apt-get update -y
+sudo apt-get install \
+  git-core \
+  curl \
+  zlib1g-dev\
+  build-essential\
+  libssl-dev\
+  libreadline-dev\
+  libyaml-dev\
+  libsqlite3-dev\
+  sqlite3\
+  libxml2-dev\
+  libxslt1-dev\
+  libcurl4-openssl-dev\
+  python-software-properties \
+  -y 2> /dev/null
+
+# install rbenv
+rm -rf ~/.rbenv
+git clone https://github.com/sstephenson/rbenv.git ~/.rbenv
+git clone https://github.com/sstephenson/ruby-build.git ~/.rbenv/plugins/ruby-build
+
+# Setup rbenv paths
+pathstring='export PATH="$HOME/.rbenv/bin:$HOME/.rbenv/plugins/ruby-build/bin:$PATH"'
+eval $pathstring
+echo $pathstring >> ~/.bashrc
+
+# Init rbenv
+initstring='eval "\$(rbenv init -)"'
+echo $initstring >> ~/.bashrc
+eval $initstring
+
+# install ruby
+rbenv install 1.9.3-p194
+rbenv global 1.9.3-p194
+ruby -v
+echo "gem: --no-ri --no-rdoc" > ~/.gemrc
+
+# install gems
+gem install bundler
+rbenv rehash
+
+SCRIPT
+# -----
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.box = "ubuntu/trusty32"
+
+  if Dir.glob("#{File.dirname(__FILE__)}/.vagrant/machines/default/*/id/*").empty?
+    config.vm.provision :shell, inline: $script, privileged: false
+  end
+
+end

data/lib/ddl_parser/ddl/db2/parser.rb

@@ -35,7 +35,7 @@ module DDLParser
 
         rule(:column_definition) { (column_name.as(:field) >> space.repeat >> data_type >> space.repeat >> (column_options.maybe).as(:options)).as(:column)}
 
-        rule(:index_column_definition) { column_name.as(:field) >> (space? >> column_sort.as(:sort_id) >> space.repeat).maybe }
+        rule(:index_column_definition) { column_name.as(:field) >> (space? >> column_sort.as(:sort_type) >> space.repeat).maybe }
 
         rule(:element_list)      { (lparen >> space? >> (column_definition | constraint | primary_key) >> space? >>
                                     (comma >> space? >> (column_definition | constraint | primary_key) >> space?).repeat >> rparen).as(:elements)
@@ -83,7 +83,7 @@ module DDLParser
         }
         # index options
 
-        rule(:option_reverse_scans)   { str('allow reverse scans') }
+        rule(:option_reverse_scans)   { str('allow reverse scans').as(:reverse_scans_property)}
         rule(:index_option)     { (option_reverse_scans).as(:index_option) }
 
         rule(:item)       { function | identifier | string }

data/lib/ddl_parser/translator/create_index_column.rb

@@ -20,7 +20,7 @@ class DDLParser::Translator::CreateIndexColumn
   end
 
   def sort_type
-    @index_column_hash[:sort_type]
+    @index_column_hash[:sort_type].to_s
   end
 
 end

data/lib/ddl_parser/translator/create_index_header.rb

@@ -6,7 +6,7 @@ class DDLParser::Translator::CreateIndexHeader
   def initialize(index_hash)
     if index_hash.is_a?(Hash) and index_hash.count > 1
       @index_head = index_hash
-      @index_columns = [{:field =>index_hash[:field], :sort_id => index_hash[:sort_id]}]
+      @index_columns = [{:field =>index_hash[:field], :sort_type => index_hash[:sort_type]}]
     else
       if index_hash.is_a?(Array) and index_hash.count > 1
         @index_head = index_hash.first.is_a?(Hash) ? index_hash.first : {}
@@ -27,15 +27,11 @@ class DDLParser::Translator::CreateIndexHeader
   end
 
   def index_name
-    @index_head[:index_name]
-  end
-
-  def index_table
-    @index_head[:index_table]
+    @index_head[:index_name].to_s
   end
 
   def table_name
-    @index_head[:table_name]
+    @index_head[:table_name].to_s
   end
 
   def object_property
@@ -43,7 +39,7 @@ class DDLParser::Translator::CreateIndexHeader
   end
 
   def option_reverse_scans
-    @index_head[:option_reverse_scans]
+    index_head.has_key?(:index_option) && index_head[:index_option].has_key?(:reverse_scans_property) ? 'Y' : 'N'
   end
 
   def columns

data/lib/ddl_parser/version.rb

@@ -1,3 +1,3 @@
 module DDLParser
-  VERSION = '0.0.14'
+  VERSION = '0.0.15'
 end

data/spec/ddl_parser/ddl/db2/create_index_header_spec.rb

@@ -51,19 +51,22 @@ EOF
         puts error.cause.ascii_tree
       end
 
-      result.count.should == 6
-      result.should include(:operation => 'create')
-      result.should include(:object_property => 'unique')
-      result.should include(:object_type => 'index')
-      result.should include(:index_name => 'cost_invoice_1')
-      result.should include(:table_name => 'cost_invoice')
-      result.should include(:field => 'doc_no')
+      result.count.should == 3
+      result.is_a?(Array).should == true
+
+      result[0].should include(:operation => 'create')
+      result[0].should include(:object_property => 'unique')
+      result[0].should include(:object_type => 'index')
+      result[0].should include(:index_name => 'cost_invoice_1')
+      result[0].should include(:table_name => 'cost_invoice')
+      result[1].should include(:field => 'doc_no')
+      result[2].should include(:field => 'doc_no_1')
     end
   end
   context 'element list index' do
     it 'parses one element' do
       sql = 'deptno asc'
-      parser.element_list_index.parse(sql).should == {:field=> 'deptno',:sort_id=> 'asc'}
+      parser.element_list_index.parse(sql).should == {:field=> 'deptno',:sort_type=> 'asc'}
     end
     it 'parses two element' do
       sql = 'field1, field2'
@@ -77,8 +80,8 @@ EOF
 DEPTNO desc,
 DEPTNAME asc
 EOF
-      parser.element_list_index.parse(sql.downcase).should == [{:field=> 'deptno',:sort_id=> 'desc'},
-                                                               {:field=> 'deptname',:sort_id=> 'asc'}]
+      parser.element_list_index.parse(sql.downcase).should == [{:field=> 'deptno',:sort_type=> 'desc'},
+                                                               {:field=> 'deptname',:sort_type=> 'asc'}]
     end
   end
   context 'index column definition' do
@@ -93,7 +96,7 @@ EOF
       sql = <<EOF
 DEPTNO descending
 EOF
-      parser.index_column_definition.parse(sql.downcase).should == {:field=> 'deptno',:sort_id=> 'descending'}
+      parser.index_column_definition.parse(sql.downcase).should == {:field=> 'deptno',:sort_type=> 'descending'}
 
     end
   end
@@ -103,7 +106,7 @@ EOF
     end
     it 'parses index_option with reverse scans' do
       sql = 'allow reverse scans'
-      parser.index_option.parse(sql).should include(:index_option => 'allow reverse scans')
+      parser.index_option.parse(sql).should include(:index_option => {:reverse_scans_property=>"allow reverse scans"})
     end
   end
   context 'create_index_statement' do
@@ -141,7 +144,7 @@ EOF
     end
   end
   context 'full index example with reverse scan option' do
-    it 'with reverse scan' do
+    it 'with reverse scan 1' do
       sql = <<EOF
 CREATE UNIQUE INDEX COST_INVOICE_1
         ON COST_INVOICE
@@ -160,7 +163,7 @@ EOF
       result.should include(:index_name => 'cost_invoice_1')
       result.should include(:table_name => 'cost_invoice')
       result.should include(:field => 'doc_no')
-      result.should include(:index_option => 'allow reverse scans')
+      result.should include(:index_option => {:reverse_scans_property=>"allow reverse scans"})
 
     end
     it 'without reverse scan' do
@@ -182,6 +185,28 @@ EOF
       result.should include(:table_name => 'cost_invoice')
       result.should include(:field => 'doc_no')
 
+    end
+    it 'with reverse scan 2' do
+      sql = <<EOF
+CREATE INDEX PL_TRIGGER_I2
+        ON PL_TRIGGER
+                (UNIQUE_NO)
+        ALLOW REVERSE SCANS
+EOF
+      begin
+        result = parser.parse(sql.downcase)
+      rescue Parslet::ParseFailed => error
+        puts error.cause.ascii_tree
+      end
+      result.count.should == 6
+      result.should include(:operation => 'create')
+      result.should include(:object_type => 'index')
+      result.should include(:index_name => 'pl_trigger_i2')
+      result.should include(:table_name => 'pl_trigger')
+      result.should include(:field => 'unique_no')
+      result.should include(:index_option => {:reverse_scans_property=>"allow reverse scans"})
+
+
     end
     it 'live example' do
       sql = <<EOF

data/spec/ddl_parser/parser_spec.rb

@@ -59,7 +59,7 @@ describe 'DDLParser::Parser' do
     end
   end
 
-  context 'alter table translate' do
+  context 'alter table add column translate' do
     let(:sql) {
       sql = <<EOF
             ALTER TABLE BUDGET
@@ -75,7 +75,7 @@ EOF
     end
 
 
-    it 'translate columns' do
+    it 'translate columns xxx' do
       parser = DDLParser::Parser.new(sql)
       parser.translate.add_columns.map(&:to_hash).should == [{:field=> 'budget_amount_in_co',
                                                :data_type=>{:decimal=>{:precision=>{:total=>{:integer=> '15'}, :scale=>{:integer=> '2'}}}},
@@ -106,11 +106,11 @@ EOF
       @parser.translate.index_name.should == 'replan_addr_1'
     end
     it 'columns' do
-      @parser.translate.columns.map(&:to_hash).should == [{:field=>"consignment", :sort_id=>"ascending"}, {:field=>"colli", :sort_id=>"descending"}]
+      @parser.translate.columns.map(&:to_hash).should == [{:field=>"consignment", :sort_type=>"ascending"}, {:field=>"colli", :sort_type=>"descending"}]
     end
 
   end
-  context 'create index translate one index column' do
+  context 'create index translate one index column allow not reverse scans' do
     before :each do
       sql = 'CREATE UNIQUE INDEX REPLAN_ADDR_1 ON REPLAN_ADDR (CONSIGNMENT ASCENDING)'
       @parser = DDLParser::Parser.new(sql)
@@ -123,11 +123,32 @@ EOF
       @parser.translate.index_name.should == 'replan_addr_1'
     end
     it 'columns' do
-      @parser.translate.columns.map(&:to_hash).should == [{:field=>"consignment", :sort_id=>"ascending"}]
+      @parser.translate.columns.map(&:to_hash).should == [{:field=>"consignment", :sort_type=>"ascending"}]
+    end
+
+    it 'allow not reverse scans 1' do
+      @parser.translate.option_reverse_scans.should == 'N'
     end
 
   end
+  context 'create index translate one index column allow reverse scans' do
+    before :each do
+      sql = 'CREATE UNIQUE INDEX REPLAN_ADDR_1 ON REPLAN_ADDR (CONSIGNMENT ASCENDING) ALLOW REVERSE SCANS'
+      @parser = DDLParser::Parser.new(sql)
+    end
+
+    it 'table name' do
+      @parser.translate.table_name.should == 'replan_addr'
+    end
+    it 'index name' do
+      @parser.translate.index_name.should == 'replan_addr_1'
+    end
+
+    it 'allow reverse scans 1' do
+      @parser.translate.option_reverse_scans.should == 'Y'
+    end
 
+  end
   context 'report errors' do
     it 'misses right parant' do
       sql = "Create table USER (FOO CHAR(4) NOT NULL, BAR CHAR(4) NOT NULL"

data/spec/ddl_parser/translator/index_header_spec.rb

@@ -31,10 +31,9 @@ end
 
 it 'should return name' do
   unique_no_column.index_name.should == 'test_index'
-  unique_no_column.index_table.should == 'on test_table'
   unique_no_column.table_name.should == 'test_table'
   unique_no_column.object_property.should == 'unique'
-  unique_no_column.option_reverse_scans.should == 'allow reverse scans'
+  unique_no_column.option_reverse_scans.should == 'N'
 end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddl_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet