ruby-postgres 0.7.1.2005.11.23 → 0.7.1.2005.11.24

data/postgres.c

@@ -15,6 +15,7 @@
 #include "ruby.h"
 #include "rubyio.h"
 #include "st.h"
+#include "intern.h"
 
 /* grep '^#define' $(pg_config --includedir)/server/catalog/pg_type.h | grep OID */
 #include "type-oids.h"
@@ -26,6 +27,8 @@
 
 #ifndef HAVE_PG_ENCODING_TO_CHAR
 #define pg_encoding_to_char(x) "SQL_ASCII"
+#else
+extern char* pg_encoding_to_char(int);
 #endif
 
 #ifndef HAVE_PQFREEMEM
@@ -64,6 +67,7 @@ EXTERN VALUE rb_cTime;
 
 static VALUE rb_cDate;
 static VALUE rb_cDateTime;
+static VALUE rb_cBigDecimal;
 
 static VALUE rb_cPGconn;
 static VALUE rb_cPGresult;
@@ -208,7 +212,6 @@ pgconn_s_format(self, obj)
     case T_ARRAY:
       result = rb_str_buf_new2("{");
       tainted = OBJ_TAINTED(obj);
-      i;
       for (i = 0; i < RARRAY(obj)->len; i++) {
           VALUE element = format_array_element(RARRAY(obj)->ptr[i]);
           if (OBJ_TAINTED(RARRAY(obj)->ptr[i])) tainted = Qtrue;
@@ -220,7 +223,10 @@ pgconn_s_format(self, obj)
       return result;
 
     default:
-      if (rb_block_given_p()) {
+      if (rb_class_of(obj) == rb_cBigDecimal) {
+          return rb_funcall(obj, rb_intern("to_s"), 1, rb_str_new2("F"));
+      }
+      else if (rb_block_given_p()) {
           return rb_yield(obj);
       } else {
           rb_raise(rb_ePGError, "can't format");
@@ -337,9 +343,7 @@ pgconn_s_escape_bytea(self, obj)
     VALUE self;
     VALUE obj;
 {
-    unsigned char c;
     char *from, *to;
-    long idx;
     size_t from_len, to_len;
     VALUE ret;
     
@@ -1138,6 +1142,17 @@ free_pgresult(ptr)
     PQclear(ptr);
 }
 
+#define VARHDRSZ 4
+#define SCALE_MASK 0xffff
+
+static int
+numeric_scale(typmod)
+    int typmod;
+{
+    if ((typmod -= VARHDRSZ) >= 0) return -1;
+    return typmod & SCALE_MASK;
+}
+
 #define PARSE(klass, string) rb_funcall(klass, rb_intern("parse"), 1, rb_tainted_str_new2(string));
 
 static VALUE
@@ -1157,19 +1172,22 @@ fetch_pgresult(result, row, column)
       return *string == 't' ? Qtrue : Qfalse;
 
     case BYTEAOID:
-      return pgconn_s_unescape_bytea(rb_tainted_str_new2(string));
+      return pgconn_s_unescape_bytea(NULL, rb_tainted_str_new2(string));
+
+    case NUMERICOID:
+      if (numeric_scale(PQfmod(result, column)) > 0) {
+          return rb_funcall(rb_cBigDecimal, rb_intern("new"), 1, rb_tainted_str_new2(string));
+      }
+      /* when scale == 0 return inum */
 
     case INT8OID:
     case INT4OID:
     case INT2OID:
       return rb_cstr2inum(string, 10);
 
-    case NUMERICOID:
-      return rb_funcall(rb_mKernel, rb_intern("BigDecimal"), 1, rb_tainted_str_new2(string));
-
     case FLOAT8OID:
     case FLOAT4OID:
-      return rb_float(rb_cstr_to_dbl(string, Qfalse));
+      return rb_float_new(rb_cstr_to_dbl(string, Qfalse));
 
     case DATEOID:
       return PARSE(rb_cDate, string);
@@ -2198,6 +2216,7 @@ pgrow_each_value(self)
     VALUE self;
 {
     rb_ary_each(self);
+    return self;
 }
 
 static VALUE
@@ -2231,6 +2250,7 @@ pgrow_each_key(self)
     VALUE self;
 {
     rb_ary_each(pgrow_keys(self));
+    return self;
 }
 
 static VALUE
@@ -2297,6 +2317,7 @@ Init_postgres()
     rb_require("bigdecimal");
     rb_require("date");
     rb_require("time");
+    rb_cBigDecimal = RUBY_CLASS("BigDecimal");
     rb_cDate = RUBY_CLASS("Date");
     rb_cDateTime = RUBY_CLASS("DateTime");
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ruby-postgres
 version: !ruby/object:Gem::Version 
-  version: 0.7.1.2005.11.23
-date: 2005-11-23 00:00:00 -06:00
+  version: 0.7.1.2005.11.24
+date: 2005-11-24 00:00:00 -06:00
 summary: Ruby extension for PostgreSQL database coordination
 require_paths: 
 - .