td-client 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1319b82466ec1059629cb62dbe33cdacc0488d60
-  data.tar.gz: fd2b1bc6ee9211e3b225537d753bbef3a5fe6f19
+  metadata.gz: 8a45d6b813ecd784711b722f4092e5bae4092f7f
+  data.tar.gz: 1b0371ff2fbdc251693656e9e63b91f9763417eb
 SHA512:
-  metadata.gz: fa93f95456b45d53a8621f2e22a87537fc8955c59954ef52155b71b7938b67d1794e5cba4b89b9f398f7089fe49638d4e15e216b2e73c76a8505b3eab770db45
-  data.tar.gz: dd3ef388960816cadae765c39f705778987c2490895e36c74704a076135349b7dbacfbc8cfa123314abfa718fcef68d725a2e9009c437df00fc6d60d057fb113
+  metadata.gz: 7da7f3bd0bef93c74d9adb84f5b9190a1781b50aced54ad8366d04cdf6f27ac745e7a37d7e17b20c62ced7a6d176d1fb3adc68ed9434834c973322f3b4a1b5ea
+  data.tar.gz: a27712fd626d72ac2811b00590d887c786ad113ea40cf67ab5b1d89a3e48ec724c97809d6bed1be8bba908eddfe54346c0b96871db7189800ee1f9f7176bdcac

data/lib/td/client/api.rb

@@ -312,7 +312,9 @@ private
           retry_delay *= 2
           redo # restart from beginning of do-while loop
         end
-      rescue Errno::ECONNREFUSED, Errno::ECONNRESET, Timeout::Error, EOFError, OpenSSL::SSL::SSLError, SocketError, IncompleteError, HTTPClient::TimeoutError => e
+      rescue Errno::ECONNREFUSED, Errno::ECONNRESET, Timeout::Error, EOFError,
+        SystemCallError, OpenSSL::SSL::SSLError, SocketError, HTTPClient::TimeoutError,
+        IncompleteError => e
         if block_given?
           raise e
         end

data/lib/td/client/api/job.rb

@@ -331,7 +331,8 @@ module Job
       # completed?
       validate_content_length_with_range(response, current_total_chunk_size)
     rescue Errno::ECONNREFUSED, Errno::ECONNRESET, Timeout::Error, EOFError,
-      OpenSSL::SSL::SSLError, SocketError, HTTPServerException => e
+      SystemCallError, OpenSSL::SSL::SSLError, SocketError, HTTPClient::TimeoutError,
+      HTTPServerException => e
       if response # at least a chunk is downloaded
         if etag = response.header['ETag'][0]
           header['If-Range'] = etag

data/lib/td/client/model.rb

@@ -320,7 +320,7 @@ class Schema
     @fields.each do |f|
       raise ArgumentError, "Column name '#{f.name}' is duplicated." if @names.key?(f.name)
       @names[f.name] = true
-      if f.sql_alias
+      if f.sql_alias && f.name != f.sql_alias
         raise ArgumentError, "SQL Column alias '#{f.sql_alias}' is duplicated." if @names.key?(f.sql_alias)
         @names[f.sql_alias] = true
       end
@@ -338,7 +338,7 @@ class Schema
       raise ParameterValidationError, "Column name '#{name}' is duplicated."
     end
     @names[name] = true
-    if sql_alias && @names.key?(sql_alias)
+    if sql_alias && sql_alias != name && @names.key?(sql_alias)
       raise ParameterValidationError, "SQL Column alias '#{sql_alias}' is duplicated."
     end
     @names[sql_alias] = true
@@ -466,7 +466,8 @@ class Job < Model
       yield self if block_given?
     rescue timeout_klass
       raise Timeout::Error, $!.message
-    rescue Timeout::Error, SystemCallError, EOFError, SocketError, HTTPClient::ConnectTimeoutError
+    rescue Errno::ECONNREFUSED, Errno::ECONNRESET, Timeout::Error, EOFError,
+      SystemCallError, OpenSSL::SSL::SSLError, SocketError, HTTPClient::TimeoutError
       $stderr.puts "ignore network error (#{$!}); retry..." if verbose
     end until finished?
   end

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
   class Client
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

data/spec/td/client/model_schema_spec.rb

@@ -30,6 +30,15 @@ describe 'TreasureData::Schema::Field' do
         expect(f.sql_alias).to eq 'alice'
       end
     end
+    context 'with sql_alias which equals to its name' do
+      it 'works' do
+        name = "abc"
+        f = Schema::Field.new(name, 'int', name)
+        expect(f.name).to eq name
+        expect(f.type).to eq 'int'
+        expect(f.sql_alias).to eq name
+      end
+    end
     context 'with invalid sql_alias' do
       it 'raises' do
         expect{ Schema::Field.new('t:t', 'int', 't:t') }.to raise_error(ParameterValidationError)
@@ -57,11 +66,23 @@ describe 'TreasureData::Schema' do
   end
 
   describe '.new' do
-    it do
+    it 'works with single field' do
       f = Schema::Field.new('a', 'int')
       sc = Schema.new([f])
       expect(sc.fields[0]).to eq f
     end
+    it 'works with multiple fields' do
+      f0 = Schema::Field.new('a', 'int')
+      f1 = Schema::Field.new('b', 'int', 'b')
+      sc = Schema.new([f0, f1])
+      expect(sc.fields[0]).to eq f0
+      expect(sc.fields[1]).to eq f1
+    end
+    it 'raises' do
+      f0 = Schema::Field.new('a', 'int')
+      f1 = Schema::Field.new('b', 'int', 'a')
+      expect{ Schema.new([f0, f1]) }.to raise_error(ArgumentError)
+    end
   end
 
   describe '#fields' do
@@ -79,6 +100,12 @@ describe 'TreasureData::Schema' do
       sc.add_field('b', 'double', 'bb')
       expect(sc.fields[1].name).to eq 'b'
     end
+    it do
+      f = Schema::Field.new('a', 'int')
+      sc = Schema.new([f])
+      sc.add_field('b', 'double', 'b')
+      expect(sc.fields[1].name).to eq 'b'
+    end
     it 'raises ParameterValidationError if name is duplicated' do
       f = Schema::Field.new('a', 'int')
       sc = Schema.new([f])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-22 00:00:00.000000000 Z
+date: 2017-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack