pg_data_encoder 0.0.9 → 0.1.0

data/README.md

@@ -72,8 +72,8 @@ or
   * Floats (double precision)
   * Timestamp
   * Date
-  * Array (integer and string single dimension)
-  * UUID (through passing column_map: {0 => :uuid} to options hash)
+  * Array (integer, string, uuid single dimension)  (uuid needs to specify column_types of :uuid)
+  * UUID (through passing column_types: {0 => :uuid} to options hash)
 
 ## Contributing
 

data/lib/pg_data_encoder/encode_for_copy.rb

@@ -7,6 +7,7 @@ module PgDataEncoder
     def initialize(options = {})
       @options = options
       @closed = false
+      options[:column_types] ||= {}
       @io = nil
     end
 
@@ -90,19 +91,35 @@ module PgDataEncoder
         completed = false
         case field[0]
         when String
-          array_io.write([1].pack("N"))  # unknown
-          array_io.write([0].pack("N"))  # unknown
+          if @options[:column_types][index] == :uuid
+            array_io.write([1].pack("N"))  # unknown
+            array_io.write([0].pack("N"))  # unknown
 
-          array_io.write([1043].pack("N"))  # I think is used to determine string data type
-          array_io.write([field.size].pack("N"))
-          array_io.write([1].pack("N"))   # forcing single dimension array for now
-          
-          field.each_with_index {|val, index|
-            buf = val.to_s.encode("UTF-8")
-            array_io.write([buf.bytesize].pack("N"))
-            array_io.write(buf)
+            array_io.write([2950].pack("N"))  # I think is used to determine string data type
+            array_io.write([field.size].pack("N"))
+            array_io.write([1].pack("N"))   # forcing single dimension array for now
             
-          }
+            field.each_with_index {|val, index|
+              array_io.write([16].pack("N"))
+              c = [val.gsub(/-/, "")].pack('H*')
+              array_io.write(c)
+              
+            }
+          else
+            array_io.write([1].pack("N"))  # unknown
+            array_io.write([0].pack("N"))  # unknown
+
+            array_io.write([1043].pack("N"))  # I think is used to determine string data type
+            array_io.write([field.size].pack("N"))
+            array_io.write([1].pack("N"))   # forcing single dimension array for now
+            
+            field.each_with_index {|val, index|
+              buf = val.to_s.encode("UTF-8")
+              array_io.write([buf.bytesize].pack("N"))
+              array_io.write(buf)
+              
+            }
+          end
         when Integer
           array_io.write([1].pack("N"))  # unknown
           array_io.write([0].pack("N"))  # unknown

data/lib/pg_data_encoder/version.rb

@@ -1,3 +1,3 @@
 module PgDataEncoder
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/spec/verify_data_formats_spec.rb

@@ -224,4 +224,18 @@ describe "generating data" do
     str.should == existing_data
   end
 
+
+  it 'should encode uuid correctly from tempfile' do
+    encoder = PgDataEncoder::EncodeForCopy.new(:use_tempfile => true, column_types: {0 => :uuid})
+    encoder.add [['6272bd7d-adae-44b7-bba1-dca871c2a6fd', '7dc8431f-fcce-4d4d-86f3-6857cba47d38']]
+    encoder.close
+    io = encoder.get_io
+    existing_data = filedata("uuid_array.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.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -82,6 +82,7 @@ files:
 - spec/fixtures/timestamp.dat
 - spec/fixtures/trueclass.dat
 - spec/fixtures/uuid.dat
+- spec/fixtures/uuid_array.dat
 - spec/spec_helper.rb
 - spec/verify_data_formats_spec.rb
 homepage: https://github.com/pbrumm/pg_data_encoder
@@ -131,6 +132,7 @@ test_files:
 - spec/fixtures/timestamp.dat
 - spec/fixtures/trueclass.dat
 - spec/fixtures/uuid.dat
+- spec/fixtures/uuid_array.dat
 - spec/spec_helper.rb
 - spec/verify_data_formats_spec.rb
 has_rdoc: