ruby-postgres 0.7.1.2005.11.24-mswin32 → 0.7.1.2005.11.27-mswin32

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
+Lugovoi Nikolai <meadow.nnick@gmail.com>

data/Makefile

@@ -4,13 +4,13 @@ SHELL = /bin/sh
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = c:/mingwruby/lib/ruby/1.8/i386-mingw32
+topdir = c:/mingw/ruby/lib/ruby/1.8/i386-mingw32
 hdrdir = $(topdir)
 VPATH = $(srcdir);$(topdir);$(hdrdir)
 
 DESTDIR = c:
-prefix = $(DESTDIR)/mingwruby
-exec_prefix = $(DESTDIR)/mingwruby
+prefix = $(DESTDIR)/mingw/ruby
+exec_prefix = $(DESTDIR)/mingw/ruby
 sitedir = $(prefix)/lib/ruby/site_ruby
 rubylibdir = $(libdir)/ruby/$(ruby_version)
 archdir = $(rubylibdir)/$(arch)
@@ -20,7 +20,7 @@ includedir = $(prefix)/include
 infodir = $(prefix)/info
 sysconfdir = $(prefix)/etc
 mandir = $(prefix)/man
-libdir = $(DESTDIR)/mingwruby/lib
+libdir = $(DESTDIR)/mingw/ruby/lib
 sharedstatedir = $(prefix)/com
 oldincludedir = $(DESTDIR)/usr/include
 sitearchdir = $(sitelibdir)/$(sitearch)
@@ -48,7 +48,7 @@ RUBY_SO_NAME = msvcrt-ruby18
 arch = i386-mingw32
 sitearch = i386-msvcrt
 ruby_version = 1.8
-ruby = c:/mingwruby/bin/ruby
+ruby = c:/mingw/ruby/bin/ruby
 RUBY = $(ruby)
 RM = rm -f
 MAKEDIRS = mkdir -p

data/mkmf.log

@@ -1,6 +1,6 @@
 have_library: checking for main() in -lpq... -------------------- yes
 
-"gcc -o conftest -I. -Ic:/mingwruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingwruby/lib"      -lmsvcrt-ruby18-static -lpq  -lwsock32  "
+"gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingw/ruby/lib"      -lmsvcrt-ruby18-static -lpq  -lwsock32  "
 checked program was:
 /* begin */
 
@@ -13,7 +13,7 @@ int t() { main(); return 0; }
 
 have_header: checking for libpq-fe.h... -------------------- yes
 
-"gcc -E -I. -Ic:/mingwruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2   conftest.c -o conftest.i"
+"gcc -E -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2   conftest.c -o conftest.i"
 checked program was:
 /* begin */
 #include <libpq-fe.h>
@@ -23,7 +23,7 @@ checked program was:
 
 have_header: checking for libpq/libpq-fs.h... -------------------- yes
 
-"gcc -E -I. -Ic:/mingwruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2   conftest.c -o conftest.i"
+"gcc -E -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2   conftest.c -o conftest.i"
 checked program was:
 /* begin */
 #include <libpq/libpq-fs.h>
@@ -33,7 +33,7 @@ checked program was:
 
 have_library: checking for main() in -lcrypto... -------------------- no
 
-"gcc -o conftest -I. -Ic:/mingwruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingwruby/lib"     -lpq  -lmsvcrt-ruby18-static -lcrypto -lpq  -lwsock32  "
+"gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingw/ruby/lib"     -lpq  -lmsvcrt-ruby18-static -lcrypto -lpq  -lwsock32  "
 c:\mingw\bin\..\lib\gcc\mingw32\3.4.2\..\..\..\..\mingw32\bin\ld.exe: cannot find -lcrypto
 collect2: ld returned 1 exit status
 checked program was:
@@ -44,7 +44,7 @@ int main() { return 0; }
 int t() { main(); return 0; }
 /* end */
 
-"gcc -o conftest -I. -Ic:/mingwruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingwruby/lib"     -lpq  -lmsvcrt-ruby18-static -lcrypto -lpq  -lwsock32  "
+"gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingw/ruby/lib"     -lpq  -lmsvcrt-ruby18-static -lcrypto -lpq  -lwsock32  "
 c:\mingw\bin\..\lib\gcc\mingw32\3.4.2\..\..\..\..\mingw32\bin\ld.exe: cannot find -lcrypto
 collect2: ld returned 1 exit status
 checked program was:
