ddl_parser 0.0.13 → 0.0.14

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

@@ -45,6 +45,10 @@ module DDLParser
                                     (comma >> space? >> index_column_definition).repeat
                                   }
 
+        #rule(:element_list_index) { (space? >> index_column_definition >>
+        #                          (comma >> space? >> index_column_definition).repeat).as(elements)
+        #                          }
+
         rule(:add_constraint_clause)  { (str('add constraint') >> space? >>
                                     constraint_name.as(:constraint_name) >> space? >>
                                     foreign_key_clause.as(:foreign_key_clause)).as(:add_constraint)

data/lib/ddl_parser/translator/create_index_header.rb

@@ -4,13 +4,17 @@ class DDLParser::Translator::CreateIndexHeader
 
 
   def initialize(index_hash)
-
-    if index_hash.is_a?(Array) and index_hash.count > 1
-      @index_head = index_hash.first.is_a?(Hash) ? index_hash.first : {}
-      @index_columns = index_hash[1..-1]
+    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]}]
     else
-      @index_head = {}
-      @index_columns = []
+      if index_hash.is_a?(Array) and index_hash.count > 1
+        @index_head = index_hash.first.is_a?(Hash) ? index_hash.first : {}
+        @index_columns = index_hash[1..-1]
+      else
+        @index_head = {}
+        @index_columns = []
+      end
     end
   end
 

data/lib/ddl_parser/version.rb

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

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

@@ -32,6 +32,25 @@ 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')
+    end
+    it 'parses create_unique_index with two columns' do
+      sql = <<EOF
+CREATE UNIQUE INDEX COST_INVOICE_1 ON COST_INVOICE
+ (DOC_NO, DOC_NO_1)
+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_property => 'unique')

data/spec/ddl_parser/parser_spec.rb

@@ -93,7 +93,7 @@ EOF
     end
   end
 
-  context 'create index translate' do
+  context 'create index translate two index columns' do
     before :each do
       sql = 'CREATE UNIQUE INDEX REPLAN_ADDR_1 ON REPLAN_ADDR (CONSIGNMENT ASCENDING, COLLI DESCENDING)'
       @parser = DDLParser::Parser.new(sql)
@@ -109,6 +109,23 @@ EOF
       @parser.translate.columns.map(&:to_hash).should == [{:field=>"consignment", :sort_id=>"ascending"}, {:field=>"colli", :sort_id=>"descending"}]
     end
 
+  end
+  context 'create index translate one index column' do
+    before :each do
+      sql = 'CREATE UNIQUE INDEX REPLAN_ADDR_1 ON REPLAN_ADDR (CONSIGNMENT ASCENDING)'
+      @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 'columns' do
+      @parser.translate.columns.map(&:to_hash).should == [{:field=>"consignment", :sort_id=>"ascending"}]
+    end
+
   end
 
   context 'report errors' do

metadata

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