dohmysql 0.1.6 → 0.1.7

data/lib/doh/mysql/load_sql.rb

@@ -6,15 +6,27 @@ def self.mysql_arg(value, option_specifier)
   if value.to_s.strip.empty? then '' else " -#{option_specifier}#{value}" end
 end
 
-def self.load_sql(dbconfig, filenames)
+# NOTE: this doesn't work on jruby, but keeping it around in case it's determined to be significantly faster than the more portable version in place now
+# in which case, we can use the popen version on the rubys that it works with and the other one as needed
+def self.load_sql_using_popen(dbconfig, filenames)
+  dohlog.debug("loading sql file: " + filenames.first) if filenames.size == 1
+
   mysqlcmd = 'mysql' + mysql_arg(dbconfig[:host], 'h') + mysql_arg(dbconfig[:username], 'u') + mysql_arg(dbconfig[:password], 'p') + ' ' + dbconfig[:database]
   io = IO.popen(mysqlcmd, 'r+')
-  dohlog.debug("loading sql file: " + filenames.first) if filenames.size == 1
   filenames.each do |elem|
     open(elem) {|file| io << file.read}
   end
   io.close
 end
 
+def self.load_sql(dbconfig, filenames)
+  dohlog.debug("loading sql file: " + filenames.first) if filenames.size == 1
+
+  basecmd = 'mysql' + mysql_arg(dbconfig[:host], 'h') + mysql_arg(dbconfig[:username], 'u') + mysql_arg(dbconfig[:password], 'p') + ' ' + dbconfig[:database] + ' < '
+  filenames.each do |elem|
+    `#{basecmd} #{elem}`
+  end
+end
+
 end
 

data/lib/doh/mysql/to_sql.rb

@@ -2,6 +2,7 @@ require 'sqlstmt/to_sql'
 require 'mysql2'
 
 class String
+  undef to_sql
   def to_sql
     "'#{Mysql2::Client.escape(to_s)}'"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohmysql
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-30 00:00:00.000000000Z
+date: 2012-04-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohroot
-  requirement: &70363389961120 !ruby/object:Gem::Requirement
+  requirement: &70110058360140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70363389961120
+  version_requirements: *70110058360140
 - !ruby/object:Gem::Dependency
   name: dohutil
-  requirement: &70363389960520 !ruby/object:Gem::Requirement
+  requirement: &70110058359560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.1.8
   type: :runtime
   prerelease: false
-  version_requirements: *70363389960520
+  version_requirements: *70110058359560
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70363389959920 !ruby/object:Gem::Requirement
+  requirement: &70110058359000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.3.11
   type: :runtime
   prerelease: false
-  version_requirements: *70363389959920
+  version_requirements: *70110058359000
 - !ruby/object:Gem::Dependency
   name: sqlstmt
-  requirement: &70363389959340 !ruby/object:Gem::Requirement
+  requirement: &70110058358400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70363389959340
+  version_requirements: *70110058358400
 - !ruby/object:Gem::Dependency
   name: dohtest
-  requirement: &70363389933500 !ruby/object:Gem::Requirement
+  requirement: &70110058357780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: 0.1.8
   type: :development
   prerelease: false
-  version_requirements: *70363389933500
+  version_requirements: *70110058357780
 description: wrapper classes around low level mysql gem to provide a better interface
 email:
 - devinfo@atpsoft.com