teradata-cli 0.0.8 → 0.0.10

data/lib/teradata-cli/connection.rb

@@ -14,6 +14,8 @@ require 'teradata-cli/exception'
 require 'forwardable'
 require 'stringio'
 
+#require 'ruby-debug' #FIXME
+
 module TeradataCli
 
   class ConnectionError < CLIError; end
@@ -345,7 +347,7 @@ module TeradataCli
         end
       end
       warn { "read_metadata: each_fet_parcel returned before PclENDSTATEMENT?" }
-      nil   # FIXME: should raise?
+      nil   #FIXME: should raise?
     end
 
     def read_record
@@ -360,7 +362,7 @@ module TeradataCli
         end
       end
       warn { "read_record: each_fet_parcel returned before PclENDSTATEMENT?" }
-      nil   # FIXME: should raise?
+      nil   #FIXME: should raise?
     end
 
     def skip_current_statement
@@ -775,6 +777,7 @@ module TeradataCli
     def unmarshal(data)
       f = StringIO.new(data)
       cols = @types.zip(read_indicator(f)).map {|type, is_null|
+        # debugger #FIXME
         val = type.unmarshal(f)   # We must read value regardless of NULL.
         is_null ? nil : val
       }
@@ -871,7 +874,7 @@ module TeradataCli
 
     # default implementation: only read as string.
     def unmarshal(f)
-      f.read(@length)
+      f.read(@length).rstrip
     end
   end
 
@@ -884,7 +887,13 @@ module TeradataCli
     bind_code :BYTE_N, 693
 
     def unmarshal(f)
-      @extractor.extract(f.read(@length))
+      val = @extractor.extract(f.read(@length)).rstrip
+      #FIXME why teradata cliv2 uses CHAR_NN for timestamps
+      if /^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}$/ =~ val
+        DateTime.parse("#{val[0,10]}T#{val[11,19]}") rescue nil
+      else
+        val
+      end
     end
   end
 
@@ -996,7 +1005,11 @@ module TeradataCli
         str
       else
         return '0.' + str if str.size == frac
-        str[-frac, 0] = '.' rescue nil
+        return '0.0' + str if str == "0"
+        begin
+          str[-frac, 0] = '.'
+        rescue
+        end
         str
       end
     end
@@ -1008,11 +1021,20 @@ module TeradataCli
 
     def unmarshal(f)
       d = (f.read(@length).unpack('l').first + 19000000).to_s
-      d[0,4] + '-' + d[4,2] + '-' + d[6,2]
+      Date.parse(d[0,4] + '-' + d[4,2] + '-' + d[6,2]) rescue nil
     end
   end
 
-  # TIME, TIMESTAMP are same as CHAR.
+  # TIME, TIMESTAMP
+  class DateTimeType < FieldType
+    # bind_code :CHAR_NN, 452
+
+    def unmarshal(f)
+      # debugger #FIXME
+      dt = @extractor.extract(f.read(@length)) # "2013-10-10 16:44:39"
+      DateTime.parse("#{dt[0,10]}T#{dt[11,19]}") rescue nil
+    end
+  end
 
 
   class Record

data/lib/teradata-cli/version.rb

@@ -1,3 +1,3 @@
 module TeradataCli
-  VERSION = "0.0.8"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: teradata-cli
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Giuseppe Privitera
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-25 00:00:00 Z
+date: 2013-10-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler