sequel_pg 1.6.4 → 1.6.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b1aa68756578004af7fd8902e1e1a1560f451aa8
+  data.tar.gz: aaff4eb191c7b19815122a5988508e70e43ef5f0
+SHA512:
+  metadata.gz: 781963db94f96ce1834d19b3ac7acd0a707a358fc5574dc1b721e84d7b572154548b8ad58ba063407698e4bb6ffe44d29c13373e00c71d4e9785adbfb0e20e2f
+  data.tar.gz: 5dc8901c114698aa9ffc8d0cea2a12b116a1a1c1f41a9d13216091ca1ee3047f2d5b638a3d0c57390936384269d417cd362377fe69fa21fdb50fff5312fbbadf

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 1.6.5 (2013-03-06)
+
+* Handle infinite dates using Database#convert_infinite_timestamps (jeremyevans)
+
 === 1.6.4 (2013-01-14)
 
 * Remove type conversion of int2vector and money types on PostgreSQL, since previous conversions were wrong (jeremyevans) (#8)

data/ext/sequel_pg/sequel_pg.c

@@ -268,17 +268,7 @@ static VALUE spg_time(const char *s) {
   return rb_funcall(spg_SQLTime, spg_id_local, 7, rb_funcall(now, spg_id_year, 0), rb_funcall(now, spg_id_month, 0), rb_funcall(now, spg_id_day, 0), INT2NUM(hour), INT2NUM(minute), INT2NUM(second), INT2NUM(usec));
 }
 
-static VALUE spg_date(const char *s) {
-  int year, month, day;
-
-  if(3 != sscanf(s, "%d-%2d-%2d", &year, &month, &day)) {
-    rb_raise(rb_eArgError, "unexpected date format");
-  }
-
-  return rb_funcall(spg_Date, spg_id_new, 3, INT2NUM(year), INT2NUM(month), INT2NUM(day));
-}
-
-static VALUE spg_timestamp_error(const char *s, VALUE self) {
+static VALUE spg_timestamp_error(const char *s, VALUE self, const char *error_msg) {
   VALUE db;
   db = rb_funcall(self, spg_id_db, 0);
   if(RTEST(rb_funcall(db, spg_id_convert_infinite_timestamps, 0))) {
@@ -286,7 +276,17 @@ static VALUE spg_timestamp_error(const char *s, VALUE self) {
       return rb_funcall(db, spg_id_infinite_timestamp_value, 1, rb_tainted_str_new2(s));
     }
   }
-  rb_raise(rb_eArgError, "unexpected datetime format");
+  rb_raise(rb_eArgError, error_msg);
+}
+
+static VALUE spg_date(const char *s, VALUE self) {
+  int year, month, day;
+
+  if(3 != sscanf(s, "%d-%2d-%2d", &year, &month, &day)) {
+    return spg_timestamp_error(s, self, "unexpected date format");
+  }
+
+  return rb_funcall(spg_Date, spg_id_new, 3, INT2NUM(year), INT2NUM(month), INT2NUM(day));
 }
 
 static VALUE spg_timestamp(const char *s, VALUE self) {
@@ -306,7 +306,7 @@ static VALUE spg_timestamp(const char *s, VALUE self) {
        	&usec_start, &usec, &usec_stop, 
 	&offset_sign, &offset_hour, &offset_minute);
     if(tokens < 7) {
-      return spg_timestamp_error(s, self);
+      return spg_timestamp_error(s, self, "unexpected datetime format");
     }
     usec *= (int) pow(10, (6 - (usec_stop - usec_start)));
   } else {
@@ -318,7 +318,7 @@ static VALUE spg_timestamp(const char *s, VALUE self) {
       min = 0;
       sec = 0;
     } else if (tokens < 6) {
-      return spg_timestamp_error(s, self);
+      return spg_timestamp_error(s, self, "unexpected datetime format");
     }
     usec = 0;
   }
@@ -474,7 +474,7 @@ static VALUE spg__col_value(VALUE self, PGresult *res, long i, long j, VALUE* co
         rv = rb_funcall(spg_BigDecimal, spg_id_new, 1, rb_str_new(v, PQgetlength(res, i, j)));
         break;
       case 1082: /* date */
-        rv = spg_date(v);
+        rv = spg_date(v, self);
         break;
       case 1083: /* time */
       case 1266:

metadata

@@ -1,57 +1,48 @@
 --- !ruby/object:Gem::Specification
 name: sequel_pg
 version: !ruby/object:Gem::Version
-  version: 1.6.4
-  prerelease: 
+  version: 1.6.5
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.39.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.39.0
-description: ! 'sequel_pg overwrites the inner loop of the Sequel postgres
-
+description: |
+  sequel_pg overwrites the inner loop of the Sequel postgres
   adapter row fetching code with a C version.  The C version
-
   is significantly faster (2-6x) than the pure ruby version
-
   that Sequel uses by default.
-
-'
 email: code@jeremyevans.net
 executables: []
 extensions:
@@ -71,33 +62,32 @@ files:
 - lib/sequel/extensions/pg_streaming.rb
 homepage: http://github.com/jeremyevans/sequel_pg
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --quiet
 - --line-numbers
 - --inline-source
 - --title
-- ! 'sequel_pg: Faster SELECTs when using Sequel with pg'
+- 'sequel_pg: Faster SELECTs when using Sequel with pg'
 - --main
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Faster SELECTs when using Sequel with pg
 test_files: []