@@ -61,7 +61,7 @@ int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
 
 have_library: checking for main() in -lssl... -------------------- no
 
-"gcc -o conftest -I. -Ic:/mingwruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingwruby/lib"     -lpq  -lmsvcrt-ruby18-static -lssl -lpq  -lwsock32  "
+"gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingw/ruby/lib"     -lpq  -lmsvcrt-ruby18-static -lssl -lpq  -lwsock32  "
 c:\mingw\bin\..\lib\gcc\mingw32\3.4.2\..\..\..\..\mingw32\bin\ld.exe: cannot find -lssl
 collect2: ld returned 1 exit status
 checked program was:
@@ -72,7 +72,7 @@ int main() { return 0; }
 int t() { main(); return 0; }
 /* end */
 
-"gcc -o conftest -I. -Ic:/mingwruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingwruby/lib"     -lpq  -lmsvcrt-ruby18-static -lssl -lpq  -lwsock32  "
+"gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingw/ruby/lib"     -lpq  -lmsvcrt-ruby18-static -lssl -lpq  -lwsock32  "
 c:\mingw\bin\..\lib\gcc\mingw32\3.4.2\..\..\..\..\mingw32\bin\ld.exe: cannot find -lssl
 collect2: ld returned 1 exit status
 checked program was:
@@ -89,7 +89,7 @@ int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
 
 have_func: checking for PQsetClientEncoding()... -------------------- yes
 
-"gcc -o conftest -I. -Ic:/mingwruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingwruby/lib"     -lpq  -lmsvcrt-ruby18-static -lpq  -lwsock32  "
+"gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingw/ruby/lib"     -lpq  -lmsvcrt-ruby18-static -lpq  -lwsock32  "
 checked program was:
 /* begin */
 
@@ -102,7 +102,7 @@ int t() { PQsetClientEncoding(); return 0; }
 
 have_func: checking for pg_encoding_to_char()... -------------------- yes
 
-"gcc -o conftest -I. -Ic:/mingwruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingwruby/lib"     -lpq  -lmsvcrt-ruby18-static -lpq  -lwsock32  "
+"gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingw/ruby/lib"     -lpq  -lmsvcrt-ruby18-static -lpq  -lwsock32  "
 checked program was:
 /* begin */
 
@@ -115,7 +115,7 @@ int t() { pg_encoding_to_char(); return 0; }
 
 have_func: checking for PQfreemem()... -------------------- yes
 
-"gcc -o conftest -I. -Ic:/mingwruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingwruby/lib"     -lpq  -lmsvcrt-ruby18-static -lpq  -lwsock32  "
+"gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingw/ruby/lib"     -lpq  -lmsvcrt-ruby18-static -lpq  -lwsock32  "
 checked program was:
 /* begin */
 
@@ -128,7 +128,7 @@ int t() { PQfreemem(); return 0; }
 
 have_func: checking for PQescapeString()... -------------------- yes
 
-"gcc -o conftest -I. -Ic:/mingwruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingwruby/lib"     -lpq  -lmsvcrt-ruby18-static -lpq  -lwsock32  "
+"gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingw/ruby/lib"     -lpq  -lmsvcrt-ruby18-static -lpq  -lwsock32  "
 checked program was:
 /* begin */
 
@@ -141,7 +141,7 @@ int t() { PQescapeString(); return 0; }
 
 have_func: checking for PQexecParams()... -------------------- yes
 
-"gcc -o conftest -I. -Ic:/mingwruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingwruby/lib"     -lpq  -lmsvcrt-ruby18-static -lpq  -lwsock32  "
+"gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingw/ruby/lib"     -lpq  -lmsvcrt-ruby18-static -lpq  -lwsock32  "
 checked program was:
 /* begin */
 

data/postgres.c

@@ -52,6 +52,8 @@ extern char* pg_encoding_to_char(int);
 
 #define rb_check_hash_type(x) rb_check_convert_type(x, T_HASH, "Hash", "to_hash")
 
+#define rb_define_singleton_alias(klass,new,old) rb_define_alias(rb_singleton_class(klass),new,old)
+
 #define Data_Set_Struct(obj,ptr) do { \
     Check_Type(obj, T_DATA); \
     DATA_PTR(obj) = ptr; \
@@ -75,9 +77,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,20 +174,27 @@ 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;
 }
 
 /*
- * See #new.
+ * call-seq:
+ *   PGconn.translate_results = boolean
+ *
+ * When true (default), results are translated to appropriate ruby class.
+ * When false, results are returned as +Strings+.
  */
 static VALUE
-pgconn_s_connect(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
+pgconn_s_translate_results_set(self, fact)
+    VALUE self, fact;
 {
-    return rb_class_new_instance(argc, argv, klass);
+    translate_results = (fact == Qfalse || fact == Qnil) ? 0 : 1;
+    return Qnil;
 }
 
 static VALUE format_array_element(VALUE obj);
@@ -223,7 +236,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()) {
@@ -266,15 +279,16 @@ format_array_element(obj)
  */
 static VALUE
 pgconn_s_quote(self, obj)
-    VALUE self;
-    VALUE obj;
+    VALUE self, obj;
 {
     char* quoted;
     int size;
     VALUE result;
 
     if (TYPE(obj) == T_STRING) {
-        quoted = ALLOCA_N(char, RSTRING(obj)->len * 2 + 1 + 2);
+        /* length * 2 because every char could require escaping */
+        /* + 2 for the quotes, + 1 for the null terminator */
+        quoted = ALLOCA_N(char, RSTRING(obj)->len * 2 + 2 + 1);
         size = PQescapeString(quoted + 1, RSTRING(obj)->ptr, RSTRING(obj)->len);
         *quoted = *(quoted + size + 1) = SINGLE_QUOTE;
         result = rb_str_new(quoted, size + 2);
@@ -373,43 +387,43 @@ pgconn_s_escape_bytea(self, obj)
  */
 static VALUE
 pgconn_s_unescape_bytea(self, obj)
-    VALUE self;
-    VALUE obj;
+    VALUE self, obj;
 {
     char *from, *to;
     size_t to_len;
     VALUE ret;
-    
+
     Check_Type(obj, T_STRING);
     from = StringValuePtr(obj);
-    
-    to = (char *)PQunescapeBytea(from, &to_len);
-    
+
+    to = (char *) PQunescapeBytea(from, &to_len);
+
     ret = rb_str_new(to, to_len);
     OBJ_INFECT(ret, obj);
-    
     PQfreemem(to);
-    
+
     return ret;
 }
 
-#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
 /*
+ * Document-method: new
+ *
  * call-seq:
- *     PGconn.connect(host,  port, options, tty, dbname, login, passwd)  =>  conn
- *     PGconn.open(   host,  port, options, tty, dbname, login, passwd)  =>  conn
- *     PGconn.new(    host,  port, options, tty, dbname, login, passwd)  =>  conn
- *  
- *  _host_::     server hostname (String)
- *  _port_::     server port number (Integer)
+ *     PGconn.open(connection_hash) -> PGconn
+ *     PGconn.open(connection_string) -> PGconn
+ *     PGconn.open(host, port, options, tty, dbname, login, passwd) ->  PGconn
+ *
+ *  _host_::     server hostname
+ *  _port_::     server port number
  *  _options_::  backend options (String)
  *  _tty_::      tty to print backend debug message <i>(ignored in newer versions of PostgreSQL)</i> (String)
- *  _dbname_::     connecting database name (String)
- *  _login_::      login user name (String)
- *  _passwd_::     login password (String)
+ *  _dbname_::     connecting database name
+ *  _login_::      login user name
+ *  _passwd_::     login password
  *  
  *  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 +436,6 @@ pgconn_s_new(argc, argv, klass)
 }
 #endif
 
-/*
- * See #new.
- */
 static VALUE
 pgconn_init(argc, argv, self)
     int argc;
@@ -441,13 +452,13 @@ 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;
 }
 
 /*
  * call-seq:
- *    conn.close()
+ *    conn.close
  *
  * Closes the backend connection.
  */
@@ -490,11 +501,13 @@ PGresult *PQexecParams_compat(PGconn *conn, VALUE command, VALUE values);
 
 /*
  * call-seq:
- *    conn.exec( sql )
+ *    conn.exec(sql, *bind_values)
  *
  * Sends SQL query request specified by _sql_ to the PostgreSQL.
  * Returns a PGresult instance on success.
  * On failure, it raises a PGError exception.
+ *
+ * +bind_values+ represents values for the PostgreSQL bind parameters found in the +sql+.  PostgreSQL bind parameters are presented as $1, $1, $2, etc.
  */
 static VALUE
 pgconn_exec(argc, argv, obj)
@@ -645,11 +658,13 @@ pgconn_async_exec(obj, str)
 
 /*
  * call-seq:
- *    conn.query( sql )
+ *    conn.query(sql, *bind_values)
  *
  * Sends SQL query request specified by _sql_ to the PostgreSQL.
  * Returns an Array as the resulting tuple on success.
  * On failure, it returns +nil+, and the error details can be obtained by #error.
+ *
+ * +bind_values+ represents values for the PostgreSQL bind parameters found in the +sql+.  PostgreSQL bind parameters are presented as $1, $1, $2, etc.
  */
 static VALUE
 pgconn_query(argc, argv, obj)
@@ -662,7 +677,7 @@ pgconn_query(argc, argv, obj)
 
 /*
  * call-seq:
- *    conn.async_query( sql )
+ *    conn.async_query(sql)
  *
  * Sends an asynchronous SQL query request specified by _sql_ to the PostgreSQL.
  * Returns an Array as the resulting tuple on success.
@@ -1057,6 +1072,12 @@ pgconn_transaction_status(obj)
 
 #ifdef HAVE_PQSETCLIENTENCODING
 
+/*
+ * call-seq:
+ *  conn.protocol_version -> Integer
+ *
+ * The 3.0 protocol will normally be used when communicating with PostgreSQL 7.4 or later servers; pre-7.4 servers support only protocol 2.0. (Protocol 1.0 is obsolete and not supported by libpq.)
+ */
 static VALUE
 pgconn_protocol_version(obj)
     VALUE obj;
@@ -1064,6 +1085,12 @@ pgconn_protocol_version(obj)
     return INT2NUM(PQprotocolVersion(get_pgconn(obj)));
 }
 
+/*
+ * call-seq:
+ *   conn.server_version -> Integer
+ *
+ * The number is formed by converting the major, minor, and revision numbers into two-decimal-digit numbers and appending them together. For example, version 7.4.2 will be returned as 70402, and version 8.1 will be returned as 80100 (leading zeroes are not shown). Zero is returned if the connection is bad.
+ */
 static VALUE
 pgconn_server_version(obj)
     VALUE obj;
@@ -1071,6 +1098,15 @@ pgconn_server_version(obj)
     return INT2NUM(PQserverVersion(get_pgconn(obj)));
 }
 
+/*
+ * call-seq:
+ *   conn.lastval -> Integer
+ *
+ * Returns the sequence value returned by the last call to the PostgreSQL function <tt>nextval(sequence_name)</tt>. Equivalent to <tt>conn.query('select lastval()').first.first</tt>.
+ *
+ * This functionality is only available with PostgreSQL 8.1 and newer.
+ * See the PostgreSQL documentation on lastval[http://www.postgresql.org/docs/current/interactive/functions-sequence.html] for more information.
+ */
 static VALUE
 pgconn_lastval(obj)
     VALUE obj;
@@ -1079,8 +1115,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));
 
@@ -1105,7 +1139,7 @@ pgconn_lastval(obj)
 
 /*
  * call-seq:
- *    conn.client_encoding() => String
+ *    conn.client_encoding() -> String
  * 
  * Returns the client encoding as a String.
  */
@@ -1146,11 +1180,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 +1195,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 +1216,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 */
@@ -1320,7 +1361,7 @@ pgresult_aref(argc, argv, obj)
  *
  * Returns an array of Strings representing the names of the fields in the result.
  *
- *   res=conn.exec("SELECT foo,bar AS biggles,jim,jam FROM mytable;")
+ *   res=conn.exec("SELECT foo,bar AS biggles,jim,jam FROM mytable")
  *   res.fields => [ 'foo' , 'biggles' , 'jim' , 'jam' ]
  */
 static VALUE
@@ -1382,7 +1423,7 @@ pgresult_num_fields(obj)
  *
  * Returns the name of the field (column) corresponding to the index.
  *
- *   res=conn.exec("SELECT foo,bar AS biggles,jim,jam FROM mytable;")
+ *   res=conn.exec("SELECT foo,bar AS biggles,jim,jam FROM mytable")
  *   puts res.fieldname(2) => 'jim'
  *   puts res.fieldname(1) => 'biggles'
  *
@@ -1410,7 +1451,7 @@ pgresult_fieldname(obj, index)
  *
  * Returns the index of the field specified by the string _name_.
  *
- *   res=conn.exec("SELECT foo,bar AS biggles,jim,jam FROM mytable;")
+ *   res=conn.exec("SELECT foo,bar AS biggles,jim,jam FROM mytable")
  *   puts res.fieldnum('foo') => 0
  *
  * Raises an ArgumentError if the specified _name_ isn't one of the field names;
@@ -1458,7 +1499,7 @@ pgresult_type(obj, index)
  *
  * Returns the size of the field type in bytes.  Returns <tt>-1</tt> if the field is variable sized.
  *
- *   res = conn.exec("SELECT myInt, myVarChar50 FROM foo;")
+ *   res = conn.exec("SELECT myInt, myVarChar50 FROM foo")
  *   res.size(0) => 4
  *   res.size(1) => -1
  */
@@ -1554,7 +1595,7 @@ pgresult_getlength(obj, tup_num, field_num)
 
 /*
  * call-seq:
- *    res.getisnull( tup_num, field_num ) => true or false
+ *    res.getisnull(tuple_position, field_position) -> boolean
  *
  * Returns +true+ if the specified value is +nil+; +false+ otherwise.
  *
@@ -1654,7 +1695,7 @@ pgresult_print(obj, file, opt)
  *
  * Returns the number of tuples (rows) affected by the SQL command.
  *
- * If the SQL command that generated the PGresult was not one of +INSERT+, +UPDATE+, +DELETE+, +MOVE+, or +FETCH+, or if no tuples (rows) were affected, +0+ is returned.
+ * If the SQL command that generated the PGresult was not one of +INSERT+, +UPDATE+, +DELETE+, +MOVE+, or +FETCH+, or if no tuples (rows) were affected, <tt>0</tt> is returned.
  */
 static VALUE
 pgresult_cmdtuples(obj)
@@ -1726,13 +1767,13 @@ 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;
 }
 
 /*
  * call-seq:
- *    conn.lo_import( file ) => pglarge
+ *    conn.lo_import(file) -> PGlarge
  *
  * Import a file to a large object. Returns a PGlarge instance on success. On failure, it raises a PGError exception.
  */
@@ -1780,7 +1821,7 @@ pgconn_loexport(obj, lo_oid,filename)
 
 /*
  * call-seq:
- *    conn.lo_create( [mode] ) => pglarge
+ *    conn.lo_create( [mode] ) -> PGlarge
  *
  * Returns a PGlarge instance on success. On failure, it raises PGError exception.
  * <i>(See #lo_open for information on _mode_.)</i>
@@ -1814,7 +1855,7 @@ pgconn_locreate(argc, argv, obj)
 
 /*
  * call-seq:
- *    conn.lo_open( oid, [mode] ) => pglarge
+ *    conn.lo_open( oid, [mode] ) -> PGlarge
  *
  * Open a large object of _oid_. Returns a PGlarge instance on success.
  * The _mode_ argument specifies the mode for the opened large object,
@@ -2181,6 +2222,12 @@ pgrow_init(self, keys)
     return self;
 }
 
+/*
+ * call-seq:
+ *   row.keys -> Array
+ *
+ * Column names.
+ */
 static VALUE
 pgrow_keys(self)
     VALUE self;
@@ -2188,6 +2235,10 @@ pgrow_keys(self)
     return rb_iv_get(self, "@keys");
 }
 
+/*
+ * call-seq:
+ *   row.values -> row
+ */
 static VALUE
 pgrow_values(self)
     VALUE self;
@@ -2195,6 +2246,13 @@ pgrow_values(self)
     return self;
 }
 
+/*
+ * call-seq:
+ *   row[position] -> value
+ *   row[name] -> value
+ *
+ * Access elements of this row by column position or name.
+ */
 static VALUE
 pgrow_aref(argc, argv, self)
     int argc;
@@ -2211,6 +2269,12 @@ pgrow_aref(argc, argv, self)
     }
 }
 
+/*
+ * call-seq:
+ *   row.each_value { |value| block } -> row
+ *
+ * Iterate with values.
+ */
 static VALUE
 pgrow_each_value(self)
     VALUE self;
@@ -2219,6 +2283,12 @@ pgrow_each_value(self)
     return self;
 }
 
+/*
+ * call-seq:
+ *   row.each_pair { |column_value_array| block } -> row
+ *
+ * Iterate with column,value pairs.
+ */
 static VALUE
 pgrow_each_pair(self)
     VALUE self;
@@ -2231,6 +2301,13 @@ pgrow_each_pair(self)
     return self;
 }
 
+/*
+ * call-seq:
+ *   row.each { |column, value| block } -> row
+ *   row.each { |value| block } -> row
+ *
+ * Iterate with values or column,value pairs.
+ */
 static VALUE
 pgrow_each(self)
     VALUE self;
@@ -2245,6 +2322,12 @@ pgrow_each(self)
     return self;
 }
 
+/*
+ * call-seq:
+ *   row.each_key { |column| block } -> row
+ *
+ * Iterate with column names.
+ */
 static VALUE
 pgrow_each_key(self)
     VALUE self;
@@ -2253,6 +2336,13 @@ pgrow_each_key(self)
     return self;
 }
 
+/*
+ * call-seq:
+ *   row.to_hash -> Hash
+ *
+ * Returns a +Hash+ of the row's values indexed by column name.
+ * Equivalent to <tt>Hash [*row.keys.zip(row).flatten]</tt>
+ */
 static VALUE
 pgrow_to_hash(self)
     VALUE self;
@@ -2273,12 +2363,11 @@ pgrow_to_hash(self)
  * Document-class: PGconn
  *
  * The class to access PostgreSQL database.
- * All other functionality of libpq save the large object to a file.
  *
  * For example, to send query to the database on the localhost:
- *    require "postgres"
- *    conn = PGconn.connect("localhost", 5432, "", "", "test1")
- *    res  = conn.exec("select * from a;")
+ *    require 'postgres'
+ *    conn = PGconn.open('dbname' => 'test1')
+ *    res  = conn.exec('select * from a')
  *
  * See the PGresult class for information on working with the results of a query.
  */
@@ -2295,6 +2384,13 @@ pgrow_to_hash(self)
  */
 
 
+/********************************************************************
+ * 
+ * Document-class: PGrow
+ *
+ * Array subclass that provides hash-like behavior.
+ */
+
 
 /********************************************************************
  * 
@@ -2329,14 +2425,17 @@ Init_postgres()
 #else
     rb_define_singleton_method(rb_cPGconn, "new", pgconn_s_new, -1);
 #endif  
-    rb_define_singleton_method(rb_cPGconn, "connect", pgconn_s_connect, -1);
-    rb_define_singleton_method(rb_cPGconn, "open", pgconn_s_connect, -1);
-    rb_define_singleton_method(rb_cPGconn, "setdb", pgconn_s_connect, -1);
-    rb_define_singleton_method(rb_cPGconn, "setdblogin", pgconn_s_connect, -1);
+    rb_define_singleton_alias(rb_cPGconn, "connect", "new");
+    rb_define_singleton_alias(rb_cPGconn, "open", "connect");
+    rb_define_singleton_alias(rb_cPGconn, "setdb", "connect");
+    rb_define_singleton_alias(rb_cPGconn, "setdblogin", "connect");
+    rb_define_singleton_alias(rb_cPGconn, "open", "connect");
     rb_define_singleton_method(rb_cPGconn, "escape", pgconn_s_escape, 1);
     rb_define_singleton_method(rb_cPGconn, "quote", pgconn_s_quote, 1);
+    rb_define_singleton_alias(rb_cPGconn, "format", "quote");
     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 +2467,8 @@ 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);
+    /* following line is for rdoc */
+    /* 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

@@ -1,35 +1,35 @@
-require 'rubygems'
-require 'date'
-
-SPEC = Gem::Specification.new do |s|
-  s.name              = 'ruby-postgres'
-  s.rubyforge_project = 'ruby-postgres'
-  s.version           = "0.7.1.#{Date.today}".tr('-', '.')
-  s.summary           = 'Ruby extension for PostgreSQL database coordination'
-  s.author            = 'Yukihiro Matsumoto, Eiji Matsumoto, Noboru Saitou, Dave Lee'
-  s.email             = 'davelee.com@gmail.com'
-  s.homepage          = 'http://ruby.scripting.ca/postgres/'
-  s.requirements      = 'PostgreSQL libpq library and headers'
-  s.has_rdoc          = true
-  s.require_path      = '.'
-  s.autorequire       = 'postgres'
-
-  if File.exists? 'postgres.so' and PLATFORM =~ /mingw|mswin/
-    s.platform        = Gem::Platform::WIN32
-  else
-    s.platform        = Gem::Platform::RUBY
-    s.extensions      = 'extconf.rb'
-  end
-
-  if File.exists? '_darcs'
-    s.files           = Dir.chdir('_darcs/current') { Dir['**/*'] }
-  else
-    s.files           = Dir['**/*']
-  end
-
-end
-
-if $0 == __FILE__
-  Gem::manage_gems
-  Gem::Builder.new(SPEC).build
-end
+require 'rubygems'
+require 'date'
+
+SPEC = Gem::Specification.new do |s|
+  s.name              = 'ruby-postgres'
+  s.rubyforge_project = 'ruby-postgres'
+  s.version           = "0.7.1.#{Date.today}".tr('-', '.')
+  s.summary           = 'Ruby extension for PostgreSQL database coordination'
+  s.author            = 'Yukihiro Matsumoto, Eiji Matsumoto, Noboru Saitou, Dave Lee'
+  s.email             = 'davelee.com@gmail.com'
+  s.homepage          = 'http://ruby.scripting.ca/postgres/'
+  s.requirements      = 'PostgreSQL libpq library and headers'
+  s.has_rdoc          = true
+  s.require_path      = '.'
+  s.autorequire       = 'postgres'
+
+  if File.exists? 'postgres.so' and PLATFORM =~ /mingw|mswin/
+    s.platform        = Gem::Platform::WIN32
+  else
+    s.platform        = Gem::Platform::RUBY
+    s.extensions      = 'extconf.rb'
+  end
+
+  if File.exists? '_darcs'
+    s.files           = Dir.chdir('_darcs/current') { Dir['**/*'] }
+  else
+    s.files           = Dir['**/*']
+  end
+
+end
+
+if $0 == __FILE__
+  Gem::manage_gems
+  Gem::Builder.new(SPEC).build
+end

data/tests/tc_postgres.rb

@@ -0,0 +1,52 @@
+require 'postgres'
+require 'date'
+require 'test/unit'
+
+class PostgresTestCase < Test::Unit::TestCase
+
+  def setup
+    @conn = PGconn.new('dbname' => 'template1')
+  end
+
+  def teardown
+    @conn.close
+  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.10
 specification_version: 1
 name: ruby-postgres
 version: !ruby/object:Gem::Version 
-  version: 0.7.1.2005.11.24
-date: 2005-11-24
+  version: 0.7.1.2005.11.27
+date: 2005-11-27
 summary: Ruby extension for PostgreSQL database coordination
 require_paths: 
   - "."
@@ -42,6 +42,7 @@ files:
   - README.ja
   - ruby-postgres.gemspec
   - sample
+  - tests
   - type-oids.h
   - doc/postgres.html
   - doc/postgres.jp.html
@@ -51,6 +52,7 @@ files:
   - sample/test1.rb
   - sample/test2.rb
   - sample/test4.rb
+  - tests/tc_postgres.rb
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []