sequel_pg 1.12.3 → 1.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aba501d64a105015ec751eed0129f7e9526dd613c3621db1ec4713921561536
-  data.tar.gz: 71165fae43b6eff200f11d37bd7f28eb5a2a88616e0e5ce510da556d964b4bb9
+  metadata.gz: b6fd331562b3092789479e69cb8de82bf5593014d0e9d58efb58ae0ac0cc519a
+  data.tar.gz: d0d29de191faa1093a18a9ccd7ea3bc4e51b4bb1c8ed207e464d3b749846199a
 SHA512:
-  metadata.gz: 74619fbbd3fb1ebff4ebbdb570146cc7c2b1c5d233e5355c2f70b9d96b004a88810a4d1965bb2bf3cea4424d3300e7438218ddbeca1c964de493c8f82eb06c8a
-  data.tar.gz: 199a540202e4332dfe30f71ee55cc0a1d1e4d258293c7195f1d6c5c60b1f5c286f7ec3fe4d621540cfe5e2429a6b8d7e79f5fb7f7f220798d0ce7da08279d45a
+  metadata.gz: fe7358271c4e788614111f42db5507fb251af87a853b867920871d6e85c1679f752453742d4add9078841655416317c855e2f6fe2d403611b915b5e1d4960852
+  data.tar.gz: 761b2fdc14026cf8e9c76bc6865e9b8ab0449b28a3fd6fdea10df616b1ffbb18971ff1cdb1ceb3b7bdc3b077ba4e608697e32ce00b6ee769692a45e3e6a5a941

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 1.12.4 (2020-01-02)
+
+* Work with pg 1.2.1+ (jeremyevans)
+
 === 1.12.3 (2020-01-02)
 
 * Warn and do not load sequel_pg if pg >1.2 is used (jeremyevans)

data/ext/sequel_pg/sequel_pg.c

@@ -1,4 +1,4 @@
-#define SEQUEL_PG_VERSION_INTEGER 11203
+#define SEQUEL_PG_VERSION_INTEGER 11204
 
 #include <string.h>
 #include <stdio.h>
@@ -72,8 +72,10 @@
 /* External functions defined by ruby-pg */
 PGconn* pg_get_pgconn(VALUE);
 PGresult* pgresult_get(VALUE);
+int pg_get_result_enc_idx(VALUE);
 
 static int spg_use_ipaddr_alloc;
+static int spg_use_pg_get_result_enc_idx;
 
 static VALUE spg_Sequel;
 static VALUE spg_PGArray;
@@ -1387,7 +1389,7 @@ static VALUE spg_yield_hash_rows(VALUE self, VALUE rres, VALUE ignore) {
   }
   res = pgresult_get(rres);
 
-  enc_index = enc_get_index(rres);
+  enc_index = spg_use_pg_get_result_enc_idx ? pg_get_result_enc_idx(rres) : enc_get_index(rres);
 
   ntuples = PQntuples(res);
   nfields = PQnfields(res);
@@ -1655,7 +1657,7 @@ static VALUE spg__yield_each_row(VALUE self) {
   rb_funcall(rres, spg_id_check, 0);
   res = pgresult_get(rres);
 
-  enc_index = enc_get_index(rres);
+  enc_index = spg_use_pg_get_result_enc_idx ? pg_get_result_enc_idx(rres) : enc_get_index(rres);
 
   /* Only handle regular and model types.  All other types require compiling all
    * of the results at once, which is not a use case for streaming.  The streaming
@@ -1760,8 +1762,7 @@ void Init_sequel_pg(void) {
   }
 
   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;
+    spg_use_pg_get_result_enc_idx = 1;
   }
   
   rb_const_set(spg_Postgres, rb_intern("SEQUEL_PG_VERSION_INTEGER"), INT2FIX(SEQUEL_PG_VERSION_INTEGER));

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel_pg
 version: !ruby/object:Gem::Version
-  version: 1.12.3
+  version: 1.12.4
 platform: ruby
 authors:
 - Jeremy Evans
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement