ddl_parser 0.0.8 → 0.0.9

data/lib/ddl_parser/shared_rules/data_types.rb

@@ -9,7 +9,7 @@ module DDLParser
       rule(:type_integer)       {(str('integer')| str('int'))}
       rule(:type_bigint)        {str('bigint').as(:bigint)}
       rule(:type_decimal)       {(((str('decimal') | str('dec') | str('numeric') | str('num')) >>
-          (lparen >> integer.as(:total) >> (comma >> integer.as(:scale)).maybe >> rparen).as(:precision))).as(:decimal)}
+          (lparen >> integer.as(:total) >> (comma >> integer.as(:scale)).maybe >> rparen).as(:precision).maybe)).as(:decimal)}
       rule(:type_float)         {(str('float') >> (lparen >> integer >> rparen).as(:precision)).as(:float)}
       rule(:type_real)          {str('real')}
       rule(:type_double)        {str('double')}

data/lib/ddl_parser/translator/column.rb

@@ -13,7 +13,7 @@ class DDLParser::Translator::Column
   end
 
   def data_type
-    return if @column_hash.nil?
+    raise "DataType not specified #{@column_hash.inspect}" if @column_hash.nil? || @column_hash[:data_type].nil?
     if @column_hash[:data_type].is_a?(Hash)
       @column_hash[:data_type].keys.first
     else
@@ -27,7 +27,11 @@ class DDLParser::Translator::Column
       when :decimal
         "#{precision}.#{scale}".to_f
       when :char
-        @column_hash[:data_type][:char][:length][:integer].to_i
+        begin
+          @column_hash[:data_type][:char][:length][:integer].to_i
+        rescue
+          raise "DataType CHAR length wrong format #{@column_hash[:data_type].inspect}"
+        end
       else
         nil
     end
@@ -36,7 +40,11 @@ class DDLParser::Translator::Column
   def precision
     case data_type
       when :decimal
-        @column_hash[:data_type][:decimal][:precision][:total][:integer].to_i
+        begin
+          @column_hash[:data_type][:decimal][:precision][:total][:integer].to_i
+        rescue
+          5 # decimal default if no precision present
+        end
       else
         nil
     end
@@ -45,7 +53,11 @@ class DDLParser::Translator::Column
   def scale
     case data_type
       when :decimal
-        @column_hash[:data_type][:decimal][:precision][:scale][:integer].to_i
+        begin
+          @column_hash[:data_type][:decimal][:precision][:scale][:integer].to_i
+        rescue
+          0 # decimal default if no scale present
+        end
       else
         nil
     end

data/lib/ddl_parser/version.rb

@@ -1,3 +1,3 @@
 module DDLParser
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

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

@@ -388,7 +388,32 @@ EOF
                                      :data_type=>{:char=>{:length=>{:integer=> '30'}}},
                                      :options=> ''}}]}
     end
+  end
+
+  context 'real dsv examples 2' do
+    it 'parses Example 16a' do
+      sql = <<EOF
+   CREATE TABLE COSTINVOICE
+    (DOC_NO CHARACTER(8) NOT NULL,
+    STATUS CHARACTER(12))
+EOF
 
+      begin
+        result = parser.parse(sql.downcase)
+      rescue Parslet::ParseFailed => error
+        puts error.cause.ascii_tree
+      end
+
+      result.should == {:operation=> 'create table',
+                        :table_name=> 'costinvoice',
+                        :elements => [
+                            {:column=>{:field=> 'doc_no',
+                                       :data_type=>{:char=>{:length=>{:integer=> '8'}}},
+                                       :options=>[{:column_option=> 'not null'}]}},
+                            {:column=>{:field=> 'status',
+                                       :data_type=>{:char=>{:length=>{:integer=> '12'}}},
+                                       :options=> ''}}]}
+    end
   end
 
   context 'real dsv examples' do
@@ -451,6 +476,31 @@ EOF
       result[:operation].should == 'create table'
       result[:table_name].should == 'cost_invoice'
     end
