ddl_parser 0.0.9 → 0.0.10

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 
 .idea/
+.vagrant/

data/Vagrantfile

@@ -0,0 +1,9 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.box = 'thoughtbot/ubuntu-14-04-server-with-laptop'
+end

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

@@ -1,112 +1,112 @@
-module DDLParser
-  module DDL
-    module DB2
-      class Parser < Parslet::Parser
-
-        include DDLParser::SharedRules::Constants
-        include DDLParser::SharedRules::LogicalOperators
-        include DDLParser::SharedRules::DataTypes
-
-        # column options
-        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) >>
-                                   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(:check)
-        #rule(:check_condition)
-        #rule(:constraint_attr)
-        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(: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_definition) { (column_name.as(:field) >> space.repeat >> data_type >> space.repeat >> (column_options.maybe).as(:options)).as(:column)}
-
-        rule(:index_column_definition) { column_name.as(:field) >> space.repeat >> (column_sort.as(:sort_id) >> space.repeat).maybe }
-
-        rule(:element_list)      { (lparen >> space? >> (column_definition | constraint | primary_key) >> space? >>
-                                    (comma >> space? >> (column_definition | constraint | primary_key) >> space?).repeat >> rparen).as(:elements)
-                                 }
-
-        rule(:element_list_index) { space? >> index_column_definition >>
-                                    (comma >> space? >> index_column_definition).repeat
-                                  }
-
-        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 >>
-                                    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? >>
-                                    (str('no action')|str('restrict')|str('cascade')|str('set null')).as(:on_delete_option) >> 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)
-        end
-
-        rule(:alter_table_element) { (alter_table_add_column | add_constraint_clause) >> spaces.maybe }
-
-        #rule(:alter_table_alter) { }
-        #rule(:alter_table_drop)  { }
-
-        rule(:term)       { const | item }
-
-        rule(:function)   {
-          (identifier.as(:name) >> space? >>
-              lparen >> arglist.as(:arguments) >> rparen).as(:function)
-        }
-
-        rule(:item)       { function | identifier | string }
-        rule(:arglist)    {
-          item.as(:item) >> (comma >> item.as(:item)).repeat
-        }
-
-        rule(:create_table_statement)   {
-          str('create table').as(:operation) >> space? >> (identifier).as(:table_name)
-        }
-        rule(:alter_table_statement)   {
-          str('alter table').as(:operation) >> space? >> (identifier).as(:table_name)
-        }
-        rule(:create_index_statement)   {
-          str('create').as(:operation) >> (space? >> str('unique').as(:object_property)).maybe >> space? >> str('index').as(:object_type) >> space? >>
-              (identifier).as(:index_name) >> space? >> str('on') >> space? >> (identifier).as(:table_name)
-        }
-        rule(:create_table)     {
-          spaces.maybe >> create_table_statement >> spaces >> element_list >> spaces.maybe >> (item >> spaces.maybe).repeat
-        }
-        rule(:alter_table)     {
-          spaces.maybe >> alter_table_statement >> spaces >> (alter_table_element.repeat).as(:elements)
-        }
-        rule(:create_index)     {
-          spaces.maybe >> create_index_statement >> spaces >> lparen >> element_list_index >> spaces.maybe >> rparen
-        }
-
-        rule(:expression) { create_table | alter_table | create_index}
-        root :expression
-      end
-    end
-  end
-end
-
+module DDLParser
+  module DDL
+    module DB2
+      class Parser < Parslet::Parser
+
+        include DDLParser::SharedRules::Constants
+        include DDLParser::SharedRules::LogicalOperators
+        include DDLParser::SharedRules::DataTypes
+
+        # column options
+        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) >>
+                                   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(:check)
+        #rule(:check_condition)
+        #rule(:constraint_attr)
+        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)>> ((comma|space) >> spaces.maybe >> 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_definition) { (column_name.as(:field) >> space.repeat >> data_type >> space.repeat >> (column_options.maybe).as(:options)).as(:column)}
+
+        rule(:index_column_definition) { column_name.as(:field) >> space.repeat >> (column_sort.as(:sort_id) >> space.repeat).maybe }
+
+        rule(:element_list)      { (lparen >> space? >> (column_definition | constraint | primary_key) >> space? >>
+                                    (comma >> space? >> (column_definition | constraint | primary_key) >> space?).repeat >> rparen).as(:elements)
+                                 }
+
+        rule(:element_list_index) { space? >> index_column_definition >>
+                                    (comma >> space? >> index_column_definition).repeat
+                                  }
+
+        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 >>
+                                    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? >>
+                                    (str('no action')|str('restrict')|str('cascade')|str('set null')).as(:on_delete_option) >> 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)
+        end
+
+        rule(:alter_table_element) { (alter_table_add_column | add_constraint_clause) >> spaces.maybe }
+
+        #rule(:alter_table_alter) { }
+        #rule(:alter_table_drop)  { }
+
+        rule(:term)       { const | item }
+
+        rule(:function)   {
+          (identifier.as(:name) >> space? >>
+              lparen >> arglist.as(:arguments) >> rparen).as(:function)
+        }
+
+        rule(:item)       { function | identifier | string }
+        rule(:arglist)    {
+          item.as(:item) >> (comma >> item.as(:item)).repeat
+        }
+
+        rule(:create_table_statement)   {
+          str('create table').as(:operation) >> space? >> (identifier).as(:table_name)
+        }
+        rule(:alter_table_statement)   {
+          str('alter table').as(:operation) >> space? >> (identifier).as(:table_name)
+        }
+        rule(:create_index_statement)   {
+          str('create').as(:operation) >> (space? >> str('unique').as(:object_property)).maybe >> space? >> str('index').as(:object_type) >> space? >>
+              (identifier).as(:index_name) >> space? >> str('on') >> space? >> (identifier).as(:table_name)
+        }
+        rule(:create_table)     {
+          spaces.maybe >> create_table_statement >> spaces >> element_list >> spaces.maybe >> (item >> spaces.maybe).repeat
+        }
+        rule(:alter_table)     {
+          spaces.maybe >> alter_table_statement >> spaces >> (alter_table_element.repeat).as(:elements)
+        }
+        rule(:create_index)     {
+          spaces.maybe >> create_index_statement >> spaces >> lparen >> element_list_index >> spaces.maybe >> rparen
+        }
+
+        rule(:expression) { create_table | alter_table | create_index}
+        root :expression
+      end
+    end
+  end
+end
+

