ruby-postgres 0.7.1.2005.11.27-mswin32 → 0.7.1.2005.12.19-mswin32

data/postgres.c

@@ -78,7 +78,8 @@ static VALUE rb_cPGlarge;
 static VALUE rb_cPGrow;
 
 static VALUE pgconn_lastval _((VALUE));
-
+static VALUE pgresult_fields _((VALUE));
+static VALUE pgresult_clear _((VALUE));
 static VALUE pgresult_result_with_clear _((VALUE));
 static VALUE pgresult_new _((PGresult*));
 
@@ -252,8 +253,8 @@ format_array_element(obj)
     VALUE obj;
 {
     if (TYPE(obj) == T_STRING) {
-        obj = rb_funcall(obj, rb_intern("gsub"), 2, rb_reg_new("(?=[\\\\\"])", 9, 0), "\\");
-        return rb_funcall(obj, rb_intern("gsub!"), 2, rb_reg_new("^|$", 3, 0), "\"");
+        obj = rb_funcall(obj, rb_intern("gsub"), 2, rb_reg_new("(?=[\\\\\"])", 9, 0), rb_str_new2("\\"));
+        return rb_funcall(obj, rb_intern("gsub!"), 2, rb_reg_new("^|$", 3, 0), rb_str_new2("\""));
     }
     else {
         return pgconn_s_format(NULL, obj);
@@ -546,7 +547,7 @@ pgconn_exec(argc, argv, obj)
         result = PQexecParams(conn, StringValuePtr(command), len, NULL, values, NULL, NULL, 0);
 #else
         for (i = 0; i < len; i++) {
-            rb_ary_store(params, i, pgconn_s_quote(NULL, rb_ary_entry(params, i)));
+            rb_ary_push(params, pgconn_s_quote(NULL, rb_ary_entry(params, i)));
         }
         result = PQexecParams_compat(conn, command, params);
 #endif
@@ -1277,6 +1278,86 @@ pgresult_status(obj)
  * Returns an array of tuples (rows, which are themselves arrays) that represent the query result.
  */
 
+static VALUE
+fetch_pgrow(self, fields, row_num)
+    VALUE self, fields;
+    int row_num;
+{
+    PGresult *result = get_pgresult(self);
+    VALUE row = rb_funcall(rb_cPGrow, rb_intern("new"), 1, fields);
+    int field_num;
+    for (field_num = 0; field_num < RARRAY(fields)->len; field_num++) {
+        rb_ary_push(row, fetch_pgresult(result, row_num, field_num));
+    }
+    return row;
+}
+
+/*
+ * call-seq:
+ *   conn.select_one(query, *bind_values)
+ *
+ * Return the first row of the query results.
+ * Equivalent to conn.query(query, *bind_values).first
+ */
+static VALUE
+pgconn_select_one(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE result = pgconn_exec(argc, argv, self);
+    VALUE row = fetch_pgrow(result, pgresult_fields(self), 0);
+    pgresult_clear(result);
+    return row;
+}
+
+/*
+ * call-seq:
+ *   conn.select_value(query, *bind_values)
+ *
+ * Return the first value of the first row of the query results.
+ * Equivalent to conn.query(query, *bind_values).first.first
+ */
+static VALUE
+pgconn_select_value(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    PGresult *result = get_pgresult(pgconn_exec(argc, argv, self));
+    VALUE value = fetch_pgresult(result, 0, 0);
+    PQclear(result);
+    return value;
+}
+
+/*
+ * call-seq:
+ *   conn.select_values(query, *bind_values)
+ *
+ * Equivalent to conn.query(query, *bind_values).flatten
+ */
+static VALUE
+pgconn_select_values(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    PGresult *result = get_pgresult(pgconn_exec(argc, argv, self));
+    int ntuples = PQntuples(result);
+    int nfields = PQnfields(result);
+
+    VALUE values = rb_ary_new2(ntuples * nfields);
+    int row_num, field_num;
+    for (row_num = 0; row_num < ntuples; row_num++) {
+      for (field_num = 0; field_num < nfields; field_num++) {
+        rb_ary_push(values, fetch_pgresult(result, row_num, field_num));
+      }
+    }
+
+    PQclear(result);
+    return values;
+}
+
 /*
  * call-seq:
  *    res.each{ |tuple| ... }
@@ -1289,21 +1370,13 @@ static VALUE
 pgresult_each(self)
     VALUE self;
 {
-    int i, j;
-
     PGresult *result = get_pgresult(self);
-    int nt = PQntuples(result);
-    int nf = PQnfields(result);
-    VALUE fields[1] = { rb_ary_new2(nf) };
-
-    for (i = 0; i < nf; i++)
-        rb_ary_push(fields[0], rb_tainted_str_new2(PQfname(result, i)));
+    int row_count = PQntuples(result);
+    VALUE fields = pgresult_fields(self);
 
-    for (i=0; i<nt; i++) {
-        VALUE row = rb_funcall2(rb_cPGrow, rb_intern("new"), 1, fields);
-        for (j=0; j<nf; j++) {
-            rb_ary_store(row, j, fetch_pgresult(result, i, j));
-        }
+    int row_num;
+    for (row_num = 0; row_num < row_count; row_num++) {
+        VALUE row = fetch_pgrow(self, fields, row_num);
         rb_yield(row);
     }
 
@@ -2261,8 +2334,13 @@ pgrow_aref(argc, argv, self)
 {
     if (TYPE(argv[0]) == T_STRING) {
         VALUE keys = pgrow_keys(self);
-        int index = NUM2INT(rb_funcall(keys, rb_intern("index"), 1, argv[0]));
-        return rb_ary_entry(self, index);
+        VALUE index = rb_funcall(keys, rb_intern("index"), 1, argv[0]);
+        if (index == Qnil) {
+            rb_raise(rb_ePGError, "%s: field not found", StringValuePtr(argv[0]));
+        }
+        else {
+            return rb_ary_entry(self, NUM2INT(index));
+        }
     }
     else {
         return rb_call_super(argc, argv);
@@ -2418,6 +2496,7 @@ Init_postgres()
     rb_cDateTime = RUBY_CLASS("DateTime");
 
     rb_ePGError = rb_define_class("PGError", rb_eStandardError);
+    rb_define_alias(rb_ePGError, "error", "message");
 
     rb_cPGconn = rb_define_class("PGconn", rb_cObject);
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
@@ -2456,6 +2535,9 @@ Init_postgres()
     rb_define_method(rb_cPGconn, "untrace", pgconn_untrace, 0);
     rb_define_method(rb_cPGconn, "exec", pgconn_exec, -1);
     rb_define_method(rb_cPGconn, "query", pgconn_query, -1);
+    rb_define_method(rb_cPGconn, "select_one", pgconn_select_one, -1);
+    rb_define_method(rb_cPGconn, "select_value", pgconn_select_value, -1);
+    rb_define_method(rb_cPGconn, "select_values", pgconn_select_values, -1);
     rb_define_method(rb_cPGconn, "async_exec", pgconn_async_exec, 1);
     rb_define_method(rb_cPGconn, "async_query", pgconn_async_query, 1);
     rb_define_method(rb_cPGconn, "get_notify", pgconn_get_notify, 0);

data/tests/tc_postgres.rb

@@ -1,5 +1,4 @@
 require 'postgres'
-require 'date'
 require 'test/unit'
 
 class PostgresTestCase < Test::Unit::TestCase
@@ -16,33 +15,26 @@ class PostgresTestCase < Test::Unit::TestCase
     query = <<-EOT
 select true as true_value,
        false as false_value,
-       '12345\\\\111\\\\000\\\\111TEST'::bytea as bytea_value,
+       $1::bytea as bytea_value,
        '2005-11-30'::date as date_value,
        '12:00:00'::time as time_value,
-       now() as date_time_value,
+       '2005-11-30 12:00:00'::timestamp 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)
+    res = @conn.exec(query, '12345\111\000\111TEST')
     assert_equal(res.num_tuples, 1)
     assert_equal(res.num_fields, 10)
-    tuple = res.result[0]
-    puts tuple
+    tuple = res.result.first
     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("12345I\000ITEST", 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(Time.parse('12:00:00'), tuple['time_value'])
+    assert_equal(DateTime.parse('2005-11-30 12:00:00'), 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'])

metadata

@@ -1,13 +1,13 @@
---- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10
+!ruby/object:Gem::Specification 
+rubygems_version: 0.8.11
 specification_version: 1
 name: ruby-postgres
 version: !ruby/object:Gem::Version 
-  version: 0.7.1.2005.11.27
-date: 2005-11-27
+  version: 0.7.1.2005.12.19
+date: 2005-12-19 00:00:00 -07:00
 summary: Ruby extension for PostgreSQL database coordination
 require_paths: 
-  - "."
+- .
 email: davelee.com@gmail.com
 homepage: http://ruby.scripting.ca/postgres/
 rubyforge_project: ruby-postgres
@@ -18,46 +18,54 @@ bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: mswin32
+signing_key: 
+cert_chain: 
 authors: 
-  - "Yukihiro Matsumoto, Eiji Matsumoto, Noboru Saitou, Dave Lee"
+- Yukihiro Matsumoto, Eiji Matsumoto, Noboru Saitou, Dave Lee
 files: 
-  - ChangeLog
-  - Contributors
-  - doc
-  - extconf.rb
-  - libpq-compat.c
-  - Makefile
-  - MANIFEST
-  - mkmf.log
-  - postgres.c
-  - postgres.o
-  - postgres.so
-  - README
-  - README.ja
-  - ruby-postgres.gemspec
-  - sample
-  - tests
-  - type-oids.h
-  - doc/postgres.html
-  - doc/postgres.jp.html
-  - sample/losample.rb
-  - sample/psql.rb
-  - sample/psqlHelp.rb
-  - sample/test1.rb
-  - sample/test2.rb
-  - sample/test4.rb
-  - tests/tc_postgres.rb
+- ChangeLog
+- Contributors
+- doc
+- extconf.rb
+- libpq-compat.c
+- Makefile
+- MANIFEST
+- mkmf.log
+- postgres.c
+- postgres.o
+- postgres.so
+- README
+- README.ja
+- ruby-postgres-0.7.1.2005.12.19.gem
+- ruby-postgres.gemspec
+- sample
+- tests
+- type-oids.h
+- doc/postgres.html
+- doc/postgres.jp.html
+- sample/losample.rb
+- sample/psql.rb
+- sample/psqlHelp.rb
+- sample/test1.rb
+- sample/test2.rb
+- sample/test4.rb
+- tests/tc_postgres.rb
 test_files: []
+
 rdoc_options: []
+
 extra_rdoc_files: []
+
 executables: []
+
 extensions: []
+
 requirements: 
-  - PostgreSQL libpq library and headers
-dependencies: []
+- PostgreSQL libpq library and headers
+dependencies: []
+