jvertica 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ced7735ddb127ea13cb6842a1902a1acc0258a7
-  data.tar.gz: 0664701771ce55dd33c22da4e1a082c752034be4
+  metadata.gz: c23d87043466109fa58a4068771e6fbdfb5a7130
+  data.tar.gz: 970b488aa5d74b94a59fe131d265c56e4ebf8a40
 SHA512:
-  metadata.gz: 54184b00b156248c46ed561da8442f4a2b9c133b8ca4847f079c3e1d08af09967c2c2185e51573817fe668b698971069e6aea07e71d8ad6f660fbcfbdbce29d4
-  data.tar.gz: b20be8aebf799dd32e928bfbbd4009fdedf1b15805647d94fabf8887ad70501c402f8edb17a09870a7c41556be5c094aeb58070461a804b43ad58a4d54b9d832
+  metadata.gz: c702a7ef2da491b0b261b1dacd51eec569e386e8d37c1af276069fbb3441451ed8fdaa3ae2c7abb9e33ff28f3a6f1730b1927545bb70ff7bf551e1d4abb639cd
+  data.tar.gz: 8eeadf300ea89cbf68f9ba63296a932a7cc2d84e05f5705160960d4bdbc0c55b574edd97bd64fb504443435a4257b54b34b16e1ca408de1d6ce5a5794191d9e3

data/lib/jvertica/version.rb

@@ -1,3 +1,3 @@
 class Jvertica
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/jvertica.rb

@@ -16,7 +16,7 @@ class Jvertica
     password: '',
     user: 'dbadmin',
     AutoCommit: false,
-  } 
+  }
 
   def self.connect options = {}
     new options
@@ -41,8 +41,8 @@ class Jvertica
     @connection = begin
                     DriverManager.getConnection "jdbc:vertica://#{host}:#{port}/#{database}", prop
                   rescue => e
-                    raise ConnectionError.new("Connection Failed.\n" + 
-                      "Error Message => #{e.message}\n" + 
+                    raise ConnectionError.new("Connection Failed.\n" +
+                      "Error Message => #{e.message}\n" +
                       "see documentation => #{Constant::CONNECTION_PROPERTY_DOCUMENT_URL}\n")
                   end
     @closed = false
@@ -58,7 +58,7 @@ class Jvertica
   end
 
   def commit
-    @connection.commit 
+    @connection.commit
   end
 
   def rollback
@@ -89,7 +89,7 @@ class Jvertica
   def query query, &blk
     stmt = @connection.createStatement
     case query
-    when %r{\A\s*copy}miu   then raise InvalidQuery.new('cannot use "copy".')
+    when %r{\A\s*copy}miu   then return stmt.execute query
     when %r{\A\s*insert}miu then return stmt.executeUpdate query
     when %r{\A\s*update}miu then return stmt.executeUpdate query
     when %r{\A\s*delete}miu then return stmt.executeUpdate query
@@ -110,19 +110,22 @@ class Jvertica
 
   def copy query, source = nil, &blk
     raise InvalidQuery.new('can use only "copy".') unless %r{\A\s*copy}miu === query
+    if !source.nil?
+      copy_stream(query, source, &blk)
+    else
+      [query(query), nil]
+    end
+  end
+
+  private
+  def copy_stream query, io = nil, &blk
     stream = com.vertica.jdbc.VerticaCopyStream.new @connection, query
     stream.start
     thread = nil
     begin
-      if !source.nil?
 
-        if source.is_a? IO
-          stream.addStream org.jruby.util.IOInputStream.new(source)
-        else
-          raise InvalidObject.new("source must be a IO.")
-        end
+      if block_given?
 
-      elsif block_given?
         i, o = IO.pipe
         begin
           thread = Thread.new do
@@ -134,8 +137,17 @@ class Jvertica
           raise e
         ensure
         end
+
+      else
+
+        if source.is_a? IO
+          stream.addStream org.jruby.util.IOInputStream.new(source)
+        else
+          raise InvalidObject.new("source must be a IO.")
+        end
+
       end
-      
+
     rescue => e
       r = stream.finish
       raise e.class.new("[affected rows: #{r}] #{e.message}")
@@ -147,14 +159,13 @@ class Jvertica
       results = stream.finish
     rescue => e
       raise e
-    ensure 
-      thread.join
+    ensure
+      thread.join unless thread.nil?
     end
 
     [results, rejects.to_ary]
   end
 
-  private
   class ConnectionError < StandardError
   end
 
@@ -357,7 +368,7 @@ class Jvertica
   module Constant
     CONNECTION_PROPERTY_DOCUMENT_URL =
       'http://my.vertica.com/docs/7.1.x/HTML/index.htm#Authoring/ProgrammersGuide/ClientJDBC/JDBCConnectionProperties.htm'
-  
+
     RUBY_SQL_TYPE_MAP = {
       Fixnum => java.sql.Types::INTEGER,
       Bignum => java.sql.Types::BIGINT,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jvertica
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - takahiro.nakayama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement