sequel_pg 1.6.5-x86-mswin32-60 → 1.6.6-x86-mswin32-60

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,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sequel_pg
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 1
   - 6
-  - 5
-  version: 1.6.5
+  - 6
+  version: 1.6.6
 platform: x86-mswin32-60
 authors: 
 - Jeremy Evans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-19 00:00:00 Z
+date: 2013-04-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: pg