pg_data_encoder 0.1.5 → 0.1.6

data/lib/pg_data_encoder/encode_for_copy.rb

@@ -70,9 +70,15 @@ module PgDataEncoder
 
       case field
       when Integer
-        buf = [field].pack("N")
-        io.write([buf.bytesize].pack("N"))
-        io.write(buf)
+        if @options[:column_types] && @options[:column_types][index] == :bigint
+          io.write([8].pack("N"))
+          c = [field].pack('Q>')
+          io.write(c)
+        else
+          buf = [field].pack("N")
+          io.write([buf.bytesize].pack("N"))
+          io.write(buf)
+        end
       when Float
         buf = [field].pack("G")
         io.write([buf.bytesize].pack("N"))
@@ -92,6 +98,10 @@ module PgDataEncoder
           io.write([16].pack("N"))
           c = [field.gsub(/-/, "")].pack('H*')
           io.write(c)
+        elsif @options[:column_types] && @options[:column_types][index] == :bigint
+          io.write([8].pack("N"))
+          c = [field.to_i].pack('Q>')
+          io.write(c)
         else
           buf = field.encode("UTF-8")
           io.write([buf.bytesize].pack("N"))

data/lib/pg_data_encoder/version.rb

@@ -1,3 +1,3 @@
 module PgDataEncoder
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/verify_data_formats_spec.rb

@@ -240,6 +240,19 @@ describe "generating data" do
     str.should == existing_data
   end
 
+  it 'should encode null uuid correctly from tempfile' do
+    encoder = PgDataEncoder::EncodeForCopy.new(:use_tempfile => true, column_types: {1 => :uuid})
+    encoder.add ['before2', nil, nil, 123423423]
+    encoder.close
+    io = encoder.get_io
+    existing_data = filedata("empty_uuid.dat")
+    str = io.read
+    io.class.name.should == "Tempfile"
+    str.force_encoding("ASCII-8BIT")
+    #File.open("spec/fixtures/output.dat", "w:ASCII-8BIT") {|out| out.write(str) }
+    str.should == existing_data
+  end
+
 
   it 'should encode uuid correctly from tempfile' do
     encoder = PgDataEncoder::EncodeForCopy.new(:use_tempfile => true, column_types: {0 => :uuid})
@@ -267,4 +280,31 @@ describe "generating data" do
     str.force_encoding("ASCII-8BIT")
     str.should == existing_data
   end
+
+  it 'should encode bigint as int correctly from tempfile' do
+    encoder = PgDataEncoder::EncodeForCopy.new(:use_tempfile => true, column_types: {0 => :bigint})
+    encoder.add [23372036854775808, 'test']
+    encoder.close
+    io = encoder.get_io
+    existing_data = filedata("bigint.dat")
+    str = io.read
+    io.class.name.should == "Tempfile"
+    str.force_encoding("ASCII-8BIT")
+    #File.open("spec/fixtures/output.dat", "w:ASCII-8BIT") {|out| out.write(str) }
+    str.should == existing_data
+  end
+
+  it 'should encode bigint correctly from tempfile' do
+    encoder = PgDataEncoder::EncodeForCopy.new(:use_tempfile => true, column_types: {0 => :bigint})
+    encoder.add ["23372036854775808", 'test']
+    encoder.close
+    io = encoder.get_io
+    existing_data = filedata("bigint.dat")
+    str = io.read
+    io.class.name.should == "Tempfile"
+    str.force_encoding("ASCII-8BIT")
+    #File.open("spec/fixtures/output.dat", "w:ASCII-8BIT") {|out| out.write(str) }
+    str.should == existing_data
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_data_encoder
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -72,9 +72,11 @@ files:
 - spec/fixtures/array_with_two2.dat
 - spec/fixtures/big_str_array.dat
 - spec/fixtures/big_str_array2.dat
+- spec/fixtures/bigint.dat
 - spec/fixtures/date.dat
 - spec/fixtures/date2.dat
 - spec/fixtures/date2000.dat
+- spec/fixtures/empty_uuid.dat
 - spec/fixtures/falseclass.dat
 - spec/fixtures/float.dat
 - spec/fixtures/hstore_utf8.dat
@@ -128,9 +130,11 @@ test_files:
 - spec/fixtures/array_with_two2.dat
 - spec/fixtures/big_str_array.dat
 - spec/fixtures/big_str_array2.dat
+- spec/fixtures/bigint.dat
 - spec/fixtures/date.dat
 - spec/fixtures/date2.dat
 - spec/fixtures/date2000.dat
+- spec/fixtures/empty_uuid.dat
 - spec/fixtures/falseclass.dat
 - spec/fixtures/float.dat
 - spec/fixtures/hstore_utf8.dat