ruby-postgres 0.7.1.2005.11.24 → 0.7.1.2005.11.26

data/Contributors

@@ -23,4 +23,4 @@ shibata <kshibata@vesta.ocn.ne.jp>
 <greentea@fa2.so-net.ne.jp>
 ts <decoux@moulon.inra.fr>
 Yuta TSUBOI <yuuta-t@is.aist-nara.ac.jp>
-meadow.nnick@gmail.com
+<meadow.nnick@gmail.com>

data/postgres.c

@@ -75,9 +75,13 @@ static VALUE rb_ePGError;
 static VALUE rb_cPGlarge; 
 static VALUE rb_cPGrow;
 
+static VALUE pgconn_lastval _((VALUE));
+
 static VALUE pgresult_result_with_clear _((VALUE));
 static VALUE pgresult_new _((PGresult*));
 
+static int translate_results = 1;
+
 /* Large Object support */
 typedef struct pglarge_object
 {
@@ -168,10 +172,22 @@ pgconn_connect(argc, argv, self)
         rb_raise(rb_ePGError, StringValuePtr(message));
     }
 
+    if (PQserverVersion(conn) >= 80100) {
+        rb_define_singleton_method(self, "lastval", pgconn_lastval, 0);
+    }
+
     Data_Set_Struct(self, conn);
     return self;
 }
 
+static VALUE
+pgconn_s_translate_results_set(self, fact)
+    VALUE self, fact;
+{
+    translate_results = (fact == Qfalse || fact == Qnil) ? 0 : 1;
+    return Qnil;
+}
+
 /*
  * See #new.
  */
@@ -223,7 +239,7 @@ pgconn_s_format(self, obj)
       return result;
 
     default:
-      if (rb_class_of(obj) == rb_cBigDecimal) {
+      if (CLASS_OF(obj) == rb_cBigDecimal) {
           return rb_funcall(obj, rb_intern("to_s"), 1, rb_str_new2("F"));
       }
       else if (rb_block_given_p()) {
@@ -393,7 +409,6 @@ pgconn_s_unescape_bytea(self, obj)
     return ret;
 }
 
-#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
 /*
  * call-seq:
  *     PGconn.connect(host,  port, options, tty, dbname, login, passwd)  =>  conn
@@ -410,6 +425,7 @@ pgconn_s_unescape_bytea(self, obj)
  *  
  *  On failure, it raises a PGError exception.
  */
+#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
 static VALUE
 pgconn_s_new(argc, argv, klass)
     int argc;
@@ -422,9 +438,6 @@ pgconn_s_new(argc, argv, klass)
 }
 #endif
 
-/*
- * See #new.
- */
 static VALUE
 pgconn_init(argc, argv, self)
     int argc;
@@ -441,7 +454,7 @@ get_pgconn(obj)
     PGconn *conn;
 
     Data_Get_Struct(obj, PGconn, conn);
-    if (conn == 0) rb_raise(rb_ePGError, "closed connection");
+    if (conn == NULL) rb_raise(rb_ePGError, "closed connection");
     return conn;
 }
 
@@ -1079,8 +1092,6 @@ pgconn_lastval(obj)
     PGresult *result;
     VALUE lastval, error;
 
-    if (PQserverVersion(conn) < 80100) return Qnil;
-
     result = PQexec(conn, "select lastval()");
     if (!result) rb_raise(rb_ePGError, PQerrorMessage(conn));
 
@@ -1146,11 +1157,11 @@ free_pgresult(ptr)
 #define SCALE_MASK 0xffff
 
 static int
-numeric_scale(typmod)
+has_numeric_scale(typmod)
     int typmod;
 {
-    if ((typmod -= VARHDRSZ) >= 0) return -1;
-    return typmod & SCALE_MASK;
+    if (typmod == -1) return 1;
+    return (typmod - VARHDRSZ) & SCALE_MASK;
 }
 
 #define PARSE(klass, string) rb_funcall(klass, rb_intern("parse"), 1, rb_tainted_str_new2(string));
@@ -1161,11 +1172,18 @@ fetch_pgresult(result, row, column)
     int row;
     int column;
 {
+    char* string;
+
     if (PQgetisnull(result, row, column)) {
         return Qnil;
     }
 
-    char* string = PQgetvalue(result, row, column);
+    string = PQgetvalue(result, row, column);
+
+    if (!translate_results) {
+        return rb_tainted_str_new2(string);
+    }
+
     switch (PQftype(result, column)) {
 
     case BOOLOID:
@@ -1175,7 +1193,7 @@ fetch_pgresult(result, row, column)
       return pgconn_s_unescape_bytea(NULL, rb_tainted_str_new2(string));
 
     case NUMERICOID:
-      if (numeric_scale(PQfmod(result, column)) > 0) {
+      if (has_numeric_scale(PQfmod(result, column))) {
           return rb_funcall(rb_cBigDecimal, rb_intern("new"), 1, rb_tainted_str_new2(string));
       }
       /* when scale == 0 return inum */
@@ -1726,7 +1744,7 @@ get_pglarge(obj)
 {
     PGlarge *pglarge;
     Data_Get_Struct(obj, PGlarge, pglarge);
-    if (pglarge == 0) rb_raise(rb_ePGError, "invalid large object");
+    if (pglarge == NULL) rb_raise(rb_ePGError, "invalid large object");
     return pglarge;
 }
 
@@ -2337,6 +2355,7 @@ Init_postgres()
     rb_define_singleton_method(rb_cPGconn, "quote", pgconn_s_quote, 1);
     rb_define_singleton_method(rb_cPGconn, "escape_bytea", pgconn_s_escape_bytea, 1);
     rb_define_singleton_method(rb_cPGconn, "unescape_bytea", pgconn_s_unescape_bytea, 1);
+    rb_define_singleton_method(rb_cPGconn, "translate_results=", pgconn_s_translate_results_set, 1);
 
     rb_define_const(rb_cPGconn, "CONNECTION_OK", INT2FIX(CONNECTION_OK));
     rb_define_const(rb_cPGconn, "CONNECTION_BAD", INT2FIX(CONNECTION_BAD));
@@ -2368,7 +2387,6 @@ Init_postgres()
     rb_define_method(rb_cPGconn, "transaction_status", pgconn_transaction_status, 0);
     rb_define_method(rb_cPGconn, "protocol_version", pgconn_protocol_version, 0);
     rb_define_method(rb_cPGconn, "server_version", pgconn_server_version, 0);
-    rb_define_method(rb_cPGconn, "lastval", pgconn_lastval, 0);
 
 #ifdef HAVE_PQSETCLIENTENCODING
     rb_define_method(rb_cPGconn, "client_encoding", pgconn_client_encoding, 0);

data/ruby-postgres.gemspec

@@ -14,7 +14,7 @@ SPEC = Gem::Specification.new do |s|
   s.require_path      = '.'
   s.autorequire       = 'postgres'
 
-  if File.exists? 'postgres.so' and PLATFORM =~ /mingw/
+  if File.exists? 'postgres.so' and PLATFORM =~ /mingw|mswin/
     s.platform        = Gem::Platform::WIN32
   else
     s.platform        = Gem::Platform::RUBY

data/test.rb

@@ -0,0 +1,45 @@
+require 'postgres'
+require 'date'
+require 'test/unit'
+class TC_MyTest < Test::Unit::TestCase
+  def setup
+    @conn = PGconn.new('dbname' => 'template1')
+  end
+
+  def test_conversion
+    query = <<-EOT
+select true as true_value,
+       false as false_value,
+       '12345\\\\111\\\\000\\\\111TEST'::bytea as bytea_value,
+       '2005-11-30'::date as date_value,
+       '12:00:00'::time as time_value,
+       now() as date_time_value,
+       1.5::float as float_value,
+       12345.5678::numeric as numeric_value,
+       1234.56::numeric(10) as numeric_10_value,
+       12345.12345::numeric(10,5) as numeric_10_5_value
+EOT
+    res = @conn.exec(query)
+    assert_equal(res.num_tuples, 1)
+    assert_equal(res.num_fields, 10)
+    tuple = res.result[0]
+    puts tuple
+    assert_equal(true, tuple['true_value'])
+    assert_equal(false, tuple['false_value'])
+    assert_equal("12345\111\000\111TEST", tuple['bytea_value'])
+    puts PGconn.escape_bytea(tuple['bytea_value'])
+    assert_equal("12345I\\\\000ITEST", PGconn.escape_bytea(tuple['bytea_value']))
+    assert_equal(Date.parse('2005-11-30'), tuple['date_value'])
+    puts tuple['date_value']
+    assert_kind_of(Time, tuple['time_value'])
+    puts tuple['time_value']
+    assert_kind_of(DateTime, tuple['date_time_value'])
+    puts tuple['date_time_value']
+    assert_equal(1.5, tuple['float_value'])
+    puts PGconn.quote(tuple['numeric_value'])
+    assert_equal(BigDecimal("12345.5678"), tuple['numeric_value'])
+    assert_equal(1235, tuple['numeric_10_value'])
+    assert_kind_of(Integer, tuple['numeric_10_value'])
+    assert_equal(BigDecimal("12345.12345"), tuple['numeric_10_5_value'])
+  end
+end

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.24
-date: 2005-11-24 00:00:00 -06:00
+  version: 0.7.1.2005.11.26
+date: 2005-11-26 00:00:00 -06:00
 summary: Ruby extension for PostgreSQL database coordination
 require_paths: 
 - .
@@ -30,6 +30,7 @@ authors:
 files: 
 - sample
 - Contributors
+- test.rb
 - ruby-postgres.gemspec
 - ChangeLog
 - libpq-compat.c