ddl_parser 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef82b48ea80076815061bcbf9796dfc705378cb8
-  data.tar.gz: cc04e393d7673c5941164bf953b2a7e3256d536a
+  metadata.gz: 43e8f3aea2bd03ccdd4c2a7b1a0b2c325f7bee84
+  data.tar.gz: 2a21651fe9805d07d7f80f79a160cec065557297
 SHA512:
-  metadata.gz: 8ba708dd93de83da7b45c1a207ded32c4640b6bb2da148feb9402aa0798a540aeda239591c65ff1559e71d4df502f0ac5a252e816751d5aed9a5290450d42883
-  data.tar.gz: ac3de3daa335758e0f153d03f7f6bcc8943d755b0a0b18bf187cc4c7bb70d87f9d2c5eed0c5a492c6bb5fc017df754f637445cf57cdb16b8ca50b53091d53c64
+  metadata.gz: c6173cef6daad97465aac30304464b255d06955e88cbde966cdc940619cc2c653d2e872fdca48c534b2ac31678c35ad8697a025604eff2c2e0a2f49f51b75754
+  data.tar.gz: 10aa29aa0671fe7773d6b607c7b31fe1ffcb17dafa70ba49f9370e9f8fa89d6f7508692c4548a9d1ded2e5c6f8665671a28134fdbfa4dee367cdeaea366164e4

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

@@ -74,8 +74,8 @@ module DDLParser
         rule(:term)       { const | item }
 
         rule(:function)   {
-          identifier.as(:function) >> space? >>
-              lparen >> arglist.as(:arguments) >> rparen
+          (identifier.as(:name) >> space? >>
+              lparen >> arglist.as(:arguments) >> rparen).as(:function)
         }
 
         rule(:item)       { function | identifier | string }

data/lib/ddl_parser/shared_rules/constants.rb

@@ -27,12 +27,12 @@ module DDLParser
 
 
       rule(:string)     {
-        str("'") >>
+        (str("'") >>
             (
             str('\\') >> any |
                 str("'").absent? >> any
             ).repeat >>
-            str("'")
+            str("'")).as(:string)
       }
 
       rule(:const)      {
@@ -40,7 +40,7 @@ module DDLParser
       }
 
       rule(:identifier)         { match('\\w').repeat(1) }
-      rule(:current_timestamp)  { str('current timestamp') }
+      rule(:current_timestamp)  { str('current timestamp').as(:timestamp) }
 
     end
   end

data/lib/ddl_parser/translator/column.rb

@@ -67,11 +67,18 @@ class DDLParser::Translator::Column
     unless options.nil?
       default_value = options.select{|h|h.has_key?(:default_clause)}.first
       if default_value
-        default_value[:default_clause].each do |c|
-          # TODO must handle other then integer
-          if c.has_key?(:integer)
-            return c[:integer].to_i
+        if default_value[:default_clause].is_a?(Array)
+          default_value[:default_clause].each do |c|
+            # TODO must handle other then integer
+            case c.keys.first
+            when :integer
+              return c[:integer].to_i
+            else
+              return c[c.keys.first].to_s
+            end
           end
+        else
+          raise "Unknown default_clause #{default_value.inspect}"
         end
       end
     end

data/lib/ddl_parser/version.rb

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

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

@@ -19,11 +19,11 @@ describe DDLParser::DDL::DB2::Parser do
     end
 
     it 'parses default values' do
-      expect(parser.column_options).to     parse('default 1')
-      expect(parser.column_options).to     parse('with default 1')
-      expect(parser.column_options).to     parse('default current timestamp')
-      expect(parser.column_options).to     parse("default 'foobar'")
-      expect(parser.column_options).to     parse('default max(foo)')
+      parser.column_options.parse('default 1').should == [{:default_clause=>[{:integer=> '1'}]}]
+      parser.column_options.parse('with default 1').should == [{:default_clause=>[{:integer=> '1'}]}]
+      parser.column_options.parse('default current timestamp').should == [{:default_clause=>[{:timestamp => "current timestamp"}]}]
+      parser.column_options.parse("default 'foobar'").should == [{:default_clause=>[{:string => "'foobar'"}]}]
+      parser.column_options.parse('default max(foo)').should == [{:default_clause=>[{:function=>{:name=>"max", :arguments=>{:item=>"foo"}}}]}]
 
       expect(
           parser.column_options.parse('default 1')

data/spec/ddl_parser/translator/column_spec.rb

@@ -11,7 +11,8 @@ describe 'DDLParser::Translator::Column' do
     DDLParser::Translator::Column.new(
       {:field=> 'char_field',
        :data_type=>{:char=>{:length=>{:integer=> '4'}}},
-       :options=> ''})
+       :options=> [{:default_clause=>[{:string => "'foobar'"}]}]}
+      )
   }
 
   let(:decimal_column) {
@@ -63,7 +64,7 @@ describe 'DDLParser::Translator::Column' do
 
   it 'should return options' do
     int_column.options.should == nil
-    char_column.options.should == nil
+    char_column.options.should == [{:default_clause=>[{:string =>"'foobar'"}]}]
     decimal_column.options.should == [{:column_option=> 'not null'}, {:default_clause=>[{:integer=> '0'}]}]
   end
 
@@ -75,7 +76,7 @@ describe 'DDLParser::Translator::Column' do
 
   it 'should return default clause' do
     int_column.default_clause.should == nil
-    char_column.default_clause.should == nil
+    char_column.default_clause.should == "'foobar'"
     decimal_column.default_clause.should == 0
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddl_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Rasmus Bergholdt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet