sequel_pg 1.12.2 → 1.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a66312d2f3a6446adc3a43ac5bf4fe9651136a89d645e02f7e0f0da8228ddb97
-  data.tar.gz: 80f9ab2109eb0571a820f4e29efb6261adcaaf6f9013005b6565e8d37ef21ef6
+  metadata.gz: 9aba501d64a105015ec751eed0129f7e9526dd613c3621db1ec4713921561536
+  data.tar.gz: 71165fae43b6eff200f11d37bd7f28eb5a2a88616e0e5ce510da556d964b4bb9
 SHA512:
-  metadata.gz: 073a1004d8f109314aead84089cc0a3d3810c29ece58a89eac8d9750bf64b645998a4df8fdc3c23ad8608a7aec52b46066911b366b72acd124c19baf1a328378
-  data.tar.gz: '05806296363f8df23db1c4454d1d601eb938aebbed17f5c599535374ff4cc4405e71245f8ee44242e81f850d0e86914ae5d52fe7b14cd0c0dbdd8b507f8ec4c9'
+  metadata.gz: 74619fbbd3fb1ebff4ebbdb570146cc7c2b1c5d233e5355c2f70b9d96b004a88810a4d1965bb2bf3cea4424d3300e7438218ddbeca1c964de493c8f82eb06c8a
+  data.tar.gz: 199a540202e4332dfe30f71ee55cc0a1d1e4d258293c7195f1d6c5c60b1f5c286f7ec3fe4d621540cfe5e2429a6b8d7e79f5fb7f7f220798d0ce7da08279d45a

data/CHANGELOG

@@ -1,3 +1,9 @@
+=== 1.12.3 (2020-01-02)
+
+* Warn and do not load sequel_pg if pg >1.2 is used (jeremyevans)
+
+* Avoid verbose warnings on Ruby 2.7 due to tainting (jeremyevans)
+
 === 1.12.2 (2019-06-06)
 
 * Avoid use of pkg_config as it breaks compilation in some environments (jeremyevans) (#33)

data/ext/sequel_pg/extconf.rb

@@ -1,5 +1,6 @@
 require 'mkmf'
 $CFLAGS << " -O0 -g" if ENV['DEBUG']
+$CFLAGS << " -Drb_tainted_str_new=rb_str_new -DNO_TAINT" if RUBY_VERSION >= '2.7'
 $CFLAGS << " -Wall " unless RUBY_PLATFORM =~ /solaris/
 dir_config('pg', ENV["POSTGRES_INCLUDE"] || (IO.popen("pg_config --includedir").readline.chomp rescue nil),
                  ENV["POSTGRES_LIB"]     || (IO.popen("pg_config --libdir").readline.chomp rescue nil))

data/ext/sequel_pg/sequel_pg.c

@@ -1,4 +1,4 @@
-#define SEQUEL_PG_VERSION_INTEGER 11202
+#define SEQUEL_PG_VERSION_INTEGER 11203
 
 #include <string.h>
 #include <stdio.h>
@@ -409,7 +409,7 @@ static VALUE spg_timestamp_error(const char *s, VALUE self, const char *error_ms
   self = rb_funcall(self, spg_id_db, 0);
   if(RTEST(rb_funcall(self, spg_id_convert_infinite_timestamps, 0))) {
     if((strcmp(s, "infinity") == 0) || (strcmp(s, "-infinity") == 0)) {
-      return rb_funcall(self, spg_id_infinite_timestamp_value, 1, rb_tainted_str_new2(s));
+      return rb_funcall(self, spg_id_infinite_timestamp_value, 1, rb_tainted_str_new(s, strlen(s)));
     }
   }
   rb_raise(rb_eArgError, "%s", error_msg);
@@ -857,7 +857,11 @@ static VALUE spg_create_Blob(VALUE v) {
   if (bi->blob_string == NULL) {
     rb_raise(rb_eNoMemError, "PQunescapeBytea failure: probably not enough memory");
   }
-  return rb_obj_taint(rb_str_new_with_class(spg_Blob_instance, bi->blob_string, bi->length));
+  v = rb_str_new_with_class(spg_Blob_instance, bi->blob_string, bi->length);
+#ifndef NO_TAINT
+  rb_obj_taint(v);
+#endif
+  return v;
 }
 
 static VALUE spg_fetch_rows_set_cols(VALUE self, VALUE ignore) {
@@ -1754,6 +1758,11 @@ void Init_sequel_pg(void) {
       return;
     }
   }
+
+  if (RTEST(rb_eval_string("defined?(PG::VERSION) && PG::VERSION.to_f >= 1.2"))) {
+    rb_warn("sequel_pg not loaded as it is not compatible with the ruby-pg version in use; uninstall sequel_pg or downgrade pg to 1.1.4");
+    return;
+  }
   
   rb_const_set(spg_Postgres, rb_intern("SEQUEL_PG_VERSION_INTEGER"), INT2FIX(SEQUEL_PG_VERSION_INTEGER));
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel_pg
 version: !ruby/object:Gem::Version
-  version: 1.12.2
+  version: 1.12.3
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2020-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Faster SELECTs when using Sequel with pg