sequel_pg 1.6.17 → 1.6.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41fd896c78d22b043d2544d1593fca2d48a02efe
-  data.tar.gz: 566b1a460e4af2088e4f6aa223ea8e2ad815927d
+  metadata.gz: b9af8b932e28c1fba7a23ca7608c227be50a0896
+  data.tar.gz: c65775dc39943ef8f507f13ca7cc73a723cda98a
 SHA512:
-  metadata.gz: 7c556a5e5db2f11691b2faeb934594c3b25f5cd93cf4c9d2c2c32182102e8bb2a64d71bb25cff84ec40f87bfb89a5e13b9bac584fe96de5fd5b4e4943353c2b5
-  data.tar.gz: 95bca2c496c52da648384c0aad749e881c5bf85f9740298e85df76342cd57ec89cad717e25d5c72e457e4924d7d83822bddf72782780039a559a33990638f746
+  metadata.gz: fde42c5f10204facab45b5dfd30e39686854d9b93ac62afbcea80037558d349fae38fab978608ce593d2e62e6defa8c4b3892bbb1ad2f20d8745723de06b2356
+  data.tar.gz: b06f564b96261f1f04bb875a064e81956fe12d4c0d963cee958bfde0e259aa7f99bd38c00357b48509d41b500aeb0b3d1f50169c48fba7a1dd5a26fd2ea5e087

data/CHANGELOG

@@ -1,6 +1,14 @@
+=== 1.6.18 (2017-04-27)
+
+* Support logging of connection information in single row mode (jeremyevans)
+
+* Check Sequel compatibility before overwriting methods, supported in Sequel 4.44.0+ (jeremyevans)
+
+* Remove verbose mode warnings (jeremyevans)
+
 === 1.6.17 (2016-04-29)
 
-*  Work with upcoming 4.34.0 release, supporting the duplicate_column_handler extension (jeremyevans)
+* Work with upcoming 4.34.0 release, supporting the duplicate_column_handler extension (jeremyevans)
 
 === 1.6.16 (2016-04-11)
 

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2016 Jeremy Evans
+Copyright (c) 2010-2017 Jeremy Evans
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/README.rdoc

@@ -7,7 +7,7 @@ faster (2-6x) than the pure ruby version that Sequel uses by default.
 == Real world difference
 
 The speed up that sequel_pg gives you depends on what you are
-selecting, but it should be noticable whenever many rows are selected.
+selecting, but it should be noticeable whenever many rows are selected.
 Here's an example that shows the difference it makes on a couple of
 models:
 
@@ -48,8 +48,8 @@ with the following plugins that ship with Sequel:
 
 * class_table_inheritance
 * force_encoding
-* serializiation
-* single_table_interitance
+* serialization
+* single_table_inheritance
 * typecast_on_load
 * update_primary_key
 
@@ -154,9 +154,11 @@ sequel_pg has been tested on the following:
 
 * ruby 1.8.7
 * ruby 1.9.3
-* ruby 2.0.0
-* ruby 2.1.4
-* rbx 2.2.9
+* ruby 2.0
+* ruby 2.1
+* ruby 2.2
+* ruby 2.3
+* ruby 2.4
 
 == Known Issues
 

data/ext/sequel_pg/sequel_pg.c

@@ -1,3 +1,5 @@
+#define SEQUEL_PG_VERSION_INTEGER 10618
+
 #include <string.h>
 #include <stdio.h>
 #include <math.h>
@@ -1018,6 +1020,17 @@ 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"));
+
+  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)))) {
+      rb_warn("sequel_pg not loaded as it is not compatible with the Sequel version in use; install the latest version of sequel_pg or uninstall sequel_pg");
+      return;
+    }
+  }
+
   spg_id_new = rb_intern("new");
   spg_id_local = rb_intern("local");
   spg_id_year = rb_intern("year");
@@ -1060,12 +1073,10 @@ void Init_sequel_pg(void) {
   spg_sym__sequel_pg_type = ID2SYM(rb_intern("_sequel_pg_type"));
   spg_sym__sequel_pg_value = ID2SYM(rb_intern("_sequel_pg_value"));
 
-  spg_Sequel = rb_funcall(rb_cObject, cg, 1, rb_str_new2("Sequel"));
   spg_Blob = rb_funcall(rb_funcall(spg_Sequel, cg, 1, rb_str_new2("SQL")), cg, 1, rb_str_new2("Blob")); 
   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_Postgres = rb_funcall(spg_Sequel, cg, 1, rb_str_new2("Postgres"));
   spg_PGError = rb_funcall(rb_cObject, cg, 1, rb_str_new2("PGError"));
 
   spg_nan = rb_eval_string("0.0/0.0");
@@ -1083,7 +1094,7 @@ void Init_sequel_pg(void) {
   rb_global_variable(&spg_neg_inf);
 
   /* Check for 1.8-1.9.2 stdlib date that needs Rational for usec accuracy */
-  if (rb_eval_string("Date.today.instance_variable_get(:@ajd)") != Qnil) {
+  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) {
@@ -1091,7 +1102,9 @@ void Init_sequel_pg(void) {
   }
 
   c = rb_funcall(spg_Postgres, cg, 1, rb_str_new2("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");
   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) {

data/lib/sequel/extensions/pg_streaming.rb

@@ -73,16 +73,30 @@ module Sequel::Postgres::Streaming
 
     private
 
-    # If using single row mode, send the query instead of executing it.
-    def execute_query(sql, args)
-      if @single_row_mode
-        @single_row_mode = false
-        @db.log_yield(sql, args){args ? send_query(sql, args) : send_query(sql)}
-        set_single_row_mode
-        block
-        self
-      else
-        super
+    if Sequel::Database.instance_methods.map(&:to_s).include?('log_connection_yield')
+      # If using single row mode, send the query instead of executing it.
+      def execute_query(sql, args)
+        if @single_row_mode
+          @single_row_mode = false
+          @db.log_connection_yield(sql, self, args){args ? send_query(sql, args) : send_query(sql)}
+          set_single_row_mode
+          block
+          self
+        else
+          super
+        end
+      end
+    else
+      def execute_query(sql, args)
+        if @single_row_mode
+          @single_row_mode = false
+          @db.log_yield(sql, args){args ? send_query(sql, args) : send_query(sql)}
+          set_single_row_mode
+          block
+          self
+        else
+          super
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel_pg
 version: !ruby/object:Gem::Version
-  version: 1.6.17
+  version: 1.6.18
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Faster SELECTs when using Sequel with pg