+  end
+  context 'real dsv examples 3' do
+    it 'parses Example 18' do
+      sql = <<EOF
+   CREATE TABLE COSTINVOICE
+    (DOC_NO CHARACTER(8) NOT NULL DEFAULT 'TEST DEFAULT',
+    STATUS CHARACTER(12))
+
+EOF
+
+      begin
+        result = parser.parse(sql.downcase)
+      rescue Parslet::ParseFailed => error
+        puts error.cause.ascii_tree
+      end
+
+      result.should == {:operation=>"create table",
+                        :table_name=>"costinvoice",
+                        :elements=>[{:column=>{:field=>"doc_no",
+                                               :data_type=>{:char=>{:length=>{:integer=>"8"}}},
+                                               :options=>[{:column_option=>"not null"},
+                                                          {:default_clause=>[{:string=>"'test default'"}]}]}},
+                                    {:column=>{:field=>"status",
+                                               :data_type=>{:char=>{:length=>{:integer=>"12"}}}, :options=>""}}]}
+    end
 
   end
 end

data/spec/ddl_parser/shared_rules/data_types_spec.rb

@@ -11,6 +11,8 @@ describe DDLParser::SharedRules::DataTypes do
     parser.data_type.parse('smallint').should       == {:data_type=> 'smallint'}
     parser.data_type.parse('int').should            == {:data_type=> 'int'}
     parser.data_type.parse('decimal(1,2)').should   == {:data_type=>{:decimal=>{:precision => {:total=>{:integer=> '1'}, :scale=>{:integer=> '2'}}}}}
+    parser.data_type.parse('decimal(1)').should   == {:data_type=>{:decimal=>{:precision => {:total=>{:integer=> '1'}}}}}
+    parser.data_type.parse('decimal').should   == {:data_type=>{:decimal=>"decimal"}}
     parser.data_type.parse('float(1)').should       == {:data_type=>{:float=>{:precision=>{:integer=> '1'}}}}
     parser.data_type.parse('real').should           == {:data_type=> 'real'}
     parser.data_type.parse('double').should         == {:data_type=> 'double'}

data/spec/ddl_parser/translator/column_spec.rb

@@ -23,9 +23,21 @@ describe 'DDLParser::Translator::Column' do
       })
   }
 
-  before :each do
+  let(:decimal_no_scale_column) {
+    DDLParser::Translator::Column.new(
+        {:field=> 'decimal_field',
+         :data_type=>{:decimal=>{:precision=>{:total=>{:integer=> '15'}}}},
+         :options=>[{:column_option=> 'not null'}, {:default_clause=>[{:integer=> '0'}]}]
+        })
+  }
 
-  end
+  let(:decimal_no_precision_column) {
+    DDLParser::Translator::Column.new(
+        {:field=> 'decimal_field',
+         :data_type=>{:decimal=>"decimal"},
+         :options=>[{:column_option=> 'not null'}, {:default_clause=>[{:integer=> '0'}]}]
+        })
+  }
 
   it 'must receive hash' do
     DDLParser::Translator::Column.new('').to_hash.should == {}
@@ -54,12 +66,16 @@ describe 'DDLParser::Translator::Column' do
     int_column.precision.should == nil
     char_column.precision.should == nil
     decimal_column.precision.should == 15
+    decimal_no_scale_column.precision.should == 15
+    decimal_no_precision_column.precision.should == 5
   end
 
   it 'should return scale' do
     int_column.scale.should == nil
     char_column.scale.should == nil
     decimal_column.scale.should == 2
+    decimal_no_scale_column.scale.should == 0
+    decimal_no_precision_column.scale.should == 0
   end
 
   it 'should return options' do

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: ddl_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
+  prerelease: 
 platform: ruby
 authors:
 - Rasmus Bergholdt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -111,26 +120,27 @@ files:
 homepage: ''
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 1.8.28
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: will parse statements and make it possible to extract content
 test_files:
 - spec/ddl_parser/ddl/db2/alter_table_spec.rb
@@ -142,4 +152,3 @@ test_files:
 - spec/ddl_parser/sql/db2/select_parser_spec.rb
 - spec/ddl_parser/translator/column_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 43e8f3aea2bd03ccdd4c2a7b1a0b2c325f7bee84
-  data.tar.gz: 2a21651fe9805d07d7f80f79a160cec065557297
-SHA512:
-  metadata.gz: c6173cef6daad97465aac30304464b255d06955e88cbde966cdc940619cc2c653d2e872fdca48c534b2ac31678c35ad8697a025604eff2c2e0a2f49f51b75754
-  data.tar.gz: 10aa29aa0671fe7773d6b607c7b31fe1ffcb17dafa70ba49f9370e9f8fa89d6f7508692c4548a9d1ded2e5c6f8665671a28134fdbfa4dee367cdeaea366164e4