sequel_pg 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '08ac123f28a04a27f31f8e0c36f35357c97518db'
-  data.tar.gz: f55ca7eec3931cbc8b4d3a4c6eb1295299d511a1
+  metadata.gz: 12f6ab4a1eb1aefe52198b01d2b32ff5e1108dd3
+  data.tar.gz: d70c53a25c1af4d132bf63c7887f096efa0754e3
 SHA512:
-  metadata.gz: fdee057696e6a5cf1c283a2e1305df07dd7a9773e5eb284a6bdd7ecf5df4e21288a7f961afaad334ff23d71ec1b6ef980be95753ec80f0912d86920b897b7073
-  data.tar.gz: 97715ed30e04d22e9f479720e8bd08c830050e86408a67dae20f60ce1aca397a40155b8c31c6d837b651b4b2b426e79757a1a802281cba8fdf21a8142d2fb0ea
+  metadata.gz: 0ed2744dc9f5e9620bf463ad85baca278b84a20ea0368f36e2c65243cb9cc38c1ea7746cce9c9b881d78ff26ee1ef35341f788a5d919f613aeebe32c3d11b470
+  data.tar.gz: 59a2b4123aae9e61b025b1b9006c1f6700b5b876fd6de28bdbd27d2123c3d7d71e428ce559273a69a7376cd757658fb6960ff452ebb9dcf730e8bace0284b746

data/CHANGELOG

@@ -1,3 +1,15 @@
+=== 1.8.0 (2017-10-18)
+
+* Handle timezone offsets with seconds when parsing timestamps (jeremyevans)
+
+* Parse BC dates and timestamps correctly (jeremyevans)
+
+* Drop Sequel <4.34.0 support (jeremyevans)
+
+* Drop pg <0.18.0 support (jeremyevans)
+
+* Drop ruby <1.9.3 support (jeremyevans)
+
 === 1.7.1 (2017-08-25)
 
 * Handle case where PGconn#get_result returns nil in single row mode (jeremyevans)

data/README.rdoc

@@ -130,7 +130,6 @@ requirements:
 
 sequel_pg has been tested on the following:
 
-* ruby 1.8.7
 * ruby 1.9.3
 * ruby 2.0
 * ruby 2.1

data/ext/sequel_pg/extconf.rb

@@ -1,18 +1,9 @@
 require 'mkmf'
-$CFLAGS << " -O0 -g -ggdb" if ENV['DEBUG']
+$CFLAGS << " -O0 -g" if ENV['DEBUG']
 $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))
 
-if enable_config("static-build")
-	# Link against all required libraries for static build, if they are available
-	have_library('gdi32', 'CreateDC')
-	have_library('secur32')
-	have_library('ws2_32')
-	have_library('eay32')
-	have_library('ssleay32', 'SSL_pending')
-end
-
 if (have_library('pq') || have_library('libpq') || have_library('ms/libpq')) && have_header('libpq-fe.h')
   have_func 'PQsetSingleRowMode'
   create_makefile("sequel_pg")

data/ext/sequel_pg/sequel_pg.c

@@ -1,4 +1,4 @@
-#define SEQUEL_PG_VERSION_INTEGER 10701
+#define SEQUEL_PG_VERSION_INTEGER 10800
 
 #include <string.h>
 #include <stdio.h>
@@ -6,23 +6,15 @@
 #include <libpq-fe.h>
 #include <ruby.h>
 
-#if defined(HAVE_RUBY_ENCODING_H) && HAVE_RUBY_ENCODING_H
-#define SPG_ENCODING 1
 #include <ruby/encoding.h>
-#define ENC_INDEX ,enc_index
-#else
-#define ENC_INDEX
-#endif
 
 #ifndef SPG_MAX_FIELDS
 #define SPG_MAX_FIELDS 256
 #endif
-#define SPG_MICROSECONDS_PER_DAY_LL 86400000000ULL
-#define SPG_MICROSECONDS_PER_DAY 86400000000.0
 #define SPG_MINUTES_PER_DAY 1440.0
 #define SPG_SECONDS_PER_DAY 86400.0
 
