ddl_parser 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjA0NzFmMDkxZDBlMDQxMTYyOWUyNjEyMWNlNGFmOTYyOWYwNzNhZg==
-  data.tar.gz: !binary |-
-    ZDYzYmJkNzc3YjQxNmM2MmFhNDExOWZmOTA2ZmQxOWJmZGZmMGE2Mw==
+SHA1:
+  metadata.gz: 3ad6d742be71dfa2eeaf49b8ccf6bd97fae6d72a
+  data.tar.gz: ba19049f73204cabe3e133825554dad7d283a765
 SHA512:
-  metadata.gz: !binary |-
-    OGRmZDYzMTk3OWI4OTk2ZmIzZTU2YmYzZjg1ZjUxNDFjODZhODliYzc1ZDhk
-    NGI0OWNlN2NhZmUwY2ZkNDJmYzhhMjEwNjcyYjYyZTk0ZWQ3MWVhZWJkMzU3
-    YjUxZTdiZWIxNmM0ZGM3NzdhOTQ3ODhkOWM3ZTgzZjQ3MTgzNDU=
-  data.tar.gz: !binary |-
-    NWZkYWJiYmNmMjZjYjY5MDY1ZjYzODllOWVlYjA5YzVmMmVjNTA2N2Q1YzE4
-    YTNjZWMzMmRmZTRkNTJjM2QzMmQ3Y2Y3NTc5MWVhYzAwOGEwODE3NTY1NjE0
-    NzE1ZGNhMjY5ZjNhOGQ3ZmE2OTZlYWJjZjI3ZjYxOWU4NTM3ODg=
+  metadata.gz: a615faff1b2ce6b70b50c641ff256101022adb97c3684a2f971f73dbc9ddc72ea0d7e54fcefe752352d32b8db5bdd00890c9dd18b13b34ee30d00b74f31b55d9
+  data.tar.gz: 759ecd5b9dd0c77998918ba25bb015e148e108ecf9dd192cf67bd2d457b0f94b0a4f458ee7c0a24019c7a8e803e795369271b3836dc17c1038ce2729459b296a

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'

data/ddl_parser.gemspec

@@ -4,23 +4,23 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ddl_parser/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "ddl_parser"
+  spec.name          = 'ddl_parser'
   spec.version       = DDLParser::VERSION
-  spec.authors       = ["Rasmus Bergholdt"]
-  spec.email         = ["raber@eg.dk"]
+  spec.authors       = ['Rasmus Bergholdt']
+  spec.email         = ['rasmus.bergholdt@gmail.com']
   spec.description   = %q{Parse SQL and DDL statements}
   spec.summary       = %q{will parse statements and make it possible to extract content }
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.homepage      = ''
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "parslet", "~> 1.5"
+  spec.add_dependency 'parslet', '~> 1.5'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake", "~> 10.1"
-  spec.add_development_dependency "rspec", "~> 2.2"
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake', '~> 10.1'
+  spec.add_development_dependency 'rspec', '= 2.14.1'
 end

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

@@ -8,30 +8,30 @@ module DDLParser
         include DDLParser::SharedRules::DataTypes
 
         # column options
-        rule(:option_not_null)   { str("not null") }
+        rule(:option_not_null)   { str('not null') }
         rule(:column_option)     { (option_not_null).as(:column_option) }
         #rule(:lob_options)
-        rule(:primary_key)       { (str("primary key") >> spaces >> references).as(:primary_key) }
-        rule(:constraint)        { (str("constraint") >> spaces >> identifier.as(:column_name) >> spaces >> (str("unique") | str("foreign key")).as(:constraint_type) >> 
+        rule(:primary_key)       { (str('primary key') >> spaces >> references).as(:primary_key) }
+        rule(:constraint)        { (str('constraint') >> spaces >> identifier.as(:column_name) >> spaces >> (str('unique') | str('foreign key')).as(:constraint_type) >>
                                    spaces >> references.as(:constraint_arglist) >> spaces >> reference_clause.maybe).as(:constraint)}
         #rule(:unique)
         rule(:references)        { lparen >> space? >> arglist >> space? >> rparen }
-        rule(:reference_clause)  { str("references") >> spaces >> identifier >> spaces >> references.as(:reference_arglist) >> (identifier >> spaces).repeat }
+        rule(:reference_clause)  { str('references') >> spaces >> identifier >> spaces >> references.as(:reference_arglist) >> (identifier >> spaces).repeat }
         #rule(:check)
         #rule(:check_condition)
         #rule(:constraint_attr)
-        rule(:gen_col_def)       { str("generated always") | str("generated by default") }
+        rule(:gen_col_def)       { str('generated always') | str('generated by default') }
         rule(:default_value)     { const | current_timestamp | function }
         rule(:default_values)    { (default_value >> space?).repeat }
-        rule(:default_clause)    { ((str("with") >> space?).maybe >> str("default") >> space? >> default_values).as(:default_clause) }
-        rule(:identity_options)  { (str("as identity") >> space? >> lparen >> str("start with") >> spaces >>
-                                   integer.as(:start_value) >> (comma|space) >> spaces.maybe >>str("increment by") >> spaces >> integer.as(:increment_value)>> (spaces >> str("cache")>>spaces>>integer.as(:cache_value)).maybe >> spaces.maybe >>rparen).as(:identity) }
+        rule(:default_clause)    { ((str('with') >> space?).maybe >> str('default') >> space? >> default_values).as(:default_clause) }
+        rule(:identity_options)  { (str('as identity') >> space? >> lparen >> str('start with') >> spaces >>
+                                   integer.as(:start_value) >> (comma|space) >> spaces.maybe >>str('increment by') >> spaces >> integer.as(:increment_value)>> (spaces >> str('cache')>>spaces>>integer.as(:cache_value)).maybe >> spaces.maybe >>rparen).as(:identity) }
 
         rule(:column_options)    { ((gen_col_def | column_option | default_clause | identity_options) >> spaces).repeat }
 
         rule(:column_name)       { identifier }
         rule(:constraint_name)   { identifier }
-        rule(:column_sort)       { str("ascending") | str("descending")}
+        rule(:column_sort)       { str('ascending') | str('descending')}
 
         rule(:column_definition) { (column_name.as(:field) >> space.repeat >> data_type >> space.repeat >> (column_options.maybe).as(:options)).as(:column)}
 
@@ -45,25 +45,25 @@ module DDLParser
                                     (comma >> space? >> index_column_definition).repeat
                                   }
 
-        rule(:add_constraint_clause)  { (str("add constraint") >> space? >>
+        rule(:add_constraint_clause)  { (str('add constraint') >> space? >>
                                     constraint_name.as(:constraint_name) >> space? >>
                                     foreign_key_clause.as(:foreign_key_clause)).as(:add_constraint)
                                   }
-        rule(:foreign_key_clause)  {str("foreign key") >> space? >> lparen >>
+        rule(:foreign_key_clause)  {str('foreign key') >> space? >> lparen >>
                                     element_list_index.as(:member_fields) >> space? >> rparen >> space?  >>
                                     reference_clause.as(:reference_clause) >> space? >>
                                     (on_delete_clause.as(:on_delete_clause) >> space?).maybe >>
                                     (on_update_clause >> space?).maybe
                                   }
-        rule(:on_delete_clause)    {str("on delete") >> space? >>
+        rule(:on_delete_clause)    {str('on delete') >> space? >>
                                     (str('no action')|str('restrict')|str('cascade')|str('set null')).as(:on_delete_option) >> space?
                                   }
-        rule(:on_update_clause)    {str("on update") >> space? >>
+        rule(:on_update_clause)    {str('on update') >> space? >>
             (str('no action')|str('restrict')).as(:on_update_option) >> space?
                                   }
 
         rule(:alter_table_add_column) do
-          (str("add") >> space? >> (str("column") >> space? >> column_definition) | primary_key).as(:add)
+          (str('add') >> space? >> (str('column') >> space? >> column_definition) | primary_key).as(:add)
         end
 
         rule(:alter_table_element) { (alter_table_add_column | add_constraint_clause) >> spaces.maybe }

data/lib/ddl_parser/ddl/db2.rb

@@ -1,4 +1,4 @@
 module DB2
 end
 
-require "ddl_parser/ddl/db2/parser"
+require 'ddl_parser/ddl/db2/parser'

data/lib/ddl_parser/ddl.rb

@@ -1,4 +1,4 @@
 module DDLParser::DDL
 end
 
-require "ddl_parser/ddl/db2"
+require 'ddl_parser/ddl/db2'

data/lib/ddl_parser/parser.rb

@@ -1,13 +1,13 @@
 class DDLParser::Parser
 
-  attr_accessor :statement_type, :parse_tree, :statement
+  attr_accessor :statement_type, :parse_tree
 
   def initialize(statement)
-    @statement = statement.squish.strip.downcase
+    @statement = statement.split.join(' ').downcase
     @parse_tree = nil
     @parse_error = nil
     begin
-      case @statement
+      case @statement.strip
         when /\Acreate\stable.*/i
           @statement_type = :create_table
           @parse_tree = DDLParser::DDL::DB2::Parser.new.create_table.parse(@statement)
@@ -18,7 +18,7 @@ class DDLParser::Parser
           @statement_type = :create_index
           @parse_tree = DDLParser::DDL::DB2::Parser.new.create_index.parse(@statement)
         else
-          raise "Unknown DDL statement"
+          raise 'Unknown DDL statement'
       end
     rescue Parslet::ParseFailed => error
       @parse_error = error
@@ -36,11 +36,13 @@ class DDLParser::Parser
   def translate
     case statement_type
       when :create_table
-        DDLParser::Translater::CreateTable.new(parse_tree)
+        DDLParser::Translator::CreateTable.new(parse_tree)
       when :alter_table
-        DDLParser::Translater::AlterTable.new(parse_tree)
+        DDLParser::Translator::AlterTable.new(parse_tree)
       when :create_index
-        DDLParser::Translater::Createindex.new(parse_tree)
+        DDLParser::Translator::Createindex.new(parse_tree)
+      else
+        raise "Unknown statement_type #{statement_type}"
     end
   end
 

data/lib/ddl_parser/shared_rules/constants.rb

@@ -3,27 +3,27 @@ module DDLParser
     module Constants
       include Parslet
 
-      rule(:digit)      { match["0-9"] }
-      rule(:integer)    { (str("-").maybe >> digit.repeat(1)).as(:integer) }
-      rule(:float)      { (str("-").maybe >> digit.repeat(1) >> str(".") >> digit.repeat(1)).as(:float) }
+      rule(:digit)      { match['0-9'] }
+      rule(:integer)    { (str('-').maybe >> digit.repeat(1)).as(:integer) }
+      rule(:float)      { (str('-').maybe >> digit.repeat(1) >> str('.') >> digit.repeat(1)).as(:float) }
 
       rule(:space)      { match('\s').repeat(1) }
       rule(:space?)     { space.maybe }
       rule(:newline)    { str("\n") }
       rule(:spaces)     { (space | (comment? >> newline)).repeat }
-      rule(:comment?)   { (str("--") >> (newline.absent? >> any).repeat).maybe }
+      rule(:comment?)   { (str('--') >> (newline.absent? >> any).repeat).maybe }
 
       rule(:comma)      { str(',') >> space? }
       rule(:lparen)     { str('(') >> space? }
       rule(:rparen)     { str(')') >> space? }
 
-      rule(:boolean)    { (str("true") | str("false")).as(:boolean) }
-      rule(:datetime)   { (digit.repeat(4) >> str("-") >>
-          digit.repeat(2) >> str("-") >>
-          digit.repeat(2) >> str("T") >>
-          digit.repeat(2) >> str(":") >>
-          digit.repeat(2) >> str(":") >>
-          digit.repeat(2) >> str("Z")).as(:datetime) }
+      rule(:boolean)    { (str('true') | str('false')).as(:boolean) }
+      rule(:datetime)   { (digit.repeat(4) >> str('-') >>
+          digit.repeat(2) >> str('-') >>
+          digit.repeat(2) >> str('T') >>
+          digit.repeat(2) >> str(':') >>
+          digit.repeat(2) >> str(':') >>
+          digit.repeat(2) >> str('Z')).as(:datetime) }
 
 
       rule(:string)     {
@@ -40,7 +40,7 @@ module DDLParser
       }
 
       rule(:identifier)         { match('\\w').repeat(1) }
-      rule(:current_timestamp)  { str("current timestamp") }
+      rule(:current_timestamp)  { str('current timestamp') }
 
     end
   end

data/lib/ddl_parser/shared_rules/data_types.rb

@@ -5,20 +5,20 @@ module DDLParser
       include DDLParser::SharedRules::Constants
 
       # Build-in data types
-      rule(:type_smallint)      {str("smallint")}
-      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')) >>
+      rule(:type_smallint)      {str('smallint')}
+      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)}
-      rule(:type_float)         {(str("float") >> (lparen >> integer >> rparen).as(:precision)).as(:float)}
-      rule(:type_real)          {str("real")}
-      rule(:type_double)        {str("double")}
-      rule(:type_char)          {((str("character") | str("char")) >> (lparen >> integer >> rparen).as(:length)).as(:char)}
-      rule(:type_varchar)       {(str("varchar") >> (lparen >> integer >> rparen).as(:length)).as(:varchar)}
-      rule(:type_clob)          {(str("clob") >> (lparen >> integer >> rparen).as(:length)).as(:clob)}
-      rule(:type_date)          {str("date")}
-      rule(:type_timestamp)     {str("timestamp")}
-      rule(:type_time)          {type_timestamp.absent? >> str("time")}
+      rule(:type_float)         {(str('float') >> (lparen >> integer >> rparen).as(:precision)).as(:float)}
+      rule(:type_real)          {str('real')}
+      rule(:type_double)        {str('double')}
+      rule(:type_char)          {((str('character') | str('char')) >> (lparen >> integer >> rparen).as(:length)).as(:char)}
+      rule(:type_varchar)       {(str('varchar') >> (lparen >> integer >> rparen).as(:length)).as(:varchar)}
+      rule(:type_clob)          {(str('clob') >> (lparen >> integer >> rparen).as(:length)).as(:clob)}
+      rule(:type_date)          {str('date')}
+      rule(:type_timestamp)     {str('timestamp')}
+      rule(:type_time)          {type_timestamp.absent? >> str('time')}
 
 
       rule(:data_type)          { (type_smallint | type_integer | type_bigint | type_decimal | type_float | type_real |

data/lib/ddl_parser/shared_rules.rb

@@ -1,6 +1,6 @@
 module DDLParser::SharedRules
 end
 
-require "ddl_parser/shared_rules/constants"
-require "ddl_parser/shared_rules/data_types"
-require "ddl_parser/shared_rules/logical_operators"
+require 'ddl_parser/shared_rules/constants'
+require 'ddl_parser/shared_rules/data_types'
+require 'ddl_parser/shared_rules/logical_operators'

data/lib/ddl_parser/sql/db2.rb

@@ -1,4 +1,4 @@
 module DB2
 end
 
-require "ddl_parser/sql/db2/select_parser"
+require 'ddl_parser/sql/db2/select_parser'

data/lib/ddl_parser/sql.rb

@@ -1,4 +1,4 @@
 module DDLParser::SQL
 end
 
-require "ddl_parser/sql/db2"
+require 'ddl_parser/sql/db2'

data/lib/ddl_parser/{translater → translator}/alter_table.rb

@@ -1,4 +1,4 @@
-class DDLParser::Translater::AlterTable
+class DDLParser::Translator::AlterTable
 
     attr_accessor :parse_tree
     def initialize(parse_tree)

data/lib/ddl_parser/{translater → translator}/create_index.rb

@@ -1,4 +1,4 @@
-class DDLParser::Translater::CreateIndex
+class DDLParser::Translator::CreateIndex
 
   attr_accessor :parse_tree
   def initialize(parse_tree)

data/lib/ddl_parser/{translater → translator}/create_table.rb

@@ -1,4 +1,4 @@
-class DDLParser::Translater::CreateTable
+class DDLParser::Translator::CreateTable
     attr_accessor :parse_tree
     def initialize(parse_tree)
       @parse_tree=parse_tree

data/lib/ddl_parser/translator.rb

@@ -0,0 +1,6 @@
+module DDLParser::Translator
+end
+
+require 'ddl_parser/translator/create_table'
+require 'ddl_parser/translator/alter_table'
+require 'ddl_parser/translator/create_index'

data/lib/ddl_parser/version.rb

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

data/lib/ddl_parser.rb

@@ -1,16 +1,16 @@
-require "parslet"
-require "time"
-require "parslet_extentions"
-require "ddl_parser/version"
+require 'parslet'
+require 'time'
+require 'parslet_extentions'
+require 'ddl_parser/version'
 
 module DDLParser
   Error          = Class.new StandardError
   ParseError     = Class.new Error
 end
 
-require "ddl_parser/shared_rules"
-require "ddl_parser/sql"
-require "ddl_parser/ddl"
-require "ddl_parser/parser"
-require "ddl_parser/translater"
+require 'ddl_parser/shared_rules'
+require 'ddl_parser/sql'
+require 'ddl_parser/ddl'
+require 'ddl_parser/parser'
+require 'ddl_parser/translator'
 

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

@@ -1,9 +1,9 @@
-require "spec_helper"
+require_relative '../../../../spec/spec_helper'
 
 describe 'Alter table parsing' do
   let(:parser) { DDLParser::DDL::DB2::Parser.new }
-  context "alter table" do
-    it "parses alter_table add column" do
+  context 'alter table' do
+    it 'parses alter_table add column' do
       sql = <<EOF
             ALTER TABLE BUDGET
               ADD COLUMN BUDGET_AMOUNT_IN_CO DECIMAL(15,2) NOT NULL DEFAULT 0
@@ -18,11 +18,11 @@ EOF
       #puts result.inspect
       result.count.should == 3
       result.should include(:operation, :table_name)
-      result.should include(:operation => "alter table")
+      result.should include(:operation => 'alter table')
       result[:elements].first[:add][:column].should include(:field, :data_type)
     end
 
-    it "parses alter_table foreign key constraint without on" do
+    it 'parses alter_table foreign key constraint without on' do
       sql = <<EOF
 ALTER TABLE REPLAN_ADDR
         ADD CONSTRAINT REPLAN_ADDR_FK
@@ -40,11 +40,11 @@ EOF
       end
 
       #puts result.inspect #.count.should == 3
-      result.should include({:operation => "alter table" , :table_name=>"replan_addr"})
-      result[:elements].first[:add_constraint].should include({:constraint_name=>"replan_addr_fk"})
+      result.should include({:operation => 'alter table', :table_name=> 'replan_addr'})
+      result[:elements].first[:add_constraint].should include({:constraint_name=> 'replan_addr_fk'})
     end
 
-    it "parses foreign key clause" do
+    it 'parses foreign key clause' do
       sql = <<EOF
 FOREIGN KEY
                 (CONSIGNMENT,
@@ -64,12 +64,12 @@ EOF
       #puts result.inspect
       result.count.should == 2
       result.should include(:reference_clause)
-      result[:member_fields][0][:field].should == "consignment"
-      result[:member_fields][1][:field].should == "event"
-      result[:reference_clause][:reference_arglist][0][:item].should == "consignment"
-      result[:reference_clause][:reference_arglist][1][:item].should == "event"
+      result[:member_fields][0][:field].should == 'consignment'
+      result[:member_fields][1][:field].should == 'event'
+      result[:reference_clause][:reference_arglist][0][:item].should == 'consignment'
+      result[:reference_clause][:reference_arglist][1][:item].should == 'event'
     end
-    it "parses reference_clause" do
+    it 'parses reference_clause' do
       sql = <<EOF
 REFERENCES REPLAN_MAIN
                 (CONSIGNMENT,
@@ -84,10 +84,10 @@ EOF
 
       #puts result.inspect
       result.should include(:reference_arglist)
-      result[:reference_arglist][0][:item].should == "consignment"
-      result[:reference_arglist][1][:item].should == "event"
+      result[:reference_arglist][0][:item].should == 'consignment'
+      result[:reference_arglist][1][:item].should == 'event'
     end
-    it "parses on_delete_clause" do
+    it 'parses on_delete_clause' do
       sql = <<EOF
 ON DELETE RESTRICT
 EOF
@@ -101,7 +101,7 @@ EOF
       result.should include(:on_delete_option => 'restrict')
     end
 
-    it "parses on_update_clause" do
+    it 'parses on_update_clause' do
       sql = <<EOF
 ON UPDATE NO ACTION
 EOF
@@ -116,7 +116,7 @@ EOF
     end
 
 
-    it "parses complete alter_table" do
+    it 'parses complete alter_table' do
       sql = <<EOF
 ALTER TABLE REPLAN_ADDR
         ADD CONSTRAINT REPLAN_ADDR_FK
@@ -137,8 +137,8 @@ EOF
 
       #puts result.inspect
       result.should include(:operation, :table_name)
-      result.should include(:operation => "alter table")
-      result.should include(:table_name => "replan_addr")
+      result.should include(:operation => 'alter table')
+      result.should include(:table_name => 'replan_addr')
       result[:elements].first.should include(:add_constraint)
       result[:elements].first[:add_constraint].should include(:constraint_name => 'replan_addr_fk')
       result[:elements].first[:add_constraint].should include(:foreign_key_clause)

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

@@ -1,8 +1,8 @@
-require "spec_helper"
+require_relative '../../../../spec/spec_helper'
 
 describe 'Create index parsing' do
   let(:parser) { DDLParser::DDL::DB2::Parser.new }
-  it "parses create_unique_index" do
+  it 'parses create_unique_index' do
     sql = <<EOF
 CREATE UNIQUE INDEX REPLAN_ADDR_1 ON REPLAN_ADDR
  (CONSIGNMENT ASCENDING, COLLI DESCENDING )
@@ -15,9 +15,9 @@ EOF
 
     result.count.should == 3
     result[0].should include(:operation, :object_property, :object_type, :index_name)
-    result[0].should include(:operation => "create")
-    result[0].should include(:object_property => "unique")
-    result[0].should include(:object_type => "index")
+    result[0].should include(:operation => 'create')
+    result[0].should include(:object_property => 'unique')
+    result[0].should include(:object_type => 'index')
     result[1].should include(:field)
     result[1].should include(:sort_id)
     result[2].should include(:field)