ruby-postgres 0.7.1.2006.04.05-mswin32 → 0.7.1.2006.04.06-mswin32

data/extconf.rb

@@ -19,7 +19,7 @@ end
 
 dir_config('pgsql', config_value('include'), config_value('lib'))
 
-required_libraries = %w(crypto ssl)
+required_libraries = []
 desired_functions = %w(PQsetClientEncoding pg_encoding_to_char PQfreemem)
 compat_functions = %w(PQescapeString PQexecParams)
 

data/mkmf.log

@@ -31,62 +31,6 @@ checked program was:
 
 --------------------
 
-have_library: checking for main() in -lcrypto... -------------------- no
-
-"gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -O2 -pipe  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:
-/* begin */
-
-/*top*/
-int main() { return 0; }
-int t() { main(); return 0; }
-/* end */
-
-"gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -O2 -pipe  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:
-/* begin */
-#include <windows.h>
-#include <winsock.h>
-
-/*top*/
-int main() { return 0; }
-int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
-/* end */
-
---------------------
-
-have_library: checking for main() in -lssl... -------------------- no
-
-"gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -O2 -pipe  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:
-/* begin */
-
-/*top*/
-int main() { return 0; }
-int t() { main(); return 0; }
-/* end */
-
-"gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -O2 -pipe  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:
-/* begin */
-#include <windows.h>
-#include <winsock.h>
-
-/*top*/
-int main() { return 0; }
-int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
-/* end */
-
---------------------
-
 have_func: checking for PQsetClientEncoding()... -------------------- yes
 
 "gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -O2 -pipe  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingw/ruby/lib"     -lpq  -lmsvcrt-ruby18-static -lpq  -lwsock32  "

data/postgres.c

@@ -78,6 +78,7 @@ static VALUE rb_cPGlarge;
 static VALUE rb_cPGrow;
 
 static VALUE pgconn_lastval _((VALUE));
+static VALUE pgconn_close _((VALUE));
 static VALUE pgresult_fields _((VALUE));
 static VALUE pgresult_clear _((VALUE));
 static VALUE pgresult_result_with_clear _((VALUE));
@@ -307,7 +308,7 @@ build_key_value_string_i(key, value, result)
 {
     VALUE key_value;
     if (key == Qundef) return ST_CONTINUE;
-    key_value = rb_str_dup(key);
+    key_value = (TYPE(key) == T_STRING ? rb_str_dup(key) : rb_obj_as_string(key));
     rb_str_cat(key_value, "=", 1);
     rb_str_concat(key_value, pgconn_s_quote(rb_cPGconn, value));
     rb_ary_push(result, key_value);
@@ -443,7 +444,11 @@ pgconn_init(argc, argv, self)
     VALUE *argv;
     VALUE self;
 {
-    return pgconn_connect(argc, argv, self);
+    pgconn_connect(argc, argv, self);
+    if (rb_block_given_p()) {
+        return rb_ensure(rb_yield, self, pgconn_close, self);
+    }
+    return self;
 }
 
 static PGconn*
@@ -464,11 +469,11 @@ get_pgconn(obj)
  * Closes the backend connection.
  */
 static VALUE
-pgconn_close(obj)
-    VALUE obj;
+pgconn_close(self)
+    VALUE self;
 {
-    PQfinish(get_pgconn(obj));
-    DATA_PTR(obj) = NULL;
+    PQfinish(get_pgconn(self));
+    DATA_PTR(self) = NULL;
     return Qnil;
 }
 
@@ -500,6 +505,42 @@ get_pgresult(obj)
 PGresult *PQexecParams_compat(PGconn *conn, VALUE command, VALUE values);
 #endif
 
+#define TEXT_FORMAT 0
+#define BINARY_FORMAT 1
+
+void
+translate_to_pg(VALUE value, char const** result, int* length, int* format)
+{
+    switch (TYPE(value)) {
+    case T_NIL:
+      *result = NULL;
+      *length = 0;
+      *format = BINARY_FORMAT;
+      return;
+    case T_TRUE:
+      *result = "\1";
+      *length = 1;
+      *format = BINARY_FORMAT;
+      return;
+    case T_FALSE:
+      *result = "\0";
+      *length = 1;
+      *format = BINARY_FORMAT;
+      return;
+    case T_STRING:
+      *result = StringValuePtr(value);
+      *length = RSTRING(value)->len;
+      *format = BINARY_FORMAT;
+      return;
+    default:  {
+        VALUE formatted = pgconn_s_format(rb_cPGconn, value);
+        *result = StringValuePtr(formatted);
+        *length = RSTRING(formatted)->len;
+        *format = TEXT_FORMAT;
+      }
+    }
+}
+
 /*
  * call-seq:
  *    conn.exec(sql, *bind_values)
@@ -533,18 +574,13 @@ pgconn_exec(argc, argv, obj)
         int i;
 #ifdef HAVE_PQEXECPARAMS
         VALUE* ptr = RARRAY(params)->ptr;
-        const char ** values = ALLOCA_N(const char *, len);
-        VALUE formatted;
+        char const** values = ALLOCA_N(char const*, len);
+        int* lengths = ALLOCA_N(int, len);
+        int* formats = ALLOCA_N(int, len);
         for (i = 0; i < len; i++, ptr++) {
-            if (*ptr == Qnil) {
-                values[i] = NULL;
-            }
-            else {
-                formatted = pgconn_s_format(rb_cPGconn, *ptr);
-                values[i] = StringValuePtr(formatted);
-            }
+            translate_to_pg(*ptr, values+i, lengths+i, formats+i);
         }
-        result = PQexecParams(conn, StringValuePtr(command), len, NULL, values, NULL, NULL, 0);
+        result = PQexecParams(conn, StringValuePtr(command), len, NULL, values, lengths, formats, 0);
 #else
         for (i = 0; i < len; i++) {
             rb_ary_store(params, i, pgconn_s_quote(rb_cPGconn, rb_ary_entry(params, i)));
@@ -562,8 +598,15 @@ pgconn_exec(argc, argv, obj)
     case PGRES_COPY_OUT:
     case PGRES_COPY_IN:
     case PGRES_EMPTY_QUERY:
-    case PGRES_COMMAND_OK:      /* no data will be received */
-      return pgresult_new(result);
+    case PGRES_COMMAND_OK: {
+      VALUE pg_result = pgresult_new(result);
+      if (rb_block_given_p()) {
+          return rb_ensure(rb_yield, pg_result, pgresult_clear, pg_result);
+      }
+      else {
+          return pg_result;
+      }
+    }
 
     case PGRES_BAD_RESPONSE:
     case PGRES_FATAL_ERROR:
@@ -2509,7 +2552,6 @@ Init_postgres()
     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");

data/ruby-postgres.gemspec

@@ -6,7 +6,7 @@ SPEC = Gem::Specification.new do |s|
   s.rubyforge_project = 'ruby-postgres'
   s.version           = "0.7.1.#{Date.today}".tr('-', '.')
   s.summary           = 'Ruby extension library providing an API to PostgreSQL'
-  s.author            = 'Yukihiro Matsumoto, Eiji Matsumoto, Noboru Saitou, Dave Lee'
+  s.authors           = ['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'

data/tests/tc_postgres.rb

@@ -24,13 +24,13 @@ select true as true_value,
        1234.56::numeric(10) as numeric_10_value,
        12345.12345::numeric(10,5) as numeric_10_5_value
 EOT
-    res = @conn.exec(query, '12345\111\000\111TEST')
-    assert_equal(res.num_tuples, 1)
-    assert_equal(res.num_fields, 10)
+    res = @conn.exec(query, "12345\0TEST")
+    assert_equal(1, res.num_tuples, 1)
+    assert_equal(10, res.num_fields, 10)
     tuple = res.result.first
     assert_equal(true, tuple['true_value'])
     assert_equal(false, tuple['false_value'])
-    assert_equal("12345I\000ITEST", tuple['bytea_value'])
+    assert_equal("12345\0TEST", tuple['bytea_value'])
     assert_equal(Date.parse('2005-11-30'), tuple['date_value'])
     assert_equal(Time.parse('12:00:00'), tuple['time_value'])
     assert_equal(Time.parse('2005-11-30 12:00:00'), tuple['date_time_value'])

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.2006.04.05
-date: 2006-04-05 00:00:00 -06:00
+  version: 0.7.1.2006.04.06
+date: 2006-04-06 00:00:00 -06:00
 summary: Ruby extension library providing an API to PostgreSQL
 require_paths: 
 - .
@@ -26,7 +26,10 @@ 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