-#define SPG_DT_ADD_USEC if (usec != 0) { dt = rb_funcall(dt, spg_id_op_plus, 1, spg_id_Rational ? rb_funcall(rb_cObject, spg_id_Rational, 2, INT2NUM(usec), ULL2NUM(SPG_MICROSECONDS_PER_DAY_LL)) : rb_float_new(usec/SPG_MICROSECONDS_PER_DAY)); }
+#define SPG_DT_ADD_USEC if (usec != 0) { dt = rb_funcall(dt, spg_id_op_plus, 1, rb_Rational2(INT2NUM(usec), spg_usec_per_day)); }
 
 #define SPG_NO_TZ 0
 #define SPG_DB_LOCAL 1
@@ -45,18 +37,10 @@
 #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;
-static int use_columns_method;
-
 /* 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) {Check_Type(_val, T_DATA); _var = pg_get_pgconn(_val);} else {Data_Get_Struct(_val, PGconn, _var);}
-#define GetPGresult(_val, _var) if (unwrap_structs) {Check_Type(_val, T_DATA); _var = pgresult_get(_val);} else {Data_Get_Struct(_val, PGresult, _var);}
-
 static VALUE spg_Sequel;
 static VALUE spg_Blob;
 static VALUE spg_BigDecimal;
@@ -78,8 +62,8 @@ static VALUE spg_sym__sequel_pg_value;
 static VALUE spg_nan;
 static VALUE spg_pos_inf;
 static VALUE spg_neg_inf;
+static VALUE spg_usec_per_day;
 
-static ID spg_id_Rational;
 static ID spg_id_new;
 static ID spg_id_local;
 static ID spg_id_year;
@@ -116,23 +100,15 @@ static ID spg_id_clear;
 static ID spg_id_check;
 #endif
 
-#if SPG_ENCODING
-static int enc_get_index(VALUE val)
-{
+static int enc_get_index(VALUE val) {
   int i = ENCODING_GET_INLINED(val);
   if (i == ENCODING_INLINE_MAX) {
     i = NUM2INT(rb_ivar_get(val, spg_id_encoding));
   }
   return i;
 }
-#endif
 
-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
-)
-{
+static VALUE read_array(int *index, char *c_pg_array_string, int array_string_length, VALUE buf, VALUE converter, int enc_index) {
   int word_index = 0;
   char *word = RSTRING_PTR(buf);
 
@@ -178,9 +154,7 @@ static VALUE read_array(int *index, char *c_pg_array_string, int array_string_le
             VALUE rword = rb_tainted_str_new(word, word_index);
             RB_GC_GUARD(rword);
 
-#ifdef SPG_ENCODING
             rb_enc_associate_index(rword, enc_index);
-#endif
 
             if (RTEST(converter)) {
               rword = rb_funcall(converter, spg_id_call, 1, rword);
@@ -204,11 +178,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, buf, converter
-#ifdef SPG_ENCODING
-, enc_index
-#endif
-        ));
+        rb_ary_push(array, read_array(index, c_pg_array_string, array_string_length, buf, converter, enc_index));
         escapeNext = 1;
       }
       else
@@ -273,9 +243,7 @@ static VALUE parse_pg_array(VALUE self, VALUE pg_array_string, VALUE converter)
   }
 
   return read_array(&index, c_pg_array_string, array_string_length, buf, converter
-#ifdef SPG_ENCODING
 , enc_get_index(pg_array_string)
-#endif
   );
 }
 
@@ -320,13 +288,18 @@ static VALUE spg_date(const char *s, VALUE self) {
     return spg_timestamp_error(s, self, "unexpected date format");
   }
 
+  if(s[10] == ' ' && s[11] == 'B' && s[12] == 'C') {
+    year = -year;
+    year++;
+  }
+
   return rb_funcall(spg_Date, spg_id_new, 3, INT2NUM(year), INT2NUM(month), INT2NUM(day));
 }
 
 static VALUE spg_timestamp(const char *s, VALUE self) {
   VALUE dtc, dt, rtz, db;
   int tz = SPG_NO_TZ;
-  int year, month, day, hour, min, sec, usec, tokens, utc_offset;
+  int year, month, day, hour, min, sec, usec, tokens, utc_offset, len;
   int usec_start, usec_stop;
   char offset_sign = 0;
   int offset_hour = 0;
@@ -358,18 +331,18 @@ static VALUE spg_timestamp(const char *s, VALUE self) {
   }
 
   if (0 != strchr(s, '.')) {
-    tokens = sscanf(s, "%d-%2d-%2d %2d:%2d:%2d.%n%d%n%c%02d:%02d", 
-	&year, &month, &day, &hour, &min, &sec,
-       	&usec_start, &usec, &usec_stop, 
-	&offset_sign, &offset_hour, &offset_minute);
+    tokens = sscanf(s, "%d-%2d-%2d %2d:%2d:%2d.%n%d%n%c%02d:%02d:%02d", 
+        &year, &month, &day, &hour, &min, &sec,
+        &usec_start, &usec, &usec_stop, 
+        &offset_sign, &offset_hour, &offset_minute, &offset_seconds);
     if(tokens < 7) {
       return spg_timestamp_error(s, self, "unexpected datetime format");
     }
     usec *= (int) pow(10, (6 - (usec_stop - usec_start)));
   } else {
-    tokens = sscanf(s, "%d-%2d-%2d %2d:%2d:%2d%c%02d:%02d", 
-	&year, &month, &day, &hour, &min, &sec,
-	&offset_sign, &offset_hour, &offset_minute);
+    tokens = sscanf(s, "%d-%2d-%2d %2d:%2d:%2d%c%02d:%02d:%02d", 
+        &year, &month, &day, &hour, &min, &sec,
+        &offset_sign, &offset_hour, &offset_minute, &offset_seconds);
     if (tokens == 3) {
       hour = 0;
       min = 0;
@@ -380,9 +353,16 @@ static VALUE spg_timestamp(const char *s, VALUE self) {
     usec = 0;
   }
 
+  len = strlen(s);
+  if(s[len-3] == ' ' && s[len-2] == 'B' && s[len-1] == 'C') {
+    year = -year;
+    year++;
+  }
+
   if (offset_sign == '-') {
     offset_hour *= -1;
     offset_minute *= -1;
+    offset_seconds *= -1;
   }
 
   dtc = rb_funcall(spg_Sequel, spg_id_datetime_class, 0);
@@ -394,7 +374,7 @@ static VALUE spg_timestamp(const char *s, VALUE self) {
        */
       dt = rb_funcall(rb_cTime, spg_id_local, 7, INT2NUM(year), INT2NUM(month), INT2NUM(day), INT2NUM(hour), INT2NUM(min), INT2NUM(sec), INT2NUM(usec));
       utc_offset = NUM2INT(rb_funcall(dt, spg_id_utc_offset, 0));
-      offset_seconds = offset_hour * 3600 + offset_minute * 60;
+      offset_seconds += offset_hour * 3600 + offset_minute * 60;
       if (utc_offset != offset_seconds) {
         dt = rb_funcall(dt, spg_id_op_plus, 1, INT2NUM(utc_offset - offset_seconds));
       }
@@ -429,7 +409,7 @@ static VALUE spg_timestamp(const char *s, VALUE self) {
       /* Offset given, handle correct local time.
        * While PostgreSQL generally returns timestamps in local time, it's unwise to rely on this.
        */
-      offset_fraction = offset_hour/24.0 + offset_minute/SPG_MINUTES_PER_DAY;
+      offset_fraction = offset_hour/24.0 + offset_minute/SPG_MINUTES_PER_DAY + offset_seconds/SPG_SECONDS_PER_DAY;
       dt = rb_funcall(dtc, spg_id_new, 7, INT2NUM(year), INT2NUM(month), INT2NUM(day), INT2NUM(hour), INT2NUM(min), INT2NUM(sec), rb_float_new(offset_fraction));
       SPG_DT_ADD_USEC
 
@@ -473,11 +453,7 @@ static VALUE spg_fetch_rows_set_cols(VALUE self, VALUE ignore) {
   return Qnil;
 }
 
-static VALUE spg__col_value(VALUE self, PGresult *res, long i, long j, VALUE* colconvert
-#ifdef SPG_ENCODING
-, int enc_index
-#endif
-) {
+static VALUE spg__col_value(VALUE self, PGresult *res, long i, long j, VALUE* colconvert, int enc_index) {
   char *v;
   VALUE rv;
   size_t l;
@@ -532,15 +508,11 @@ static VALUE spg__col_value(VALUE self, PGresult *res, long i, long j, VALUE* co
       case 25: /* text */
       case 1043: /* varchar*/
         rv = rb_tainted_str_new(v, PQgetlength(res, i, j));
-#ifdef SPG_ENCODING
         rb_enc_associate_index(rv, enc_index);
-#endif
         break;
       default:
         rv = rb_tainted_str_new(v, PQgetlength(res, i, j));
-#ifdef SPG_ENCODING
         rb_enc_associate_index(rv, enc_index);
-#endif
         if (colconvert[j] != Qnil) {
           rv = rb_funcall(colconvert[j], spg_id_call, 1, rv); 
         }
@@ -549,18 +521,14 @@ static VALUE spg__col_value(VALUE self, PGresult *res, long i, long j, VALUE* co
   return rv;
 }
 
-static VALUE spg__col_values(VALUE self, VALUE v, VALUE *colsyms, long nfields, PGresult *res, long i, VALUE *colconvert
-#ifdef SPG_ENCODING
-, int enc_index
-#endif
-) {
+static VALUE spg__col_values(VALUE self, VALUE v, VALUE *colsyms, long nfields, PGresult *res, long i, VALUE *colconvert, int enc_index) {
   long j;
   VALUE cur;
   long len = RARRAY_LEN(v);
   VALUE a = rb_ary_new2(len);
   for (j=0; j<len; j++) {
     cur = rb_ary_entry(v, j);
-    rb_ary_store(a, j, cur == Qnil ? Qnil : spg__col_value(self, res, i, NUM2LONG(cur), colconvert ENC_INDEX));
+    rb_ary_store(a, j, cur == Qnil ? Qnil : spg__col_value(self, res, i, NUM2LONG(cur), colconvert, enc_index));
   }
   return a;
 }
@@ -589,14 +557,6 @@ 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;
@@ -637,7 +597,8 @@ static void spg_set_column_info(VALUE self, PGresult *res, VALUE *colsyms, VALUE
         break;
     }
   }
-  spg_set_columns(self, rb_ary_new4(nfields, colsyms));
+
+  rb_funcall(self, spg_id_columns_equal, 1, rb_ary_new4(nfields, colsyms));
 }
 
 static VALUE spg_yield_hash_rows(VALUE self, VALUE rres, VALUE ignore) {
@@ -657,12 +618,11 @@ static VALUE spg_yield_hash_rows(VALUE self, VALUE rres, VALUE ignore) {
   if (!RTEST(rres)) {
     return self;
   }
-  GetPGresult(rres, res);
+  Check_Type(rres, T_DATA);
+  res = pgresult_get(rres);
 
-#ifdef SPG_ENCODING
   int enc_index;
   enc_index = enc_get_index(rres);
-#endif
 
   ntuples = PQntuples(res);
   nfields = PQnfields(res);
@@ -716,7 +676,7 @@ static VALUE spg_yield_hash_rows(VALUE self, VALUE rres, VALUE ignore) {
       for(i=0; i<ntuples; i++) {
         h = rb_hash_new();
         for(j=0; j<nfields; j++) {
-          rb_hash_aset(h, colsyms[j], spg__col_value(self, res, i, j, colconvert ENC_INDEX));
+          rb_hash_aset(h, colsyms[j], spg__col_value(self, res, i, j, colconvert, enc_index));
         }
         rb_yield(h);
       }
@@ -730,7 +690,7 @@ static VALUE spg_yield_hash_rows(VALUE self, VALUE rres, VALUE ignore) {
         } 
       } else {
         for(i=0; i<ntuples; i++) {
-          rb_yield(spg__col_value(self, res, i, j, colconvert ENC_INDEX));
+          rb_yield(spg__col_value(self, res, i, j, colconvert, enc_index));
         } 
       }
       break;
@@ -738,13 +698,13 @@ static VALUE spg_yield_hash_rows(VALUE self, VALUE rres, VALUE ignore) {
       /* Multiple columns as an array */
       h = spg__field_ids(pg_value, colsyms, nfields);
       for(i=0; i<ntuples; i++) {
-        rb_yield(spg__col_values(self, h, colsyms, nfields, res, i, colconvert ENC_INDEX));
+        rb_yield(spg__col_values(self, h, colsyms, nfields, res, i, colconvert, enc_index));
       } 
       break;
     case SPG_YIELD_FIRST:
       /* First column */
       for(i=0; i<ntuples; i++) {
-        rb_yield(spg__col_value(self, res, i, 0, colconvert ENC_INDEX));
+        rb_yield(spg__col_value(self, res, i, 0, colconvert, enc_index));
       } 
       break;
     case SPG_YIELD_ARRAY:
@@ -752,7 +712,7 @@ static VALUE spg_yield_hash_rows(VALUE self, VALUE rres, VALUE ignore) {
       for(i=0; i<ntuples; i++) {
         h = rb_ary_new2(nfields);
         for(j=0; j<nfields; j++) {
-          rb_ary_store(h, j, spg__col_value(self, res, i, j, colconvert ENC_INDEX));
+          rb_ary_store(h, j, spg__col_value(self, res, i, j, colconvert, enc_index));
         }
         rb_yield(h);
       } 
@@ -767,13 +727,13 @@ static VALUE spg_yield_hash_rows(VALUE self, VALUE rres, VALUE ignore) {
         v = spg__field_id(rb_ary_entry(pg_value, 1), colsyms, nfields);
         if(type == SPG_YIELD_KV_HASH) {
           for(i=0; i<ntuples; i++) {
-            rb_hash_aset(h, spg__col_value(self, res, i, k, colconvert ENC_INDEX), spg__col_value(self, res, i, v, colconvert ENC_INDEX));
+            rb_hash_aset(h, spg__col_value(self, res, i, k, colconvert, enc_index), spg__col_value(self, res, i, v, colconvert, enc_index));
           } 
         } else {
           VALUE kv, vv, a;
           for(i=0; i<ntuples; i++) {
-            kv = spg__col_value(self, res, i, k, colconvert ENC_INDEX);
-            vv = spg__col_value(self, res, i, v, colconvert ENC_INDEX);
+            kv = spg__col_value(self, res, i, k, colconvert, enc_index);
+            vv = spg__col_value(self, res, i, v, colconvert, enc_index);
             a = rb_hash_lookup(h, kv);
             if(!RTEST(a)) {
               rb_hash_aset(h, kv, rb_ary_new3(1, vv));
@@ -795,13 +755,13 @@ static VALUE spg_yield_hash_rows(VALUE self, VALUE rres, VALUE ignore) {
         v = spg__field_id(rb_ary_entry(pg_value, 1), colsyms, nfields);
         if(type == SPG_YIELD_MKV_HASH) {
           for(i=0; i<ntuples; i++) {
-            rb_hash_aset(h, spg__col_values(self, k, colsyms, nfields, res, i, colconvert ENC_INDEX), spg__col_value(self, res, i, v, colconvert ENC_INDEX));
+            rb_hash_aset(h, spg__col_values(self, k, colsyms, nfields, res, i, colconvert, enc_index), spg__col_value(self, res, i, v, colconvert, enc_index));
           } 
         } else {
           VALUE kv, vv, a;
           for(i=0; i<ntuples; i++) {
-            kv = spg__col_values(self, k, colsyms, nfields, res, i, colconvert ENC_INDEX);
-            vv = spg__col_value(self, res, i, v, colconvert ENC_INDEX);
+            kv = spg__col_values(self, k, colsyms, nfields, res, i, colconvert, enc_index);
+            vv = spg__col_value(self, res, i, v, colconvert, enc_index);
             a = rb_hash_lookup(h, kv);
             if(!RTEST(a)) {
               rb_hash_aset(h, kv, rb_ary_new3(1, vv));
@@ -823,13 +783,13 @@ static VALUE spg_yield_hash_rows(VALUE self, VALUE rres, VALUE ignore) {
         v = spg__field_ids(rb_ary_entry(pg_value, 1), colsyms, nfields);
         if(type == SPG_YIELD_KMV_HASH) {
           for(i=0; i<ntuples; i++) {
-            rb_hash_aset(h, spg__col_value(self, res, i, k, colconvert ENC_INDEX), spg__col_values(self, v, colsyms, nfields, res, i, colconvert ENC_INDEX));
+            rb_hash_aset(h, spg__col_value(self, res, i, k, colconvert, enc_index), spg__col_values(self, v, colsyms, nfields, res, i, colconvert, enc_index));
           } 
         } else {
           VALUE kv, vv, a;
           for(i=0; i<ntuples; i++) {
-            kv = spg__col_value(self, res, i, k, colconvert ENC_INDEX);
-            vv = spg__col_values(self, v, colsyms, nfields, res, i, colconvert ENC_INDEX);
+            kv = spg__col_value(self, res, i, k, colconvert, enc_index);
+            vv = spg__col_values(self, v, colsyms, nfields, res, i, colconvert, enc_index);
             a = rb_hash_lookup(h, kv);
             if(!RTEST(a)) {
               rb_hash_aset(h, kv, rb_ary_new3(1, vv));
@@ -851,13 +811,13 @@ static VALUE spg_yield_hash_rows(VALUE self, VALUE rres, VALUE ignore) {
         v = spg__field_ids(rb_ary_entry(pg_value, 1), colsyms, nfields);
         if(type == SPG_YIELD_MKMV_HASH) {
           for(i=0; i<ntuples; i++) {
-            rb_hash_aset(h, spg__col_values(self, k, colsyms, nfields, res, i, colconvert ENC_INDEX), spg__col_values(self, v, colsyms, nfields, res, i, colconvert ENC_INDEX));
+            rb_hash_aset(h, spg__col_values(self, k, colsyms, nfields, res, i, colconvert, enc_index), spg__col_values(self, v, colsyms, nfields, res, i, colconvert, enc_index));
           } 
         } else {
           VALUE kv, vv, a;
           for(i=0; i<ntuples; i++) {
-            kv = spg__col_values(self, k, colsyms, nfields, res, i, colconvert ENC_INDEX);
-            vv = spg__col_values(self, v, colsyms, nfields, res, i, colconvert ENC_INDEX);
+            kv = spg__col_values(self, k, colsyms, nfields, res, i, colconvert, enc_index);
+            vv = spg__col_values(self, v, colsyms, nfields, res, i, colconvert, enc_index);
             a = rb_hash_lookup(h, kv);
             if(!RTEST(a)) {
               rb_hash_aset(h, kv, rb_ary_new3(1, vv));
@@ -874,7 +834,7 @@ static VALUE spg_yield_hash_rows(VALUE self, VALUE rres, VALUE ignore) {
       for(i=0; i<ntuples; i++) {
         h = rb_hash_new();
         for(j=0; j<nfields; j++) {
-          rb_hash_aset(h, colsyms[j], spg__col_value(self, res, i, j, colconvert ENC_INDEX));
+          rb_hash_aset(h, colsyms[j], spg__col_value(self, res, i, j, colconvert, enc_index));
         }
         /* Abuse local variable */
         pg_type = rb_obj_alloc(pg_value);
@@ -898,7 +858,8 @@ static VALUE spg_supports_streaming_p(VALUE self) {
 #if HAVE_PQSETSINGLEROWMODE
 static VALUE spg_set_single_row_mode(VALUE self) {
   PGconn *conn;
-  GetPGconn(self, conn);
+  Check_Type(self, T_DATA);
+  conn = pg_get_pgconn(self);
   if (PQsetSingleRowMode(conn) != 1) {
       rb_raise(spg_PGError, "cannot set single row mode");
   }
@@ -922,19 +883,19 @@ static VALUE spg__yield_each_row(VALUE self) {
 
   rconn = rb_ary_entry(self, 1);
   self = rb_ary_entry(self, 0);
-  GetPGconn(rconn, conn);
+  Check_Type(rconn, T_DATA);
+  conn = pg_get_pgconn(rconn);
 
   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);
+  Check_Type(rres, T_DATA);
+  res = pgresult_get(rres);
 
-#ifdef SPG_ENCODING
   int enc_index;
   enc_index = enc_get_index(rres);
-#endif
 
   /* 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
@@ -959,7 +920,7 @@ static VALUE spg__yield_each_row(VALUE self) {
   while (PQntuples(res) != 0) {
     h = rb_hash_new();
     for(j=0; j<nfields; j++) {
-      rb_hash_aset(h, colsyms[j], spg__col_value(self, res, 0, j, colconvert ENC_INDEX));
+      rb_hash_aset(h, colsyms[j], spg__col_value(self, res, 0, j, colconvert , enc_index));
     }
 
     rb_funcall(rres, spg_id_clear, 0);
@@ -978,7 +939,8 @@ static VALUE spg__yield_each_row(VALUE self) {
       goto end_yield_each_row;
     }
     rb_funcall(rres, spg_id_check, 0);
-    GetPGresult(rres, res);
+    Check_Type(rres, T_DATA);
+    res = pgresult_get(rres);
   }
   rb_funcall(rres, spg_id_clear, 0);
 
@@ -990,7 +952,8 @@ static VALUE spg__flush_results(VALUE rconn) {
   PGconn *conn;
   PGresult *res;
   VALUE error = 0;
-  GetPGconn(rconn, conn);
+  Check_Type(rconn, T_DATA);
+  conn = pg_get_pgconn(rconn);
 
   while ((res = PQgetResult(conn)) != NULL) {
     if (!error) {
@@ -1085,11 +1048,12 @@ void Init_sequel_pg(void) {
   spg_SQLTime= rb_funcall(spg_Sequel, cg, 1, rb_str_new2("SQLTime")); 
   spg_BigDecimal = rb_funcall(rb_cObject, cg, 1, rb_str_new2("BigDecimal")); 
   spg_Date = rb_funcall(rb_cObject, cg, 1, rb_str_new2("Date")); 
-  spg_PGError = rb_eval_string("defined?(PG::Error) ? PG::Error : PGError");
+  spg_PGError = rb_funcall(rb_funcall(rb_cObject, cg, 1, rb_str_new2("PG")), cg, 1, rb_str_new2("Error"));
 
   spg_nan = rb_eval_string("0.0/0.0");
   spg_pos_inf = rb_eval_string("1.0/0.0");
   spg_neg_inf = rb_eval_string("-1.0/0.0");
+  spg_usec_per_day = ULL2NUM(86400000000ULL);
 
   rb_global_variable(&spg_Sequel);
   rb_global_variable(&spg_Blob);
@@ -1100,14 +1064,7 @@ void Init_sequel_pg(void) {
   rb_global_variable(&spg_nan);
   rb_global_variable(&spg_pos_inf);
   rb_global_variable(&spg_neg_inf);
-
-  /* Check for 1.8-1.9.2 stdlib date that needs Rational for usec accuracy */
-  if (rb_attr_get(rb_eval_string("Date.today"), rb_intern("@ajd")) != Qnil) {
-    spg_id_Rational = rb_intern("Rational");
-  }
-  if (rb_eval_string("defined?(PG::TypeMapAllStrings)") != Qnil) {
-    unwrap_structs = 1;
-  }
+  rb_global_variable(&spg_usec_per_day);
 
   c = rb_funcall(spg_Postgres, cg, 1, rb_str_new2("Dataset"));
   rb_undef_method(c, "yield_hash_rows");
@@ -1115,10 +1072,6 @@ void Init_sequel_pg(void) {
   rb_undef_method(c, "fetch_rows_set_cols");
   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.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-25 00:00:00.000000000 Z
+date: 2017-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.34.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.34.0
 description: |
   sequel_pg overwrites the inner loop of the Sequel postgres
   adapter row fetching code with a C version.  The C version
@@ -83,7 +83,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Faster SELECTs when using Sequel with pg