mysql_parser 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c52fce6a952144a2a597ef0952d7f10151a4ea9
-  data.tar.gz: 353638cecf1a228a99bc6d739c71a68c01b8b272
+  metadata.gz: 3de1a91ad6044bb63b5a963c7775e9f6c2a0a3e9
+  data.tar.gz: 8a9538f93d7d2c067b7a1220bc0b82ab1c4d1c3c
 SHA512:
-  metadata.gz: 19630b80634d5816fb626aa5a9f46df4e019ff42f5e0002db908fa32ca2264199c4f7fc99dc895a6ca03b69fb695ea0202cac4ea704ace04ea7feff47d76d09a
-  data.tar.gz: 2b492b16f2b3c1dc57a3faae5f5f1518bfca63f6001755a997a1c05c2f2d9135f8dd13cb569def00d247418e32f97f33d4304227279ee4d35b5913196ffb3607
+  metadata.gz: 7dd4828d7eea7c2d6ffc2138cc698da466881a686b5c5a756c8e0f72d56e2bd718b766ec8ec663e2da21bcefeb0aedceb25e047282413fd27b679b3c8e6f0e08
+  data.tar.gz: 4041bf4e6dd443d678f1da294dc9f51c2dc5c1aad02be88fdd529e13685ea9cdddeb99f5fd202613d6e339dc20c249db641c4fe66f5e0743dd7f5203b787ce1b

data/ChangeLog

@@ -2,6 +2,11 @@
 
 = Revision history for mysql_parser
 
+== 0.1.0 [2015-10-02]
+
+* Extracted MysqlParser::StatementParser from MysqlParser.
+* Minor refactorings.
+
 == 0.0.1 [2014-04-30]
 
 * First release (extracted from ruby-nuggets).

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to mysql_parser version 0.0.1
+This documentation refers to mysql_parser version 0.1.0
 
 
 == DESCRIPTION
@@ -12,7 +12,7 @@ A parser for MySQL DDL statements.
 
 == LINKS
 
-Documentation:: https://blackwinter.github.io/mysql_parser/
+Documentation:: https://blackwinter.github.com/mysql_parser
 Source code::   https://github.com/blackwinter/mysql_parser
 RubyGem::       https://rubygems.org/gems/mysql_parser
 Travis CI::     https://travis-ci.org/blackwinter/mysql_parser
@@ -25,7 +25,7 @@ Travis CI::     https://travis-ci.org/blackwinter/mysql_parser
 
 == LICENSE AND COPYRIGHT
 
-Copyright (C) 2014 Jens Wille
+Copyright (C) 2014-2015 Jens Wille
 
 mysql_parser is free software: you can redistribute it and/or modify it
 under the terms of the GNU Affero General Public License as published by

data/Rakefile

@@ -1,4 +1,4 @@
-require File.expand_path(%q{../lib/mysql_parser/version}, __FILE__)
+require_relative 'lib/mysql_parser/version'
 
 begin
   require 'hen'

data/lib/mysql_parser.rb

@@ -29,11 +29,6 @@ class MysqlParser
   DEFAULT_NAME  = '__DEFAULT__'.freeze
   DEFAULT_TABLE = '__DEFAULT__'.freeze
 
-  USE_RE           = /\AUSE\s+`(.+?)`/i
-  CREATE_TABLE_RE  = /\ACREATE\s+TABLE\s+`(.+?)`/i
-  TABLE_COLUMN_RE  = /\A\s+`(.+?)`/
-  FINISH_TABLE_RE  = /\A\).*;\Z/
-  INSERT_VALUES_RE = /\AINSERT\s+INTO\s+`(.+?)`\s+(?:\((.+?)\)\s+)?VALUES\s*(.*);\Z/i
   CLEAN_COLUMNS_RE = /[\s`]+/
 
   def self.parse(input, &block)
@@ -46,11 +41,14 @@ class MysqlParser
   end
 
   def reset
-    @name         = DEFAULT_NAME
-    @table        = DEFAULT_TABLE
-    @tables       = {}
-    @columns      = Hash.new { |h, k| h[k] = [] }
-    @value_parser = ValueParser.new
+    @name             = DEFAULT_NAME
+    @table            = DEFAULT_TABLE
+
+    @tables           = {}
+    @columns          = Hash.new { |h, k| h[k] = [] }
+
+    @value_parser     = ValueParser.new
+    @statement_parser = StatementParser.new
   end
 
   attr_reader :tables
@@ -68,31 +66,33 @@ class MysqlParser
       }
     end
 
-    name, table, columns, value_parser, block_given =
-      @name, @table, @columns, @value_parser, block_given?
+    name, table, columns, statement_parser, value_parser, block_given =
+      @name, @table, @columns, @statement_parser, @value_parser, block_given?
 
     input.each { |line|
-      case line
-        when USE_RE
-          name = $1
-          yield :use, name if block_given
-        when CREATE_TABLE_RE
-          table = $1
-        when TABLE_COLUMN_RE
-          columns[table] << $1 if table
-        when FINISH_TABLE_RE
-          yield :table, name, table, columns[table] if block_given
-          table = nil
-        when INSERT_VALUES_RE
-          _table, _columns, _values = $1, $2, $3
-
-          _columns = _columns.nil? ? columns[_table] :
-            _columns.gsub(CLEAN_COLUMNS_RE, '').split(',')
-
-          value_parser.parse(_values) { |values|
-            block[:insert, name, _table, _columns, values]
-          } unless _columns.empty?
-      end
+      statement_parser.parse(line) { |context, *data|
+        case context
+          when :use
+            name = data[0]
+            yield context, name if block_given
+          when :create
+            table = data[0]
+          when :column
+            columns[table] << data[0] if table
+          when :table
+            yield context, name, table, columns[table] if block_given
+            table = nil
+          when :insert
+            _table, _columns, _values = data
+
+            _columns = _columns.nil? ? columns[_table] :
+              _columns.gsub(CLEAN_COLUMNS_RE, '').split(',')
+
+            value_parser.parse(_values) { |values|
+              block[context, name, _table, _columns, values]
+            } unless _columns.empty?
+        end
+      }
     }
 
     @name, @table = name, table
@@ -104,5 +104,6 @@ end
 
 MySQLParser = MysqlParser
 
+require_relative 'mysql_parser/statement_parser'
 require_relative 'mysql_parser/value_parser'
 require_relative 'mysql_parser/version'

data/lib/mysql_parser/statement_parser.rb

@@ -0,0 +1,100 @@
+#--
+###############################################################################
+#                                                                             #
+# mysql_parser -- Parse MySQL statements                                      #
+#                                                                             #
+# Copyright (C) 2014 Jens Wille                                               #
+#                                                                             #
+# Authors:                                                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
+#                                                                             #
+# mysql_parser is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU Affero General Public License as published by    #
+# the Free Software Foundation; either version 3 of the License, or (at your  #
+# option) any later version.                                                  #
+#                                                                             #
+# mysql_parser is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License #
+# for more details.                                                           #
+#                                                                             #
+# You should have received a copy of the GNU Affero General Public License    #
+# along with mysql_parser. If not, see <http://www.gnu.org/licenses/>.        #
+#                                                                             #
+###############################################################################
+#++
+
+class MysqlParser
+
+  class StatementParser
+
+    QUOTED_NAME_RE = %r{
+      `
+      ( .*? )
+      `
+    }xi
+
+    USE_RE = %r{
+      \A
+      USE
+      \s+
+      #{QUOTED_NAME_RE}
+    }xi
+
+    CREATE_TABLE_RE = %r{
+      \A
+      CREATE \s+ TABLE
+      \s+
+      #{QUOTED_NAME_RE}
+    }xi
+
+    TABLE_COLUMN_RE = %r{
+      \A
+      \s+
+      #{QUOTED_NAME_RE}
+    }xi
+
+    FINISH_TABLE_RE = %r{
+      \A
+      \)
+      .*
+      ;
+      \Z
+    }xi
+
+    INSERT_VALUES_RE = %r{
+      \A
+      INSERT \s+ INTO
+      \s+
+      #{QUOTED_NAME_RE}
+      \s+
+      (?:
+        \(
+        ( .+? )
+        \)
+        \s+
+      )?
+      VALUES
+      \s*
+      ( .* )
+      ;
+      \Z
+    }xi
+
+    def self.parse(input)
+      new.parse(input)
+    end
+
+    def parse(input)
+      case input
+        when USE_RE           then yield :use,    $1
+        when CREATE_TABLE_RE  then yield :create, $1
+        when TABLE_COLUMN_RE  then yield :column, $1
+        when FINISH_TABLE_RE  then yield :table
+        when INSERT_VALUES_RE then yield :insert, $1, $2, $3
+      end
+    end
+
+  end
+
+end

data/lib/mysql_parser/value_parser.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # mysql_parser -- Parse MySQL statements                                      #
 #                                                                             #
-# Copyright (C) 2014 Jens Wille                                               #
+# Copyright (C) 2014-2015 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@gmail.com>                                       #
@@ -47,7 +47,7 @@ class MysqlParser
         break unless @input.scan(/,\s*/)
       end
 
-      @input.scan(/;/)  # optional
+      @input.skip(/;/)
 
       error('Unexpected data') unless @input.eos?
 
@@ -116,11 +116,8 @@ class MysqlParser
     end
 
     def error(message)
-      if @input.eos?
-        raise "Unexpected end of input (#{message})."
-      else
-        raise "#{message} at #{$.}:#{@input.pos}: #{@input.peek(16).inspect}"
-      end
+      raise @input.eos? ? "Unexpected end of input (#{message})." :
+        "#{message} at #{$.}:#{@input.pos}: #{@input.peek(16).inspect}"
     end
 
   end

data/lib/mysql_parser/version.rb

@@ -3,8 +3,8 @@ class MysqlParser
   module Version
 
     MAJOR = 0
-    MINOR = 0
-    TINY  = 1
+    MINOR = 1
+    TINY  = 0
 
     class << self
 

data/spec/mysql_parser/statement_parser_spec.rb

@@ -0,0 +1,35 @@
+describe MysqlParser::StatementParser do
+
+  def parsing(input)
+    lambda { |b| @statement_parser.parse(input, &b) }
+  end
+
+  before :all do
+    @statement_parser = MysqlParser::StatementParser.new
+  end
+
+  example do
+    parsing('').should_not yield_control
+  end
+
+  example do
+    parsing('USE `foo`').should yield_with_args(:use, 'foo')
+  end
+
+  example do
+    parsing('CREATE TABLE `bar` (').should yield_with_args(:create, 'bar')
+  end
+
+  example do
+    parsing('  `baz` INTEGER').should yield_with_args(:column, 'baz')
+  end
+
+  example do
+    parsing(');').should yield_with_args(:table)
+  end
+
+  example do
+    parsing('INSERT INTO `bar` VALUES (42);').should yield_with_args(:insert, 'bar', nil, '(42)')
+  end
+
+end

data/spec/mysql_parser/value_parser_spec.rb

@@ -0,0 +1,43 @@
+describe MysqlParser::ValueParser do
+
+  def parsing(input)
+    @value_parser.parse(input)
+  end
+
+  before :all do
+    @value_parser = MysqlParser::ValueParser.new
+  end
+
+  example do
+    parsing('').should == []
+  end
+
+  example do
+    parsing('(42)').should == [[42]]
+  end
+
+  example do
+    parsing('(2.3)').should == [[2.3]]
+  end
+
+  example do
+    parsing("('foo')").should == [['foo']]
+  end
+
+  example do
+    parsing('(NULL)').should == [[nil]]
+  end
+
+  example do
+    parsing("('foo',NULL,42)").should == [['foo', nil, 42]]
+  end
+
+  example do
+    parsing("('foo',NULL,42), ('bar', 'baz', 2.3)").should == [['foo', nil, 42], ['bar', 'baz', 2.3]]
+  end
+
+  example do
+    lambda { parsing('("foo")') }.should raise_error(RuntimeError, /Unclosed row/)
+  end
+
+end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: mysql_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hen
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,10 +72,12 @@ files:
 - README
 - Rakefile
 - lib/mysql_parser.rb
+- lib/mysql_parser/statement_parser.rb
 - lib/mysql_parser/value_parser.rb
 - lib/mysql_parser/version.rb
+- spec/mysql_parser/statement_parser_spec.rb
+- spec/mysql_parser/value_parser_spec.rb
 - spec/mysql_parser_spec.rb
-- spec/mysql_parser_spec/value_parser_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/blackwinter/mysql_parser
 licenses:
@@ -77,13 +85,14 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  mysql_parser-0.0.1 [2014-04-30]:
+  mysql_parser-0.1.0 [2015-10-02]:
 
-  * First release (extracted from ruby-nuggets).
+  * Extracted MysqlParser::StatementParser from MysqlParser.
+  * Minor refactorings.
 
 rdoc_options:
 - "--title"
-- mysql_parser Application documentation (v0.0.1)
+- mysql_parser Application documentation (v0.1.0)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -104,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2.x
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Parse MySQL statements.

data/spec/mysql_parser_spec/value_parser_spec.rb

@@ -1,39 +0,0 @@
-describe MysqlParser::ValueParser do
-
-  before :all do
-    @value_parser = MysqlParser::ValueParser.new
-  end
-
-  example do
-    @value_parser.parse('').should == []
-  end
-
-  example do
-    @value_parser.parse('(42)').should == [[42]]
-  end
-
-  example do
-    @value_parser.parse('(2.3)').should == [[2.3]]
-  end
-
-  example do
-    @value_parser.parse("('foo')").should == [['foo']]
-  end
-
-  example do
-    @value_parser.parse('(NULL)').should == [[nil]]
-  end
-
-  example do
-    @value_parser.parse("('foo',NULL,42)").should == [['foo', nil, 42]]
-  end
-
-  example do
-    @value_parser.parse("('foo',NULL,42), ('bar', 'baz', 2.3)").should == [['foo', nil, 42], ['bar', 'baz', 2.3]]
-  end
-
-  example do
-    lambda { @value_parser.parse('("foo")') }.should raise_error(RuntimeError, /Unclosed row/)
-  end
-
-end