data/lib/ddl_parser/translator/column.rb

@@ -1,99 +1,132 @@
-class DDLParser::Translator::Column
-
-  def initialize(column_hash)
-    @column_hash = column_hash.is_a?(Hash) ? column_hash : {}
-  end
-
-  def to_hash
-    @column_hash
-  end
-
-  def name
-    @column_hash[:field]
-  end
-
-  def data_type
-    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
-      @column_hash[:data_type].to_sym
-    end
-
-  end
-
-  def length
-    case data_type
-      when :decimal
-        "#{precision}.#{scale}".to_f
-      when :char
-        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
-  end
-
-  def precision
-    case data_type
-      when :decimal
-        begin
-          @column_hash[:data_type][:decimal][:precision][:total][:integer].to_i
-        rescue
-          5 # decimal default if no precision present
-        end
-      else
-        nil
-    end
-  end
-
-  def scale
-    case data_type
-      when :decimal
-        begin
-          @column_hash[:data_type][:decimal][:precision][:scale][:integer].to_i
-        rescue
-          0 # decimal default if no scale present
-        end
-      else
-        nil
-    end
-  end
-
-  def options
-    @column_hash[:options] if @column_hash[:options].length > 0
-  end
-
-  def not_null
-    if options.nil?
-      false
-    else
-      options.select{|h|h.has_key?(:column_option) && h.has_value?('not null')}.length > 0
-    end
-  end
-
-  def default_clause
-    unless options.nil?
-      default_value = options.select{|h|h.has_key?(:default_clause)}.first
-      if default_value
-        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
-  end
-
-end
+class DDLParser::Translator::Column
+
+  def initialize(column_hash)
+    @column_hash = column_hash.is_a?(Hash) ? column_hash : {}
+  end
+
+  def to_hash
+    @column_hash
+  end
+
+  def name
+    @column_hash[:field]
+  end
+
+  def data_type
+    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
+      @column_hash[:data_type].to_sym
+    end
+
+  end
+
+  def length
+    case data_type
+      when :decimal
+        "#{precision}.#{scale}".to_f
+      when :char
+        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
+  end
+
+  def precision
+    case data_type
+      when :decimal
+        begin
+          @column_hash[:data_type][:decimal][:precision][:total][:integer].to_i
+        rescue
+          5 # decimal default if no precision present
+        end
+      else
+        nil
+    end
+  end
+
+  def scale
+    case data_type
+      when :decimal
+        begin
+          @column_hash[:data_type][:decimal][:precision][:scale][:integer].to_i
+        rescue
+          0 # decimal default if no scale present
+        end
+      else
+        nil
+    end
+  end
+
+  def options
+    @column_hash[:options] if @column_hash[:options].length > 0
+  end
+
+  def option(key)
+    # return the right option
+    options.select{|o| o.is_a?(Hash) || o.has_key?(key)}.first
+  end
+
+  def not_null
+    if options.nil?
+      false
+    else
+      options.select{|h|h.has_key?(:column_option) && h.has_value?('not null')}.length > 0
+    end
+  end
+
+  def default_clause
+    unless options.nil?
+      default_value = options.select{|h|h.has_key?(:default_clause)}.first
+      if default_value
+        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
+  end
+
+  def identity?
+    if options.nil?
+      false
+    else
+      options.select{|h|h.has_key?(:column_option) && h.has_value?('identity')}.length > 0
+    end
+  end
+
+  def start_value?
+    unless option(:identity).nil?
+      option(:identity)[:start_value][:integer].to_i
+    end
+  end
+
+  def increment_value
+    if options.nil?
+      false
+    else
+      options.select{|h|h.has_key?(:column_option) && h.has_value?('identity')}.length > 0
+    end
+  end
+  def cache_value
+    if options.nil?
+      false
+    else
+      options.select{|h|h.has_key?(:column_option) && h.has_value?('identity')}.length > 0
+    end
+  end
+end

data/lib/ddl_parser/version.rb

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