sequel_pg 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6a40cb36583e8f82e16b3346ba16ae6bfd76f6f
-  data.tar.gz: fe8457e463a51d1bc522cb87a14236e4dfee23c4
+  metadata.gz: '08ac123f28a04a27f31f8e0c36f35357c97518db'
+  data.tar.gz: f55ca7eec3931cbc8b4d3a4c6eb1295299d511a1
 SHA512:
-  metadata.gz: a098d4cc78fa9c3f13c7cdd7fd88fe83f222d42c36acf258eb757eb99d5015dd5c7b4db6052f0429fe6a49a75de6b3982133ff4c80daeb8b68428bebee86a5e5
-  data.tar.gz: cd9d11acc5c408fd3f3868fdc2c3364d477292e22891d52005057db456cfbce09aea65f8d02935482d42fa2d2cfd8cbb09f05ba6401dbfa38239919a23c08c64
+  metadata.gz: fdee057696e6a5cf1c283a2e1305df07dd7a9773e5eb284a6bdd7ecf5df4e21288a7f961afaad334ff23d71ec1b6ef980be95753ec80f0912d86920b897b7073
+  data.tar.gz: 97715ed30e04d22e9f479720e8bd08c830050e86408a67dae20f60ce1aca397a40155b8c31c6d837b651b4b2b426e79757a1a802281cba8fdf21a8142d2fb0ea

data/CHANGELOG

@@ -1,4 +1,16 @@
-=== master
+=== 1.7.1 (2017-08-25)
+
+* Handle case where PGconn#get_result returns nil in single row mode (jeremyevans)
+
+* Fix RB_GC_GUARD usage to handle additional segfault (Eric Wong)
+
+=== 1.7.0 (2017-06-30)
+
+* Add Dataset#with_optimize_model_load to change optimized model loading for specific datasets (jeremyevans)
+
+* Deprecate optimize_model_load Database and Dataset accessors (jeremyevans)
+
+* Turn optimized model loading on by default, disable automatically when Model.call overridden (jeremyevans)
 
 * Override Dataset#as_hash instead of #to_hash if #as_hash is defined (jeremyevans)
 

data/ext/sequel_pg/sequel_pg.c

@@ -1,4 +1,4 @@
-#define SEQUEL_PG_VERSION_INTEGER 10700
+#define SEQUEL_PG_VERSION_INTEGER 10701
 
 #include <string.h>
 #include <stdio.h>
@@ -127,13 +127,14 @@ 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, VALUE buf, VALUE converter
 #ifdef SPG_ENCODING
 , int enc_index
 #endif
 )
 {
   int word_index = 0;
+  char *word = RSTRING_PTR(buf);
 
   /* The current character in the input string. */
   char c;
@@ -203,7 +204,7 @@ 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, buf, converter
 #ifdef SPG_ENCODING
 , enc_index
 #endif
@@ -236,6 +237,8 @@ static VALUE read_array(int *index, char *c_pg_array_string, int array_string_le
     }
   }
 
+  RB_GC_GUARD(buf);
+
   return array;
 }
 
@@ -246,8 +249,6 @@ static VALUE parse_pg_array(VALUE self, VALUE pg_array_string, VALUE converter)
   char *c_pg_array_string = StringValueCStr(pg_array_string);
   int array_string_length = RSTRING_LEN(pg_array_string);
   VALUE buf = rb_str_buf_new(array_string_length);
-  RB_GC_GUARD(buf);
-  char *word = RSTRING_PTR(buf);
   int index = 1;
 
   if (array_string_length == 0) {
@@ -271,7 +272,7 @@ static VALUE parse_pg_array(VALUE self, VALUE pg_array_string, VALUE converter)
       rb_raise(rb_eArgError, "unexpected PostgreSQL array format, doesn't start with { or [");
   }
 
-  return read_array(&index, c_pg_array_string, array_string_length, word, converter
+  return read_array(&index, c_pg_array_string, array_string_length, buf, converter
 #ifdef SPG_ENCODING
 , enc_get_index(pg_array_string)
 #endif
@@ -924,6 +925,9 @@ static VALUE spg__yield_each_row(VALUE self) {
   GetPGconn(rconn, conn);
 
   rres = rb_funcall(rconn, spg_id_get_result, 0);
+  if (rres == Qnil) {
+    goto end_yield_each_row;
+  }
   rb_funcall(rres, spg_id_check, 0);
   GetPGresult(rres, res);
 
@@ -970,11 +974,15 @@ static VALUE spg__yield_each_row(VALUE self) {
     }
 
     rres = rb_funcall(rconn, spg_id_get_result, 0);
+    if (rres == Qnil) {
+      goto end_yield_each_row;
+    }
     rb_funcall(rres, spg_id_check, 0);
     GetPGresult(rres, res);
   }
   rb_funcall(rres, spg_id_clear, 0);
 
+end_yield_each_row:
   return self;
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel_pg
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-30 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg