mysql2xxxx 0.0.3 → 0.0.4

data/mysql2xxxx.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   s.add_dependency 'activesupport', '>=2.3.10'
-  s.add_dependency 'mysql2'
+  s.add_dependency 'mysql'
   s.add_dependency 'mixlib-cli'
   s.add_dependency 'fast_xs'
   unless RUBY_VERSION >= '1.9'
@@ -29,9 +29,11 @@ Gem::Specification.new do |s|
   
   s.add_development_dependency 'activerecord'
   s.add_development_dependency 'shell-executer'
+  s.add_development_dependency 'posix-spawn'
   if RUBY_VERSION >= '1.9'
     s.add_development_dependency 'ruby-debug19'
   else
+    s.add_development_dependency 'memprof'
     s.add_development_dependency 'ruby-debug'
   end
 end

data/test/helper.rb

@@ -12,6 +12,7 @@ require 'mysql2xxxx'
 
 MYSQL_USER = 'root'
 MYSQL_PASS = 'password'
+MYSQL_HOST = '127.0.0.1'
 TEST_DB = 'mysql2xxxx_test'
 
 def execute_sql(sql, db = 'mysql')
@@ -29,7 +30,8 @@ class Test::Unit::TestCase
       :execute => %{SELECT * FROM automobile_makes WHERE automobile_makes.name IN (SELECT DISTINCT automobile_make_years.make_name FROM automobile_make_years)},
       :user => MYSQL_USER,
       :password => MYSQL_PASS,
-      :database => TEST_DB
+      :database => TEST_DB,
+      :host => MYSQL_HOST
     }
   end
 end

data/test/test_active_record_config_stealing.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 # just to be able to steal the config
 ActiveRecord::Base.establish_connection(
-  'adapter' => 'mysql2',
+  'adapter' => 'mysql',
   'database' => TEST_DB,
   'username' => MYSQL_USER,
   'password' => MYSQL_PASS

data/test/test_multiline_sql.rb

@@ -0,0 +1,19 @@
+require 'helper'
+
+class TestMultilineSql < Test::Unit::TestCase
+  def test_multiline_sql
+    a = Mysql2xxxx::JSON.new @options.merge(:execute => %{
+      DROP TABLE IF EXISTS t1; CREATE TEMPORARY TABLE t1 SELECT CONCAT_WS('-', year, make_name) AS crazy_name FROM automobile_make_years; SELECT * FROM t1
+      })
+    str = a.to_s
+    assert str.include?('2002-Acura')
+  end
+  def test_multiline_sql_with_ending_semicolon
+    a = Mysql2xxxx::JSON.new @options.merge(:execute => %{
+      DROP TABLE IF EXISTS t1; CREATE TEMPORARY TABLE t1 SELECT CONCAT_WS('-', year, make_name) AS crazy_name FROM automobile_make_years; SELECT * FROM t1
+      ;
+      })
+    str = a.to_s
+    assert str.include?('2002-Acura')
+  end
+end

data/test/test_mysql2xxxx.rb

@@ -1,24 +1,28 @@
+# coding: utf-8
 require 'helper'
 
 class TestMysql2xxxx < Test::Unit::TestCase
-  def test_mysql2json
+  def test_1_mysql2json
     a = Mysql2xxxx::JSON.new @options
     str = a.to_s
     assert str.include?('Acura')
+    assert str.include?('Citro\\u00ebn')
     assert !str.include?('DaimlerChrysler')
   end
 
-  def test_mysql2csv
+  def test_2_mysql2csv
     a = Mysql2xxxx::CSV.new @options
     str = a.to_s
     assert str.include?('Acura')
+    assert str.include?('Citroën')
     assert !str.include?('DaimlerChrysler')
   end
   
-  def test_mysql2xml
+  def test_3_mysql2xml
     a = Mysql2xxxx::XML.new @options
     str = a.to_s
     assert str.include?('Acura')
+    assert str.include?('Citro&#235;n')
     assert !str.include?('DaimlerChrysler')
   end
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: mysql2xxxx
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 -06:00
+date: 2011-03-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,25 +21,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 3
-        - 10
         version: 2.3.10
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: mysql2
+  name: mysql
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -56,9 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -70,65 +54,50 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: fastercsv
+  name: activerecord
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: shell-executer
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: shell-executer
+  name: posix-spawn
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
+  name: ruby-debug19
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id008
@@ -148,17 +117,25 @@ files:
 - Gemfile
 - README.rdoc
 - Rakefile
+- benchmark/benchmark.rb
+- benchmark/five_thousand_rows.sql.bz2
+- benchmark/results/0.0.3-20110314153320.txt
+- benchmark/results/0.0.3-20110314160922.txt
+- benchmark/results/0.0.4-20110314190640.txt
+- benchmark/results/0.0.4-20110315110535-ruby18.txt
+- benchmark/results/0.0.4-20110315110613-ruby19.txt
+- benchmark/target.rb
 - bin/mysql2csv
 - bin/mysql2json
 - bin/mysql2xml
 - lib/mysql2xxxx.rb
 - lib/mysql2xxxx/cli.rb
-- lib/mysql2xxxx/csv.rb
-- lib/mysql2xxxx/extra_outputs.rb
-- lib/mysql2xxxx/json.rb
 - lib/mysql2xxxx/properties.rb
 - lib/mysql2xxxx/version.rb
-- lib/mysql2xxxx/xml.rb
+- lib/mysql2xxxx/writer.rb
+- lib/mysql2xxxx/writer/csv.rb
+- lib/mysql2xxxx/writer/json.rb
+- lib/mysql2xxxx/writer/xml.rb
 - mysql2xxxx.gemspec
 - test/fixtures/automobile_make_years.sql
 - test/fixtures/automobile_makes.sql
@@ -166,6 +143,7 @@ files:
 - test/test_active_record_config_stealing.rb
 - test/test_cli.rb
 - test/test_extra_outputs.rb
+- test/test_multiline_sql.rb
 - test/test_mysql2xxxx.rb
 - test/test_well_formedness.rb
 has_rdoc: true
@@ -182,23 +160,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: mysql2xxxx
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: In a memory-sensitive way (but not fast), dump mysql tables to JSON, CSV, XML.
@@ -209,5 +181,6 @@ test_files:
 - test/test_active_record_config_stealing.rb
 - test/test_cli.rb
 - test/test_extra_outputs.rb
+- test/test_multiline_sql.rb
 - test/test_mysql2xxxx.rb
 - test/test_well_formedness.rb

data/lib/mysql2xxxx/csv.rb

@@ -1,32 +0,0 @@
-if RUBY_VERSION >= '1.9'
-  require 'csv'
-else
-  require 'fastercsv'
-end
-
-module Mysql2xxxx
-  class CSV
-    include ExtraOutputs
-    
-    attr_reader :properties
-    
-    def initialize(options = {})
-      @properties = Properties.new options
-    end
-    
-    def to_file(f)
-      @client = ::Mysql2::Client.new properties.database_config
-      keys = nil
-      @client.query(properties.execute).each do |hsh|
-        unless keys
-          keys = hsh.keys
-          f.write keys.to_csv
-        end
-        f.write keys.inject([]) { |memo, k| memo.push hsh[k] }.to_csv
-      end
-      nil
-    ensure
-      @client.try :close
-    end
-  end
-end

data/lib/mysql2xxxx/extra_outputs.rb

@@ -1,23 +0,0 @@
-require 'stringio'
-module Mysql2xxxx
-  module ExtraOutputs
-    def to_s
-      s = ::StringIO.new
-      to_file s
-      s.rewind
-      s.read
-    end
-    
-    def to_stdout
-      to_file $stdout
-      nil
-    end
-    
-    def to_path(path)
-      f = ::File.open(path, 'w')
-      to_file f
-      f.close
-      nil
-    end
-  end
-end

data/lib/mysql2xxxx/json.rb

@@ -1,36 +0,0 @@
-%w{
-  active_support/json/encoding
-}.each do |active_support_3_requirement|
-  require active_support_3_requirement
-end if ::ActiveSupport::VERSION::MAJOR == 3
-
-module Mysql2xxxx
-  class JSON
-    include ExtraOutputs
-    
-    attr_reader :properties
-    
-    def initialize(options = {})
-      @properties = Properties.new options
-    end
-    
-    def to_file(f)
-      @client = ::Mysql2::Client.new properties.database_config
-      first = true
-      f.write '['
-      @client.query(properties.execute).each do |hsh|
-        line = if first
-          first = false
-          hsh.to_json
-        else
-          ',' + hsh.to_json
-        end
-        f.write line
-      end
-      f.write ']'
-      nil
-    ensure
-      @client.try :close
-    end
-  end
-end