ddl_parser 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ad6d742be71dfa2eeaf49b8ccf6bd97fae6d72a
-  data.tar.gz: ba19049f73204cabe3e133825554dad7d283a765
+  metadata.gz: 63d4dbb66ada3b69d10294482aed60ca5b909c2f
+  data.tar.gz: 09795b90626029ddb528d381f663d28e9a49d3a5
 SHA512:
-  metadata.gz: a615faff1b2ce6b70b50c641ff256101022adb97c3684a2f971f73dbc9ddc72ea0d7e54fcefe752352d32b8db5bdd00890c9dd18b13b34ee30d00b74f31b55d9
-  data.tar.gz: 759ecd5b9dd0c77998918ba25bb015e148e108ecf9dd192cf67bd2d457b0f94b0a4f458ee7c0a24019c7a8e803e795369271b3836dc17c1038ce2729459b296a
+  metadata.gz: bd534f8677dcf48f106e1c453a881e17a06f42a98dfc6e09523882484cc90b56f8d1454a8c4771383d19f81c2fd6b19216895b5fd83785be4a4c4d54e9933f1b
+  data.tar.gz: 5a76d6eef1c476c9fe8b633ab8e085a67304261290c3a91682569d6657ee9ef9f023973a5270f15d47ef1a838b65741e4985eef02700c78f1b90dbb72625899c

data/lib/ddl_parser/parser.rb

@@ -1,9 +1,9 @@
 class DDLParser::Parser
 
-  attr_accessor :statement_type, :parse_tree
+  attr_accessor :statement_type, :parse_tree, :parse_error
 
-  def initialize(statement)
-    @statement = statement.split.join(' ').downcase
+  def initialize(statement, do_downcase=true)
+    @statement = do_downcase ? statement.downcase : statement
     @parse_tree = nil
     @parse_error = nil
     begin
@@ -30,7 +30,11 @@ class DDLParser::Parser
   end
 
   def errors
-    @parse_error.to_s if @parse_error
+    @parse_error.cause.ascii_tree if @parse_error
+  end
+
+  def most_likely_error
+    @parse_error.cause.ascii_tree.split("\n").last.gsub('      `- ','') if @parse_error
   end
 
   def translate

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) >> rparen).as(:precision))).as(:decimal)}
+          (lparen >> integer.as(:total) >> (comma >> integer.as(:scale)).maybe >> rparen).as(:precision))).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/version.rb

@@ -1,3 +1,3 @@
 module DDLParser
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

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

@@ -420,7 +420,37 @@ EOF
       result[:operation].should == 'create table'
       result[:table_name].should == 'user'
     end
+    it 'parses Example 17' do
 
+      sql = <<EOF
+CREATE TABLE COST_INVOICE
+        (DOC_NO CHARACTER(8) NOT NULL,
+        STATUS CHARACTER(12) NOT NULL,
+        DISPUTE CHARACTER(8),
+        SAP_STATUS CHARACTER(1),
+        DEPT CHARACTER(5) NOT NULL,
+        FROM_DEPT CHARACTER(5) NOT NULL,
+        CUSTOMER_NO DECIMAL(12) NOT NULL,
+        SENDER_DOC_NO CHARACTER(8) NOT NULL,
+        INVOICE_DATE DATE NOT NULL,
+        DUE_DATE DATE NOT NULL,
+        LASTUSER CHARACTER(4) NOT NULL,
+        CREATE_TS TIMESTAMP NOT NULL,
+        UPDATE_TS TIMESTAMP NOT NULL,
+        UPDATE_TS_REAL_TIME TIMESTAMP NOT NULL,
+        UNIQUE_NO INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1 INCREMENT BY 1 CACHE 20))
+IN CPH_TS001
+EOF
+
+      begin
+        result = parser.parse(sql.downcase)
+      rescue Parslet::ParseFailed => error
+        puts error.cause.ascii_tree
+      end
+
+      result[:operation].should == 'create table'
+      result[:table_name].should == 'cost_invoice'
+    end
 
   end
 end

data/spec/ddl_parser/parser_spec.rb

@@ -93,4 +93,37 @@ EOF
     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"
+      parser = DDLParser::Parser.new(sql)
+      parser.valid?.should == false
+      parser.errors.should include("Premature end of input")
+    end
+
+    it 'misses element delimiter' do
+      sql = "Create table USER (FOO CHAR(4) NOT NULL BAR CHAR(4) NOT NULL)"
+      parser = DDLParser::Parser.new(sql)
+      parser.valid?.should == false
+      parser.errors.should include('Expected ")", but got "b"')
+    end
+
+    it 'must likely error 1' do
+      sql = "Create table USER (FOO CHAR(4) NOT NULL, BAR CHAR(4) NOT NULL"
+      parser = DDLParser::Parser.new(sql)
+      parser.valid?.should == false
+      parser.most_likely_error.should == 'Premature end of input at line 1 char 62.'
+    end
+
+    it 'must likely error 2' do
+      sql = "Create table USER (FOO CHAR(4) NOT NULL BAR CHAR(4) NOT NULL)"
+      parser = DDLParser::Parser.new(sql)
+      parser.valid?.should == false
+      parser.most_likely_error.should == 'Expected ")", but got "b" at line 1 char 41.'
+    end
+
+  end
+
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddl_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Rasmus Bergholdt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-14 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: will parse statements and make it possible to extract content