sequel_pg 1.6.10 → 1.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25ed02f0ee78100daa444ad371dce7a81fb6302c
-  data.tar.gz: 070c5284bfcddd9b1901be3b78c7b3166129b68e
+  metadata.gz: 7b51b8daa124c0b93c8210122caa04300bf38ede
+  data.tar.gz: 04aaec8db5cbf4ae2ac00fa345ef3ced573674cf
 SHA512:
-  metadata.gz: d5d073fee789e59e7e83594f3f6190611a6a57eef47c55eebe1d734b588cf2a2410d3dc5ae303438d8e7038b27c1dd014c818c90175c7992fdcc89c8ac6e17a0
-  data.tar.gz: dfd7e4b7eb0604b3cb7e90cd1629a1283e533ba8b123b4c22b9f0e62e71632e11ce9615745023a2cbad02d6bf5db536c741c2add1f81a99a5fa464cb66629900
+  metadata.gz: 8c19df266a6b88ea412e68c0ce8d08eadaab22d7532ddc20d7c0794afd6a3f02cf35f418443425f5f3fdda734697a8d044c396a4b7afc97e9ad256a361742ea7
+  data.tar.gz: 12b88db37b2b1366098893dc87fe53b76dc081d5aa82671adfaac3002ef98c77c0ac2e3b4dd20f85a47ea9ca2cec19a6621afc200788fac48ae652c0e57b13bf

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 1.6.11 (2014-11-04)
+
+* Work with ruby pg 0.18+ (currently a prerelease) (jeremyevans)
+
 === 1.6.10 (2014-07-11)
 
 * Work correctly when the database timezone is not a named timezone but the application timezone is (jeremyevans)

data/ext/sequel_pg/sequel_pg.c

@@ -43,6 +43,17 @@
 #define SPG_YIELD_KMV_HASH_GROUPS 12
 #define SPG_YIELD_MKMV_HASH_GROUPS 13
 
+/* Whether the data objects are structs instead of just pointers */
+static int unwrap_structs;
+
+/* External functions defined by ruby-pg when data objects are structs */
+PGconn* pg_get_pgconn(VALUE);
+PGresult* pgresult_get(VALUE);
+
+/* Normalize access to data objects for both old and new versions of pg gem */
+#define GetPGconn(_val, _var) if (unwrap_structs) {_var = pg_get_pgconn(_val);} else {Data_Get_Struct(_val, PGconn, _var);}
+#define GetPGresult(_val, _var) if (unwrap_structs) {_var = pgresult_get(_val);} else {Data_Get_Struct(_val, PGresult, _var);}
+
 static VALUE spg_Sequel;
 static VALUE spg_Blob;
 static VALUE spg_BigDecimal;
@@ -614,11 +625,11 @@ static VALUE spg_yield_hash_rows(VALUE self, VALUE rres, VALUE ignore) {
   enc_index = enc_get_index(rres);
 #endif
 
-  Data_Get_Struct(rres, PGresult, res);
+  GetPGresult(rres, res);
   ntuples = PQntuples(res);
   nfields = PQnfields(res);
   if (nfields > SPG_MAX_FIELDS) {
-    rb_raise(rb_eRangeError, "more than %d columns in query", SPG_MAX_FIELDS);
+    rb_raise(rb_eRangeError, "more than %d columns in query (%ld columns detected)", SPG_MAX_FIELDS, nfields);
   }
 
   spg_set_column_info(self, res, colsyms, colconvert);
@@ -851,7 +862,7 @@ static VALUE spg_supports_streaming_p(VALUE self) {
 #if HAVE_PQSETSINGLEROWMODE
 static VALUE spg_set_single_row_mode(VALUE self) {
   PGconn *conn;
-  Data_Get_Struct(self, PGconn, conn);
+  GetPGconn(self, conn);
   if (PQsetSingleRowMode(conn) != 1) {
       rb_raise(spg_PGError, "cannot set single row mode");
   }
@@ -875,11 +886,11 @@ static VALUE spg__yield_each_row(VALUE self) {
 
   rconn = rb_ary_entry(self, 1);
   self = rb_ary_entry(self, 0);
-  Data_Get_Struct(rconn, PGconn, conn);
+  GetPGconn(rconn, conn);
 
   rres = rb_funcall(rconn, spg_id_get_result, 0);
   rb_funcall(rres, spg_id_check, 0);
-  Data_Get_Struct(rres, PGresult, res);
+  GetPGresult(rres, res);
 
 #ifdef SPG_ENCODING
   int enc_index;
@@ -927,7 +938,7 @@ static VALUE spg__yield_each_row(VALUE self) {
 
     rres = rb_funcall(rconn, spg_id_get_result, 0);
     rb_funcall(rres, spg_id_check, 0);
-    Data_Get_Struct(rres, PGresult, res);
+    GetPGresult(rres, res);
   }
   rb_funcall(rres, spg_id_clear, 0);
 
@@ -938,7 +949,7 @@ static VALUE spg__flush_results(VALUE rconn) {
   PGconn *conn;
   PGresult *res;
   VALUE error = 0;
-  Data_Get_Struct(rconn, PGconn, conn);
+  GetPGconn(rconn, conn);
 
   while ((res = PQgetResult(conn)) != NULL) {
     if (!error) {
@@ -1043,6 +1054,9 @@ void Init_sequel_pg(void) {
   if (rb_eval_string("Date.today.instance_variable_get(:@ajd)") != Qnil) {
     spg_id_Rational = rb_intern("Rational");
   }
+  if (rb_eval_string("defined?(PG::TypeMapAllStrings)") != Qnil) {
+    unwrap_structs = 1;
+  }
 
   c = rb_funcall(spg_Postgres, cg, 1, rb_str_new2("Dataset"));
   rb_define_private_method(c, "yield_hash_rows", spg_yield_hash_rows, 2);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel_pg
 version: !ruby/object:Gem::Version
-  version: 1.6.10
+  version: 1.6.11
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg