sequel_pg 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5e59a1152aaf6b21d44b1d57ce4653b6248a61db684a443bcdbbb86fb7c7ff8
-  data.tar.gz: 5f3392deba2a7286b6fa24a8c3b93ea8ee362f027c6df75a55574910b62a4c7c
+  metadata.gz: c587158ff9ea71f6a0ce019384c317b03b8c1a9c6027f363502e98f148b4a958
+  data.tar.gz: ad74cf362d21fe64409be4b29536709c5d6d6dbabe3a248a3cad5da5f282124f
 SHA512:
-  metadata.gz: 04d3ac1ba009d05ba2dd46d32865926a79a3cae63ef3f29a9d26d5874409fedfc54e6855a0a9ea9e7dd4dd9ef5e8603bda134368e040d9e3858f00b063ca8363
-  data.tar.gz: 0d147bca275b89d70255430fdadf4c7afc0a83a5f48414a656c1b583297ac05dea61b0d03d43a78b6bcff31f27adc8d62462e98de4228348171131f4e71144be
+  metadata.gz: 39fb59374fe67630cea51820851b380f9537ef6769599ee43581855eb99e70c5251d03c70134a0512ad6ce36bc127704dcf152a2113de1461deb2839e19830c5
+  data.tar.gz: 470e31d71b43e3cad932cad0838805047d8d69013795a28d29b0099460a7a285ae5caae6a3e3950d61b80e30d2668cbf398fdc0dce1e16a1f970226e48c69cdb

data/CHANGELOG

@@ -1,3 +1,9 @@
+=== 1.11.0 (2018-07-09)
+
+* Set encoding correctly for hash symbol keys (jeremyevans)
+
+* Slight performance improvement to float parsing (jeremyevans)
+
 === 1.10.0 (2018-06-25)
 
 * Add native inet/cidr parsers (jeremyevans)

data/ext/sequel_pg/sequel_pg.c

@@ -1,4 +1,4 @@
-#define SEQUEL_PG_VERSION_INTEGER 11000
+#define SEQUEL_PG_VERSION_INTEGER 11100
 
 #include <string.h>
 #include <stdio.h>
@@ -79,7 +79,6 @@ static VALUE spg_Sequel;
 static VALUE spg_PGArray;
 static VALUE spg_Blob;
 static VALUE spg_Blob_instance;
-static VALUE spg_Kernel;
 static VALUE spg_Date;
 static VALUE spg_DateTime;
 static VALUE spg_SQLTime;
@@ -881,18 +880,27 @@ static VALUE spg__array_col_value(char *v, size_t length, VALUE converter, int e
       break;
     case 700: /* float */
     case 701:
-      if (strcmp("NaN", v) == 0) {
-        rv = spg_nan;
-      } else if (strcmp("Infinity", v) == 0) {
-        rv = spg_pos_inf;
-      } else if (strcmp("-Infinity", v) == 0) {
-        rv = spg_neg_inf;
-      } else {
-        rv = rb_float_new(rb_cstr_to_dbl(v, Qfalse));
+      switch(*v) {
+        case 'N':
+          rv = spg_nan;
+          break;
+        case 'I':
+          rv = spg_pos_inf;
+          break;
+        case '-':
+          if (v[1] == 'I') {
+            rv = spg_neg_inf;
+          } else {
+            rv = rb_float_new(rb_cstr_to_dbl(v, Qfalse));
+          }
+          break;
+        default:
+          rv = rb_float_new(rb_cstr_to_dbl(v, Qfalse));
+          break;
       }
       break;
     case 1700: /* numeric */
-      rv = rb_funcall(spg_Kernel, spg_id_BigDecimal, 1, rb_str_new(v, length));
+      rv = rb_funcall(rb_mKernel, spg_id_BigDecimal, 1, rb_str_new(v, length));
       break;
     case 1082: /* date */
       rv = spg_date(v, db, length);
@@ -1018,18 +1026,27 @@ static VALUE spg__col_value(VALUE self, PGresult *res, long i, long j, VALUE* co
         break;
       case 700: /* float */
       case 701:
-        if (strcmp("NaN", v) == 0) {
-          rv = spg_nan;
-        } else if (strcmp("Infinity", v) == 0) {
-          rv = spg_pos_inf;
-        } else if (strcmp("-Infinity", v) == 0) {
-          rv = spg_neg_inf;
-        } else {
-          rv = rb_float_new(rb_cstr_to_dbl(v, Qfalse));
+        switch(*v) {
+          case 'N':
+            rv = spg_nan;
+            break;
+          case 'I':
+            rv = spg_pos_inf;
+            break;
+          case '-':
+            if (v[1] == 'I') {
+              rv = spg_neg_inf;
+            } else {
+              rv = rb_float_new(rb_cstr_to_dbl(v, Qfalse));
+            }
+            break;
+          default:
+            rv = rb_float_new(rb_cstr_to_dbl(v, Qfalse));
+            break;
         }
         break;
       case 1700: /* numeric */
-        rv = rb_funcall(spg_Kernel, spg_id_BigDecimal, 1, rb_str_new(v, PQgetlength(res, i, j)));
+        rv = rb_funcall(rb_mKernel, spg_id_BigDecimal, 1, rb_str_new(v, PQgetlength(res, i, j)));
         break;
       case 1082: /* date */
         rv = spg_date(v, self, PQgetlength(res, i, j));
@@ -1246,18 +1263,21 @@ static VALUE spg__field_ids(VALUE v, VALUE *colsyms, long nfields) {
   return pg_columns;
 }
 
-static void spg_set_column_info(VALUE self, PGresult *res, VALUE *colsyms, VALUE *colconvert) {
+static void spg_set_column_info(VALUE self, PGresult *res, VALUE *colsyms, VALUE *colconvert, int enc_index) {
   long i;
   long j;
   long nfields;
   int timestamp_info = 0;
   int time_info = 0;
   VALUE conv_procs = 0;
+  VALUE tmp;
 
   nfields = PQnfields(res);
 
   for(j=0; j<nfields; j++) {
-    colsyms[j] = rb_funcall(self, spg_id_output_identifier, 1, rb_str_new2(PQfname(res, j)));
+    tmp = rb_str_new2(PQfname(res, j));
+    PG_ENCODING_SET_NOCHECK(tmp, enc_index);
+    colsyms[j] = rb_funcall(self, spg_id_output_identifier, 1, tmp);
     i = PQftype(res, j);
     switch (i) {
       /* scalar types */
@@ -1363,7 +1383,7 @@ static VALUE spg_yield_hash_rows(VALUE self, VALUE rres, VALUE ignore) {
     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);
+  spg_set_column_info(self, res, colsyms, colconvert, enc_index);
 
   opts = rb_funcall(self, spg_id_opts, 0);
   if (rb_type(opts) == T_HASH) {
@@ -1643,7 +1663,7 @@ static VALUE spg__yield_each_row(VALUE self) {
     rb_raise(rb_eRangeError, "more than %d columns in query", SPG_MAX_FIELDS);
   }
 
-  spg_set_column_info(self, res, colsyms, colconvert);
+  spg_set_column_info(self, res, colsyms, colconvert, enc_index);
 
   while (PQntuples(res) != 0) {
     h = rb_hash_new();
@@ -1715,12 +1735,10 @@ static VALUE spg_yield_each_row(VALUE self, VALUE rconn) {
 
 void Init_sequel_pg(void) {
   VALUE c, spg_Postgres;
-  ID cg;
-  cg = rb_intern("const_get");
 
-  spg_Sequel = rb_funcall(rb_cObject, cg, 1, rb_str_new2("Sequel"));
-  spg_Postgres = rb_funcall(spg_Sequel, cg, 1, rb_str_new2("Postgres"));
+  spg_Sequel = rb_const_get(rb_cObject, rb_intern("Sequel"));
   rb_global_variable(&spg_Sequel);
+  spg_Postgres = rb_const_get(spg_Sequel, rb_intern("Postgres"));
 
   if(rb_obj_respond_to(spg_Postgres, rb_intern("sequel_pg_version_supported?"), 0)) {
     if(!RTEST(rb_funcall(spg_Postgres, rb_intern("sequel_pg_version_supported?"), 1, INT2FIX(SEQUEL_PG_VERSION_INTEGER)))) {
@@ -1728,7 +1746,8 @@ void Init_sequel_pg(void) {
       return;
     }
   }
-  rb_funcall(spg_Postgres, rb_intern("const_set"), 2, ID2SYM(rb_intern("SEQUEL_PG_VERSION_INTEGER")), INT2FIX(SEQUEL_PG_VERSION_INTEGER));
+  
+  rb_const_set(spg_Postgres, rb_intern("SEQUEL_PG_VERSION_INTEGER"), INT2FIX(SEQUEL_PG_VERSION_INTEGER));
 
   spg_id_BigDecimal = rb_intern("BigDecimal");
   spg_id_new = rb_intern("new");
@@ -1809,19 +1828,17 @@ void Init_sequel_pg(void) {
   spg_sym_inet = ID2SYM(rb_intern("inet"));
   spg_sym_cidr = ID2SYM(rb_intern("cidr"));
 
-  spg_Blob = rb_funcall(rb_funcall(spg_Sequel, cg, 1, rb_str_new2("SQL")), cg, 1, rb_str_new2("Blob")); 
+  spg_Blob = rb_const_get(rb_const_get(spg_Sequel, rb_intern("SQL")), rb_intern("Blob")); 
   rb_global_variable(&spg_Blob);
   spg_Blob_instance = rb_obj_freeze(rb_funcall(spg_Blob, spg_id_new, 0));
   rb_global_variable(&spg_Blob_instance);
-  spg_SQLTime= rb_funcall(spg_Sequel, cg, 1, rb_str_new2("SQLTime")); 
+  spg_SQLTime = rb_const_get(spg_Sequel, rb_intern("SQLTime")); 
   rb_global_variable(&spg_SQLTime);
-  spg_Kernel = rb_funcall(rb_cObject, cg, 1, rb_str_new2("Kernel")); 
-  rb_global_variable(&spg_Kernel);
-  spg_Date = rb_funcall(rb_cObject, cg, 1, rb_str_new2("Date")); 
+  spg_Date = rb_const_get(rb_cObject, rb_intern("Date")); 
   rb_global_variable(&spg_Date);
-  spg_DateTime = rb_funcall(rb_cObject, cg, 1, rb_str_new2("DateTime")); 
+  spg_DateTime = rb_const_get(rb_cObject, rb_intern("DateTime")); 
   rb_global_variable(&spg_DateTime);
-  spg_PGError = rb_funcall(rb_funcall(rb_cObject, cg, 1, rb_str_new2("PG")), cg, 1, rb_str_new2("Error"));
+  spg_PGError = rb_const_get(rb_const_get(rb_cObject, rb_intern("PG")), rb_intern("Error"));
   rb_global_variable(&spg_PGError);
 
   spg_nan = rb_eval_string("0.0/0.0");
@@ -1834,7 +1851,7 @@ void Init_sequel_pg(void) {
   rb_global_variable(&spg_usec_per_day);
 
   rb_require("ipaddr");
-  spg_IPAddr = rb_funcall(rb_cObject, rb_intern("const_get"), 1, rb_str_new2("IPAddr"));
+  spg_IPAddr = rb_const_get(rb_cObject, rb_intern("IPAddr"));
   rb_global_variable(&spg_IPAddr);
   spg_use_ipaddr_alloc = RTEST(rb_eval_string("IPAddr.new.instance_variables.sort == [:@addr, :@family, :@mask_addr]"));
   spg_vmasks4 = rb_eval_string("a = [0]*33; a[0] = 0; a[32] = 0xffffffff; 31.downto(1){|i| a[i] = a[i+1] - (1 << (31 - i))}; a.freeze");
@@ -1842,7 +1859,7 @@ void Init_sequel_pg(void) {
   spg_vmasks6 = rb_eval_string("a = [0]*129; a[0] = 0; a[128] = 0xffffffffffffffffffffffffffffffff; 127.downto(1){|i| a[i] = a[i+1] - (1 << (127 - i))}; a.freeze");
   rb_global_variable(&spg_vmasks6);
 
-  c = rb_funcall(spg_Postgres, cg, 1, rb_str_new2("Dataset"));
+  c = rb_const_get(spg_Postgres, rb_intern("Dataset"));
   rb_undef_method(c, "yield_hash_rows");
   rb_define_private_method(c, "yield_hash_rows", spg_yield_hash_rows, 2);
   rb_undef_method(c, "fetch_rows_set_cols");
@@ -1856,7 +1873,7 @@ void Init_sequel_pg(void) {
   spg_id_check = rb_intern("check");
 
   rb_define_private_method(c, "yield_each_row", spg_yield_each_row, 1);
-  c = rb_funcall(spg_Postgres, cg, 1, rb_str_new2("Adapter"));
+  c = rb_const_get(spg_Postgres, rb_intern("Adapter"));
   rb_define_private_method(c, "set_single_row_mode", spg_set_single_row_mode, 0);
 #endif
 
@@ -1865,6 +1882,6 @@ void Init_sequel_pg(void) {
   rb_require("sequel_pg/sequel_pg");
 
   rb_require("sequel/extensions/pg_array");
-  spg_PGArray = rb_funcall(spg_Postgres, cg, 1, rb_str_new2("PGArray"));
+  spg_PGArray = rb_const_get(spg_Postgres, rb_intern("PGArray"));
   rb_global_variable(&spg_PGArray);
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel_pg
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-25 00:00:00.000000000 Z
+date: 2018-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg