sequel_pg 1.0.1 → 1.0.2

data/CHANGELOG

@@ -1,3 +1,15 @@
+=== 1.0.2
+
+* Build the Windows gem against PostgreSQL 9.0.1 to support the new default bytea serialization format (jeremyevans)
+
+* Allow use of Sequel::Postgres::PG_TYPES to add custom conversion support for types not handled by default (funny-falcon)
+
+* Fix handling of timestamps with fractional seconds and offsets (funny-falcon)
+
+=== 1.0.1
+
+* Correctly handle timestamps with negative offsets and fractional hours (jeremyevans)
+
 === 1.0.0 
 
 * Initial Public Release

data/{LICENSE → MIT-LICENSE}

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Jeremy Evans
+Copyright (c) 2010-2011 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

@@ -126,8 +126,7 @@ above, please test and send me a report including:
   setting (via Sequel::Postgres.use_iso_date_format = false), you
   should be OK.
 * Adding your own type conversion procs to Sequel::Postgres::PG_TYPES
-  does not have an effect with this plugin, since the type conversion
-  is done in C.
+  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,

data/ext/sequel_pg/extconf.rb

@@ -5,8 +5,11 @@ dir_config('pg', ENV["POSTGRES_INCLUDE"] || (IO.popen("pg_config --includedir").
 
 if enable_config("static-build")
 	# Link against all required libraries for static build, if they are available
-	have_library('gdi32', 'CreateDC') && append_library($libs, 'gdi32')
-	have_library('secur32') && append_library($libs, 'secur32')
+	have_library('gdi32', 'CreateDC')
+	have_library('secur32')
+	have_library('ws2_32')
+	have_library('eay32')
+	have_library('ssleay32', 'SSL_pending')
 end
 
 if (have_library('pq') || have_library('libpq') || have_library('ms/libpq')) && have_header('libpq-fe.h')

data/ext/sequel_pg/sequel_pg.c

@@ -23,6 +23,7 @@
 #define SPG_APP_UTC 8
 
 static VALUE spg_Sequel;
+static VALUE spg_PG_TYPES;
 static VALUE spg_Blob;
 static VALUE spg_BigDecimal;
 static VALUE spg_Date;
@@ -45,6 +46,9 @@ static ID spg_id_utc_offset;
 static ID spg_id_localtime;
 static ID spg_id_new_offset;
 
+static ID spg_id_call;
+static ID spg_id_get;
+
 static ID spg_id_columns;
 static ID spg_id_encoding;
 
@@ -90,45 +94,40 @@ static VALUE spg_date(const char *s) {
 static VALUE spg_timestamp(const char *s) {
   VALUE dtc, dt, rtz;
   int tz = SPG_NO_TZ;
-  int year, month, day, hour, min, sec, usec, tokens, pos, utc_offset;
-  int check_offset = 0;
+  int year, month, day, hour, min, sec, usec, tokens, utc_offset;
+  int usec_start, usec_stop;
+  char offset_sign = 0;
   int offset_hour = 0;
   int offset_minute = 0;
   int offset_seconds = 0;
   double offset_fraction = 0.0;
-  char subsec[7];
 
   if (0 != strchr(s, '.')) {
-    tokens = sscanf(s, "%d-%2d-%2d %2d:%2d:%2d.%s%n", &year, &month, &day, &hour, &min, &sec, subsec, &pos);
-    if (tokens == 8) {
-      check_offset = 1;
-    }
-    if(tokens != 7) {
+    tokens = sscanf(s, "%d-%2d-%2d %2d:%2d:%2d.%n%d%n%c%02d:%02d", 
+	&year, &month, &day, &hour, &min, &sec,
+       	&usec_start, &usec, &usec_stop, 
+	&offset_sign, &offset_hour, &offset_minute);
+    if(tokens < 7) {
       rb_raise(rb_eArgError, "unexpected datetime format");
     }
-    usec = atoi(subsec);
-    usec *= (int) pow(10, (6 - strlen(subsec)));
+    usec *= (int) pow(10, (6 - (usec_stop - usec_start)));
   } else {
-    tokens = sscanf(s, "%d-%2d-%2d %2d:%2d:%2d%n", &year, &month, &day, &hour, &min, &sec, &pos);
+    tokens = sscanf(s, "%d-%2d-%2d %2d:%2d:%2d%c%02d:%02d", 
+	&year, &month, &day, &hour, &min, &sec,
+	&offset_sign, &offset_hour, &offset_minute);
     if (tokens == 3) {
       hour = 0;
       min = 0;
       sec = 0;
-    } else if (tokens == 7) {
-      check_offset = 1;
-    } else if (tokens != 6) {
+    } else if (tokens < 6) {
       rb_raise(rb_eArgError, "unexpected datetime format");
     }
     usec = 0;
   }
 
-  if (check_offset) {
-    if(sscanf(s + pos, "%3d:%2d", &offset_hour, &offset_minute) == 0) {
-      /* No offset found */
-      check_offset = 0;
-    } else if (s[pos] == '-') {
-      offset_minute *= -1;
-    }
+  if (offset_sign == '-') {
+    offset_hour *= -1;
+    offset_minute *= -1;
   }
 
   /* Get values of datetime_class, database_timezone, and application_timezone */
@@ -147,7 +146,7 @@ static VALUE spg_timestamp(const char *s) {
   }
 
   if (dtc == rb_cTime) {
-    if (check_offset) {
+    if (offset_sign) {
       /* Offset given, convert to local time if not already in local time.
        * While PostgreSQL generally returns timestamps in local time, it's unwise to rely on this.
        */
@@ -184,7 +183,7 @@ static VALUE spg_timestamp(const char *s) {
     }
   } else {
     /* datetime.class == DateTime */
-    if (check_offset) {
+    if (offset_sign) {
       /* Offset given, handle correct local time.
        * While PostgreSQL generally returns timestamps in local time, it's unwise to rely on this.
        */
@@ -235,6 +234,7 @@ static VALUE spg_fetch_rows_set_cols(VALUE self, VALUE ignore) {
 static VALUE spg_yield_hash_rows(VALUE self, VALUE rres, VALUE ignore) {
   PGresult *res;
   VALUE colsyms[SPG_MAX_FIELDS];
+  VALUE colconvert[SPG_MAX_FIELDS];
   long ntuples;
   long nfields;
   long i;
@@ -257,6 +257,33 @@ static VALUE spg_yield_hash_rows(VALUE self, VALUE rres, VALUE ignore) {
 
   for(j=0; j<nfields; j++) {
     colsyms[j] = rb_funcall(self, spg_id_output_identifier, 1, rb_str_new2(PQfname(res, j)));
+    i = PQftype(res, j);
+    switch (i) {
+      case 16:
+      case 17:
+      case 20:
+      case 21:
+      case 22:
+      case 23:
+      case 26:
+      case 700:
+      case 701:
+      case 790:
+      case 1700:
+      case 1082:
+      case 1083:
+      case 1266:
+      case 1114:
+      case 1184:
+      case 18:
+      case 25:
+      case 1043:
+        colconvert[j] = Qnil;
+        break;
+      default:
+        colconvert[j] = rb_funcall(spg_PG_TYPES, spg_id_get, 1, INT2NUM(i));
+        break;
+    }
   }
   rb_ivar_set(self, spg_id_columns, rb_ary_new4(nfields, colsyms));
 
@@ -303,11 +330,22 @@ static VALUE spg_yield_hash_rows(VALUE self, VALUE rres, VALUE ignore) {
           case 1184:
             rv = spg_timestamp(v);
             break;
+          case 18: /* char */
+          case 25: /* text */
+          case 1043: /* varchar*/
+            rv = rb_tainted_str_new(v, PQgetlength(res, i, j));
+#ifdef SPG_ENCODING
+            rb_enc_associate_index(rv, enc_index);
+#endif
+            break;
           default:
             rv = rb_tainted_str_new(v, PQgetlength(res, i, j));
 #ifdef SPG_ENCODING
             rb_enc_associate_index(rv, enc_index);
 #endif
+            if (colconvert[j] != Qnil) {
+              rv = rb_funcall(colconvert[j], spg_id_call, 1, rv); 
+            }
         }
       }
       rb_hash_aset(h, colsyms[j], rv);
@@ -319,7 +357,7 @@ static VALUE spg_yield_hash_rows(VALUE self, VALUE rres, VALUE ignore) {
 }
 
 void Init_sequel_pg(void) {
-  VALUE c;
+  VALUE c, spg_Postgres;
   ID cg;
   cg = rb_intern("const_get");
   spg_id_new = rb_intern("new");
@@ -337,6 +375,9 @@ void Init_sequel_pg(void) {
   spg_id_localtime = rb_intern("localtime");
   spg_id_new_offset = rb_intern("new_offset");
 
+  spg_id_call = rb_intern("call");
+  spg_id_get = rb_intern("[]");
+
   spg_id_columns = rb_intern("@columns");
   spg_id_encoding = rb_intern("@encoding");
 
@@ -347,13 +388,15 @@ void Init_sequel_pg(void) {
   spg_Blob = rb_funcall(rb_funcall(spg_Sequel, cg, 1, rb_str_new2("SQL")), cg, 1, rb_str_new2("Blob")); 
   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_PG_TYPES = rb_funcall(spg_Postgres, cg, 1, rb_str_new2("PG_TYPES"));
 
   rb_global_variable(&spg_Sequel);
   rb_global_variable(&spg_Blob);
   rb_global_variable(&spg_BigDecimal);
   rb_global_variable(&spg_Date);
 
-  c = rb_funcall(rb_funcall(spg_Sequel, cg, 1, rb_str_new2("Postgres")), cg, 1, rb_str_new2("Dataset"));
+  c = rb_funcall(spg_Postgres, cg, 1, rb_str_new2("Dataset"));
   rb_define_private_method(c, "yield_hash_rows", spg_yield_hash_rows, 2);
   rb_define_private_method(c, "fetch_rows_set_cols", spg_fetch_rows_set_cols, 1);
 }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sequel_pg
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-12 00:00:00 -07:00
+date: 2011-03-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,9 +64,9 @@ extensions:
 extra_rdoc_files: 
 - README.rdoc
 - CHANGELOG
-- LICENSE
+- MIT-LICENSE
 files: 
-- LICENSE
+- MIT-LICENSE
 - CHANGELOG
 - README.rdoc
 - Rakefile