sequel_pg 1.6.0 → 1.6.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 1.6.1 (2012-10-25)
+
+* Make PostgreSQL array parser handle string encodings correctly on ruby 1.9 (jeremyevans)
+
 === 1.6.0 (2012-09-04)
 
 * Replace PQsetRowProcessor streaming with PQsetSingleRowMode streaming introduced in PostgreSQL 9.2beta3 (jeremyevans)

data/README.rdoc

@@ -65,7 +65,7 @@ enable the model optimization via:
 
 == Streaming
 
-If you are using PostgreSQL 9.2 or higher on the client, then sequel_pg
+If you are using PostgreSQL 9.2beta3 or higher on the client, then sequel_pg
 should enable streaming support.  This allows you to stream returned
 rows one at a time, instead of collecting the entire result set in
 memory (which is how PostgreSQL works by default).  You can check
@@ -76,8 +76,7 @@ if streaming is supported by:
 If streaming is supported, you can load the streaming support into the
 database:
 
-  require 'sequel_pg/streaming'
-  DB.extend Sequel::Postgres::Streaming
+  DB.extension(:pg_streaming)
 
 Then you can call the Dataset#stream method to have the dataset use
 the streaming support:
@@ -87,7 +86,11 @@ the streaming support:
 If you want to enable streaming for all of a database's datasets, you
 can do the following:
 
-  DB.extend_datasets Sequel::Postgres::Streaming::AllQueries
+  DB.stream_all_queries = true
+
+Note that pg 0.14.1+ is required for streaming to work.  This is not
+required by the gem, as it is only a requirement for streaming, not
+for general use.
 
 == Installing the gem
 

data/ext/sequel_pg/sequel_pg.c

@@ -120,7 +120,11 @@ static int enc_get_index(VALUE val)
 }
 #endif
 
-static VALUE read_array(int *index, char *c_pg_array_string, int array_string_length, char *word, VALUE converter)
+static VALUE read_array(int *index, char *c_pg_array_string, int array_string_length, char *word, VALUE converter
+#ifdef SPG_ENCODING
+, int enc_index
+#endif
+)
 {
   int word_index = 0;
 
@@ -161,15 +165,20 @@ static VALUE read_array(int *index, char *c_pg_array_string, int array_string_le
           {
             rb_ary_push(array, Qnil);
           }
-          else if (RTEST(converter))
+          else 
           {
-            VALUE rword = rb_str_new(word, word_index);
+            VALUE rword = rb_tainted_str_new(word, word_index);
             RB_GC_GUARD(rword);
-            rb_ary_push(array, rb_funcall(converter, spg_id_call, 1, rword));
-          }
-          else
-          {
-            rb_ary_push(array, rb_str_new(word, word_index));
+
+#ifdef SPG_ENCODING
+            rb_enc_associate_index(rword, enc_index);
+#endif
+
+            if (RTEST(converter)) {
+              rword = rb_funcall(converter, spg_id_call, 1, rword);
+            }
+
+            rb_ary_push(array, rword);
           }
         }
         if(c == '}')
@@ -187,7 +196,11 @@ static VALUE read_array(int *index, char *c_pg_array_string, int array_string_le
       else if(c == '{')
       {
         (*index)++;
-        rb_ary_push(array, read_array(index, c_pg_array_string, array_string_length, word, converter));
+        rb_ary_push(array, read_array(index, c_pg_array_string, array_string_length, word, converter
+#ifdef SPG_ENCODING
+, enc_index
+#endif
+        ));
         escapeNext = 1;
       }
       else
@@ -230,7 +243,11 @@ static VALUE parse_pg_array(VALUE self, VALUE pg_array_string, VALUE converter)
   char *word = RSTRING_PTR(buf);
   int index = 1;
 
-  return read_array(&index, c_pg_array_string, array_string_length, word, converter);
+  return read_array(&index, c_pg_array_string, array_string_length, word, converter
+#ifdef SPG_ENCODING
+, enc_get_index(pg_array_string)
+#endif
+  );
 }
 
 static VALUE spg_time(const char *s) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel_pg
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg