sequel_pg 1.6.5 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1aa68756578004af7fd8902e1e1a1560f451aa8
-  data.tar.gz: aaff4eb191c7b19815122a5988508e70e43ef5f0
+  metadata.gz: b4534a4f3fc0a9874f98a9975d3e6438f569fdd8
+  data.tar.gz: 31ead4011ba3060f4883c62b1fba0431db2d593e
 SHA512:
-  metadata.gz: 781963db94f96ce1834d19b3ac7acd0a707a358fc5574dc1b721e84d7b572154548b8ad58ba063407698e4bb6ffe44d29c13373e00c71d4e9785adbfb0e20e2f
-  data.tar.gz: 5dc8901c114698aa9ffc8d0cea2a12b116a1a1c1f41a9d13216091ca1ee3047f2d5b638a3d0c57390936384269d417cd362377fe69fa21fdb50fff5312fbbadf
+  metadata.gz: b4c43e04b77565a9a0dfc1ef933b2eab36e1635837d5e740c18ca13dc2edaf2cf783a7e640cd54df40a0a3aa6205158d66d5952470e7208d7c6c95854503c4bc
+  data.tar.gz: 3351d0c50c38a078fbe04fe2cbcf5cbe6ab22cade617a08d4f1c1daabb44420d594e9af75b2b04a8537219572b221b95992c731e6187ddaecdd700b6871e532b

data/CHANGELOG

@@ -1,3 +1,9 @@
+=== 1.6.6 (2013-05-31)
+
+* Work correctly when using the named_timezones extension (jeremyevans)
+
+* Work around format-security false positive (jeremyevans) (#9)
+
 === 1.6.5 (2013-03-06)
 
 * Handle infinite dates using Database#convert_infinite_timestamps (jeremyevans)

data/README.rdoc

@@ -157,7 +157,7 @@ sequel_pg has been tested on the following:
 * ruby 1.8.7
 * ruby 1.9.2
 * ruby 1.9.3
-* ruby 2.0.0preview1
+* ruby 2.0.0
 * rbx 1.2.4
 
 If your platform, compiler version, or ruby version is not listed
@@ -178,10 +178,6 @@ above, please test and send me a report including:
   should be OK.
 * Adding your own type conversion procs only has an effect if those
   types are not handled by default.
-* The named_timezones plugin does not integrate with sequel_pg, since
-  sequel_pg does it's own timestamp conversions. The :local and :utc
-  settings for database_timestamp and application_timestamp do work,
-  as does setting the datetime_class to DateTime.
 * You do not need to require the library, the sequel postgres adapter
   will require it automatically.  If you are using bundler, you
   should add it to your Gemfile like so:

data/ext/sequel_pg/sequel_pg.c

@@ -83,6 +83,7 @@ static ID spg_id_day;
 static ID spg_id_output_identifier;
 static ID spg_id_datetime_class;
 static ID spg_id_application_timezone;
+static ID spg_id_to_application_timestamp;
 static ID spg_id_timezone;
 static ID spg_id_op_plus;
 static ID spg_id_utc;
@@ -276,7 +277,7 @@ static VALUE spg_timestamp_error(const char *s, VALUE self, const char *error_ms
       return rb_funcall(db, spg_id_infinite_timestamp_value, 1, rb_tainted_str_new2(s));
     }
   }
-  rb_raise(rb_eArgError, error_msg);
+  rb_raise(rb_eArgError, "%s", error_msg);
 }
 
 static VALUE spg_date(const char *s, VALUE self) {
@@ -290,7 +291,7 @@ static VALUE spg_date(const char *s, VALUE self) {
 }
 
 static VALUE spg_timestamp(const char *s, VALUE self) {
-  VALUE dtc, dt, rtz;
+  VALUE dtc, dt, rtz, db;
   int tz = SPG_NO_TZ;
   int year, month, day, hour, min, sec, usec, tokens, utc_offset;
   int usec_start, usec_stop;
@@ -300,6 +301,18 @@ static VALUE spg_timestamp(const char *s, VALUE self) {
   int offset_seconds = 0;
   double offset_fraction = 0.0;
 
+  db = rb_funcall(self, spg_id_db, 0);
+  rtz = rb_funcall(db, spg_id_timezone, 0);
+  if (rtz != Qnil) {
+    if (rtz == spg_sym_local) {
+      tz += SPG_DB_LOCAL;
+    } else if (rtz == spg_sym_utc) {
+      tz += SPG_DB_UTC;
+    } else {
+      return rb_funcall(db, spg_id_to_application_timestamp, 1, rb_str_new2(s)); 
+    }
+  }
+
   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,
@@ -330,12 +343,6 @@ static VALUE spg_timestamp(const char *s, VALUE self) {
 
   /* Get values of datetime_class, database_timezone, and application_timezone */
   dtc = rb_funcall(spg_Sequel, spg_id_datetime_class, 0);
-  rtz = rb_funcall(rb_funcall(self, spg_id_db, 0), spg_id_timezone, 0);
-  if (rtz == spg_sym_local) {
-    tz += SPG_DB_LOCAL;
-  } else if (rtz == spg_sym_utc) {
-    tz += SPG_DB_UTC;
-  }
   rtz = rb_funcall(spg_Sequel, spg_id_application_timezone, 0);
   if (rtz == spg_sym_local) {
     tz += SPG_APP_LOCAL;
@@ -977,6 +984,7 @@ void Init_sequel_pg(void) {
   spg_id_output_identifier = rb_intern("output_identifier");
   spg_id_datetime_class = rb_intern("datetime_class");
   spg_id_application_timezone = rb_intern("application_timezone");
+  spg_id_to_application_timestamp = rb_intern("to_application_timestamp");
   spg_id_timezone = rb_intern("timezone");
   spg_id_op_plus = rb_intern("+");
   spg_id_utc = rb_intern("utc");

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel_pg
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.6
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-06 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Faster SELECTs when using Sequel with pg