swift-db-postgres 0.2.0 → 0.2.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.2.1 (2012-07-30)
+
+* rb_protect yielding result tuples.
+
 == 0.2.0 (2012-07-29)
 
 * Added Adapter#native_bind_format and Adapter#native_bind_format=

data/ext/swift/db/postgres/result.c

@@ -32,11 +32,9 @@ Result* db_postgres_result_handle(VALUE self) {
 void db_postgres_result_mark(Result *r) {
     if (r) {
         if (r->fields)
-            rb_gc_mark_maybe(r->fields);
+            rb_gc_mark(r->fields);
         if (r->types)
-            rb_gc_mark_maybe(r->types);
-        if (r->rows)
-            rb_gc_mark_maybe(r->rows);
+            rb_gc_mark(r->types);
     }
 }
 
@@ -61,7 +59,6 @@ VALUE db_postgres_result_load(VALUE self, PGresult *result) {
     Result *r    = db_postgres_result_handle(self);
     r->fields    = rb_ary_new();
     r->types     = rb_ary_new();
-    r->rows      = rb_ary_new();
     r->result    = result;
     r->affected  = atol(PQcmdTuples(result));
     r->selected  = PQntuples(result);
@@ -101,7 +98,7 @@ VALUE db_postgres_result_load(VALUE self, PGresult *result) {
 }
 
 VALUE db_postgres_result_each(VALUE self) {
-    int row, col;
+    int row, col, status;
     Result *r = db_postgres_result_handle(self);
 
     if (!r->result)
@@ -124,7 +121,11 @@ VALUE db_postgres_result_each(VALUE self) {
                 );
             }
         }
-        rb_yield(tuple);
+        rb_gc_register_address(&tuple);
+        rb_protect(rb_yield, tuple, &status);
+        rb_gc_unregister_address(&tuple);
+        if (status != 0)
+            rb_jump_tag(status);
     }
     return Qtrue;
 }

data/ext/swift/db/postgres/statement.c

@@ -38,7 +38,7 @@ Statement* db_postgres_statement_handle_safe(VALUE self) {
 
 void db_postgres_statement_mark(Statement *s) {
     if (s && s->adapter)
-        rb_gc_mark_maybe(s->adapter);
+        rb_gc_mark(s->adapter);
 }
 
 VALUE db_postgres_statement_deallocate(Statement *s) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swift-db-postgres
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-29 00:00:00.000000000 Z
+date: 2012-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake