mysql_binlog 0.1.6 → 0.1.7

data/bin/mysql_binlog_dump

@@ -9,6 +9,8 @@ reader = BinlogFileReader.new(ARGV.first)
 #reader = DebuggingReader.new(reader, :data => true, :calls => true)
 binlog = Binlog.new(reader)
 
+binlog.ignore_rotate = true
+
 binlog.each_event do |event|
   pp event
 end

data/lib/mysql_binlog/binlog.rb

@@ -39,6 +39,7 @@ module MysqlBinlog
     attr_accessor :event_parser
     attr_accessor :filter_event_types
     attr_accessor :filter_flags
+    attr_accessor :ignore_rotate
     attr_accessor :max_query_length
 
     def initialize(reader)
@@ -48,6 +49,7 @@ module MysqlBinlog
       @fde = nil
       @filter_event_types = nil
       @filter_flags = nil
+      @ignore_rotate = false
       @max_query_length = 1048576
     end
 
@@ -127,6 +129,7 @@ module MysqlBinlog
 
         case event_type
         when :rotate_event
+          next if ignore_rotate
           reader.rotate(fields[:name], fields[:pos])
         when :format_description_event
           process_fde(fields)

data/lib/mysql_binlog/binlog_event_parser.rb

@@ -251,10 +251,17 @@ module MysqlBinlog
       when :blob, :geometry
         { :length_size => parser.read_uint8 }
       when :string, :var_string
-        {
-          :real_type   => MYSQL_TYPES[parser.read_uint8],
-          :max_length  => parser.read_uint8,
-        }
+        # The :string type sets a :real_type field to indicate the actual type
+        # which is fundamentally incompatible with :string parsing. Setting
+        # a :type key in this hash will cause table_map_event to override the
+        # main field :type with the provided type here.
+        real_type = MYSQL_TYPES[parser.read_uint8]
+        case real_type
+        when :enum, :set
+          { :type => real_type, :size => parser.read_uint8 }
+        else
+          { :max_length  => parser.read_uint8 }
+        end
       end
     end
     private :_table_map_event_column_metadata_read
@@ -281,6 +288,14 @@ module MysqlBinlog
       columns_metadata = _table_map_event_column_metadata(columns_type)
       columns_nullable = parser.read_bit_array(columns)
 
+      # Remap overloaded types before we piece together the entire event.
+      columns.times do |c|
+        if columns_metadata[c] and columns_metadata[c][:type]
+          columns_type[c] = columns_metadata[c][:type]
+          columns_metadata[c].delete :type
+        end
+      end
+
       map_entry[:columns] = columns.times.map do |c|
         {
           :type     => columns_type[c],

data/lib/mysql_binlog/binlog_field_parser.rb

@@ -80,6 +80,23 @@ module MysqlBinlog
       reader.read(8).unpack("Q").first
     end
 
+    def read_uint_by_size(size)
+      case size
+      when 1
+        read_uint8
+      when 2
+        read_uint16
+      when 3
+        read_uint24
+      when 4
+        read_uint32
+      when 6
+        read_uint48
+      when 8
+        read_uint64
+      end
+    end
+
     # Read a single-precision (4-byte) floating point number.
     def read_float
       reader.read(4).unpack("g").first
@@ -132,16 +149,7 @@ module MysqlBinlog
     # optional size parameter (default 1), followed by the string itself with
     # no termination character.
     def read_lpstring(size=1)
-      case size
-      when 1
-        length = read_uint8
-      when 2
-        length = read_uint16
-      when 3
-        length = read_uint24
-      when 4
-        length = read_uint32
-      end
+      length = read_uint_by_size(size)
       read_nstring(length)
     end
 
@@ -279,6 +287,8 @@ module MysqlBinlog
         convert_mysql_type_time(read_uint24)
       when :datetime
         convert_mysql_type_datetime(read_uint64)
+      when :enum, :set
+        read_uint_by_size(metadata[:size])
       #when :bit
       #when :newdecimal
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mysql_binlog
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Jeremy Cole
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-28 00:00:00 Z
+date: 2012-06-29 00:00:00 Z
 dependencies: []
 
 description: Library for parsing MySQL binary logs in Ruby