swift-db-postgres 0.2.1 → 0.2.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.2.2 (2012-07-30)
+
+* removed rb_gc_mark called outside mark phase.
+
 == 0.2.1 (2012-07-30)
 
 * rb_protect yielding result tuples.

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

@@ -39,7 +39,6 @@ VALUE db_postgres_adapter_deallocate(Adapter *a) {
 
 VALUE db_postgres_adapter_allocate(VALUE klass) {
     Adapter *a = (Adapter*)malloc(sizeof(Adapter));
-
     memset(a, 0, sizeof(Adapter));
     return Data_Wrap_Struct(klass, 0, db_postgres_adapter_deallocate, a);
 }
@@ -125,7 +124,7 @@ VALUE nogvl_pq_exec_params(void *ptr) {
 VALUE db_postgres_adapter_execute(int argc, VALUE *argv, VALUE self) {
     char **bind_args_data = 0;
     int n, *bind_args_size = 0, *bind_args_fmt = 0;
-    PGresult *pg_result;
+    PGresult *result;
     VALUE sql, bind, data;
     Adapter *a = db_postgres_adapter_handle_safe(self);
 
@@ -167,7 +166,7 @@ VALUE db_postgres_adapter_execute(int argc, VALUE *argv, VALUE self) {
             .format     = bind_args_fmt
         };
 
-        pg_result = (PGresult *)rb_thread_blocking_region(nogvl_pq_exec_params, &q, RUBY_UBF_IO, 0);
+        result = (PGresult *)rb_thread_blocking_region(nogvl_pq_exec_params, &q, RUBY_UBF_IO, 0);
         rb_gc_unregister_address(&bind);
         free(bind_args_size);
         free(bind_args_data);
@@ -175,11 +174,11 @@ VALUE db_postgres_adapter_execute(int argc, VALUE *argv, VALUE self) {
     }
     else {
         Query q = {.connection = a->connection, .command = CSTRING(sql)};
-        pg_result = (PGresult *)rb_thread_blocking_region(nogvl_pq_exec, &q, RUBY_UBF_IO, 0);
+        result = (PGresult *)rb_thread_blocking_region(nogvl_pq_exec, &q, RUBY_UBF_IO, 0);
     }
 
-    db_postgres_check_result(pg_result);
-    return db_postgres_result_load(db_postgres_result_allocate(cDPR), pg_result);
+    db_postgres_check_result(result);
+    return db_postgres_result_load(db_postgres_result_allocate(cDPR), result);
 }
 
 VALUE db_postgres_adapter_begin(int argc, VALUE *argv, VALUE self) {

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

@@ -11,7 +11,6 @@ typedef struct Result {
     PGresult *result;
     VALUE fields;
     VALUE types;
-    VALUE rows;
     size_t selected;
     size_t affected;
     size_t insert_id;
@@ -98,6 +97,7 @@ VALUE db_postgres_result_load(VALUE self, PGresult *result) {
 }
 
 VALUE db_postgres_result_each(VALUE self) {
+    VALUE tuple;
     int row, col, status;
     Result *r = db_postgres_result_handle(self);
 
@@ -105,7 +105,7 @@ VALUE db_postgres_result_each(VALUE self) {
         return Qnil;
 
     for (row = 0; row < PQntuples(r->result); row++) {
-        VALUE tuple = rb_hash_new();
+        tuple = rb_hash_new();
         for (col = 0; col < PQnfields(r->result); col++) {
             if (PQgetisnull(r->result, row, col))
                 rb_hash_aset(tuple, rb_ary_entry(r->fields, col), Qnil);
@@ -121,13 +121,11 @@ VALUE db_postgres_result_each(VALUE self) {
                 );
             }
         }
-        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;
+    return Qnil;
 }
 
 VALUE db_postgres_result_selected_rows(VALUE self) {

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

@@ -15,7 +15,7 @@ VALUE    db_postgres_result_load(VALUE, PGresult*);
 Adapter* db_postgres_adapter_handle_safe(VALUE);
 
 typedef struct Statement {
-    char id[64];
+    char id[128];
     VALUE adapter;
 } Statement;
 
@@ -57,9 +57,8 @@ VALUE db_postgres_statement_initialize(VALUE self, VALUE adapter, VALUE sql) {
     Statement *s = db_postgres_statement_handle(self);
     Adapter *a   = db_postgres_adapter_handle_safe(adapter);
 
-    snprintf(s->id, 64, "s%s", CSTRING(rb_uuid_string()));
+    snprintf(s->id, 128, "s%s", CSTRING(rb_uuid_string()));
     s->adapter = adapter;
-    rb_gc_mark(s->adapter);
 
     if (!a->native)
         sql = db_postgres_normalized_sql(sql);
@@ -71,7 +70,7 @@ VALUE db_postgres_statement_initialize(VALUE self, VALUE adapter, VALUE sql) {
 }
 
 VALUE db_postgres_statement_release(VALUE self) {
-    char command[128];
+    char command[256];
     PGresult *result;
     PGconn *connection;
 
@@ -79,7 +78,7 @@ VALUE db_postgres_statement_release(VALUE self) {
     connection   = db_postgres_adapter_handle_safe(s->adapter)->connection;
 
     if (connection && PQstatus(connection) == CONNECTION_OK) {
-        snprintf(command, 128, "deallocate %s", s->id);
+        snprintf(command, 256, "deallocate %s", s->id);
         result = PQexec(connection, command);
         db_postgres_check_result(result);
         PQclear(result);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swift-db-postgres
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -36,12 +36,12 @@ extensions:
 extra_rdoc_files: []
 files:
 - ext/swift/db/postgres/datetime.c
-- ext/swift/db/postgres/statement.c
+- ext/swift/db/postgres/result.c
 - ext/swift/db/postgres/adapter.c
 - ext/swift/db/postgres/typecast.c
 - ext/swift/db/postgres/common.c
 - ext/swift/db/postgres/main.c
-- ext/swift/db/postgres/result.c
+- ext/swift/db/postgres/statement.c
 - ext/swift/db/postgres/typecast.h
 - ext/swift/db/postgres/common.h
 - ext/swift/db/postgres/datetime.h