sequel_pg 1.6.16 → 1.6.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 705be350454b9fdb7851a2ecff14239a3959aa53
-  data.tar.gz: 46888862c2aa099fe86f05ff429cb42cf521a7f2
+  metadata.gz: 41fd896c78d22b043d2544d1593fca2d48a02efe
+  data.tar.gz: 566b1a460e4af2088e4f6aa223ea8e2ad815927d
 SHA512:
-  metadata.gz: 12ea5f1f40ecf6088796187cf9ab726a41c25e8a38f1fa09e53d962564476f41478b334ee91038ac209f08dcbe4db1857951f820c56625f2f9dcdd8d1ed136a0
-  data.tar.gz: 92404c36e8ca5891d48e3996b580a3f788c5679fc5162aac520d01ab5a370f3229bb24e87dbfaeb12c828efd7ed3b34dcbad918e3f9e2d718555badce236da6a
+  metadata.gz: 7c556a5e5db2f11691b2faeb934594c3b25f5cd93cf4c9d2c2c32182102e8bb2a64d71bb25cff84ec40f87bfb89a5e13b9bac584fe96de5fd5b4e4943353c2b5
+  data.tar.gz: 95bca2c496c52da648384c0aad749e881c5bf85f9740298e85df76342cd57ec89cad717e25d5c72e457e4924d7d83822bddf72782780039a559a33990638f746

data/CHANGELOG

@@ -1,10 +1,14 @@
+=== 1.6.17 (2016-04-29)
+
+*  Work with upcoming 4.34.0 release, supporting the duplicate_column_handler extension (jeremyevans)
+
 === 1.6.16 (2016-04-11)
 
 * Work with upcoming Sequel 4.34.0 release, and Sequel 4.0+ (jeremyevans) (#22)
 
 === 1.6.15 (2016-04-11)
 
-* Work with upcoming Sequel 4.34.0 release (jeremyevans)
+* Work with upcoming Sequel 4.34.0 release, supporting to_hash taking the hash to insert into (jeremyevans)
 
 === 1.6.14 (2016-01-19)
 

data/ext/sequel_pg/sequel_pg.c

@@ -45,6 +45,7 @@
 
 /* Whether the data objects are structs instead of just pointers */
 static int unwrap_structs;
+static int use_columns_method;
 
 /* External functions defined by ruby-pg when data objects are structs */
 PGconn* pg_get_pgconn(VALUE);
@@ -102,6 +103,7 @@ static ID spg_id_opts;
 static ID spg_id_db;
 static ID spg_id_conversion_procs;
 
+static ID spg_id_columns_equal;
 static ID spg_id_columns;
 static ID spg_id_encoding;
 static ID spg_id_values;
@@ -584,6 +586,14 @@ static VALUE spg__field_ids(VALUE v, VALUE *colsyms, long nfields) {
   return pg_columns;
 }
 
+static void spg_set_columns(VALUE self, VALUE cols) {
+  if (use_columns_method) {
+    rb_funcall(self, spg_id_columns_equal, 1, cols);
+  } else {
+    rb_ivar_set(self, spg_id_columns, cols);
+  }
+}
+
 static void spg_set_column_info(VALUE self, PGresult *res, VALUE *colsyms, VALUE *colconvert) {
   long i;
   long j;
@@ -624,6 +634,7 @@ static void spg_set_column_info(VALUE self, PGresult *res, VALUE *colsyms, VALUE
         break;
     }
   }
+  spg_set_columns(self, rb_ary_new4(nfields, colsyms));
 }
 
 static VALUE spg_yield_hash_rows(VALUE self, VALUE rres, VALUE ignore) {
@@ -658,8 +669,6 @@ static VALUE spg_yield_hash_rows(VALUE self, VALUE rres, VALUE ignore) {
 
   spg_set_column_info(self, res, colsyms, colconvert);
 
-  rb_ivar_set(self, spg_id_columns, rb_ary_new4(nfields, colsyms));
-
   opts = rb_funcall(self, spg_id_opts, 0);
   if (rb_type(opts) == T_HASH) {
     pg_type = rb_hash_aref(opts, spg_sym__sequel_pg_type);
@@ -941,8 +950,6 @@ static VALUE spg__yield_each_row(VALUE self) {
 
   spg_set_column_info(self, res, colsyms, colconvert);
 
-  rb_ivar_set(self, spg_id_columns, rb_ary_new4(nfields, colsyms));
-
   while (PQntuples(res) != 0) {
     h = rb_hash_new();
     for(j=0; j<nfields; j++) {
@@ -1036,6 +1043,7 @@ void Init_sequel_pg(void) {
 
   spg_id_db = rb_intern("db");
   spg_id_conversion_procs = rb_intern("conversion_procs");
+  spg_id_columns_equal = rb_intern("columns=");
 
   spg_id_columns = rb_intern("@columns");
   spg_id_encoding = rb_intern("@encoding");
@@ -1086,6 +1094,10 @@ void Init_sequel_pg(void) {
   rb_define_private_method(c, "yield_hash_rows", spg_yield_hash_rows, 2);
   rb_define_private_method(c, "fetch_rows_set_cols", spg_fetch_rows_set_cols, 1);
 
+  if (rb_eval_string("Sequel::Dataset.private_method_defined?(:columns=)") == Qtrue) {
+    use_columns_method = 1;
+  }
+
   rb_define_singleton_method(spg_Postgres, "supports_streaming?", spg_supports_streaming_p, 0);
 
 #if HAVE_PQSETSINGLEROWMODE

metadata

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