swift-db-postgres 0.2.6 → 0.2.7

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.2.7 (2012-11-22)
+
+* rb_gc_register_address() the bind values.
+
 == 0.2.6 (2012-11-14)
 
 * Ruby 2.x build fixes.

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

@@ -127,15 +127,18 @@ 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 *result;
-    VALUE sql, bind, data;
+    VALUE sql, bind, data, typecast_bind;
     Adapter *a = db_postgres_adapter_handle_safe(self);
 
     rb_scan_args(argc, argv, "10*", &sql, &bind);
     if (!a->native)
         sql = db_postgres_normalized_sql(sql);
 
+    typecast_bind = rb_ary_new();
+    rb_gc_register_address(&typecast_bind);
     rb_gc_register_address(&sql);
     rb_gc_register_address(&bind);
+
     if (RARRAY_LEN(bind) > 0) {
         bind_args_size = (int   *) malloc(sizeof(int)    * RARRAY_LEN(bind));
         bind_args_fmt  = (int   *) malloc(sizeof(int)    * RARRAY_LEN(bind));
@@ -155,8 +158,9 @@ VALUE db_postgres_adapter_execute(int argc, VALUE *argv, VALUE self) {
                     bind_args_fmt[n] = 0;
 
                 data = typecast_to_string(data);
+                rb_ary_push(typecast_bind, data);
                 bind_args_size[n] = RSTRING_LEN(data);
-                bind_args_data[n] = CSTRING_PTR(data);
+                bind_args_data[n] = RSTRING_PTR(data);
             }
         }
 
@@ -170,9 +174,6 @@ VALUE db_postgres_adapter_execute(int argc, VALUE *argv, VALUE self) {
         };
 
         result = (PGresult *)GVL_NOLOCK(nogvl_pq_exec_params, &q, RUBY_UBF_IO, 0);
-        for (n = 0; n < RARRAY_LEN(bind); n++)
-            if (bind_args_data[n])
-                free(bind_args_data[n]);
         free(bind_args_size);
         free(bind_args_data);
         free(bind_args_fmt);
@@ -182,6 +183,7 @@ VALUE db_postgres_adapter_execute(int argc, VALUE *argv, VALUE self) {
         result = (PGresult *)GVL_NOLOCK(nogvl_pq_exec, &q, RUBY_UBF_IO, 0);
     }
 
+    rb_gc_unregister_address(&typecast_bind);
     rb_gc_unregister_address(&sql);
     rb_gc_unregister_address(&bind);
     db_postgres_check_result(result);

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

@@ -6,12 +6,6 @@
 #include <math.h>
 #include <uuid/uuid.h>
 
-char* CSTRING_PTR(VALUE value) {
-    char* result = malloc(RSTRING_LEN(value) + 1);
-    memcpy(result, RSTRING_PTR(value), RSTRING_LEN(value) + 1);
-    return result;
-}
-
 VALUE rb_uuid_string() {
     size_t n;
     uuid_t uuid;

data/ext/swift/db/postgres/common.h

@@ -22,7 +22,6 @@ extern VALUE cDPA, cDPS, cDPR;
 extern VALUE eSwiftError, eSwiftArgumentError, eSwiftRuntimeError, eSwiftConnectionError;
 extern VALUE cStringIO;
 
-DLL_PRIVATE char* CSTRING_PTR(VALUE);
 DLL_PRIVATE VALUE rb_uuid_string();
 DLL_PRIVATE VALUE db_postgres_normalized_sql(VALUE);
 DLL_PRIVATE void  db_postgres_check_result(PGresult *);

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

@@ -100,14 +100,17 @@ VALUE db_postgres_statement_execute(int argc, VALUE *argv, VALUE self) {
     PGconn *connection;
     char **bind_args_data = 0;
     int n, *bind_args_size = 0, *bind_args_fmt = 0;
-    VALUE bind, data;
+    VALUE bind, data, typecast_bind;
 
     Statement *s = db_postgres_statement_handle_safe(self);
     connection   = db_postgres_adapter_handle_safe(s->adapter)->connection;
 
     rb_scan_args(argc, argv, "00*", &bind);
 
+    typecast_bind = rb_ary_new();
+    rb_gc_register_address(&typecast_bind);
     rb_gc_register_address(&bind);
+
     if (RARRAY_LEN(bind) > 0) {
         bind_args_size = (int   *) malloc(sizeof(int)    * RARRAY_LEN(bind));
         bind_args_fmt  = (int   *) malloc(sizeof(int)    * RARRAY_LEN(bind));
@@ -126,8 +129,9 @@ VALUE db_postgres_statement_execute(int argc, VALUE *argv, VALUE self) {
                 else
                     bind_args_fmt[n] = 0;
                 data = typecast_to_string(data);
+                rb_ary_push(typecast_bind, data);
                 bind_args_size[n] = RSTRING_LEN(data);
-                bind_args_data[n] = CSTRING_PTR(data);
+                bind_args_data[n] = RSTRING_PTR(data);
             }
         }
 
@@ -141,9 +145,6 @@ VALUE db_postgres_statement_execute(int argc, VALUE *argv, VALUE self) {
         };
 
         result = (PGresult *)GVL_NOLOCK(nogvl_pq_exec_prepared, &q, RUBY_UBF_IO, 0);
-        for (n = 0; n < RARRAY_LEN(bind); n++)
-            if (bind_args_data[n])
-                free(bind_args_data[n]);
         free(bind_args_fmt);
         free(bind_args_size);
         free(bind_args_data);
@@ -160,6 +161,7 @@ VALUE db_postgres_statement_execute(int argc, VALUE *argv, VALUE self) {
         result = (PGresult *)GVL_NOLOCK(nogvl_pq_exec_prepared, &q, RUBY_UBF_IO, 0);
     }
 
+    rb_gc_unregister_address(&typecast_bind);
     rb_gc_unregister_address(&bind);
     db_postgres_check_result(result);
     return db_postgres_result_load(db_postgres_result_allocate(cDPR), result);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swift-db-postgres
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-19 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -37,11 +37,11 @@ extra_rdoc_files: []
 files:
 - ext/swift/db/postgres/datetime.c
 - ext/swift/db/postgres/result.c
-- ext/swift/db/postgres/common.c
 - ext/swift/db/postgres/adapter.c
 - ext/swift/db/postgres/typecast.c
-- ext/swift/db/postgres/statement.c
+- ext/swift/db/postgres/common.c
 - ext/swift/db/postgres/main.c
+- ext/swift/db/postgres/statement.c
 - ext/swift/db/postgres/typecast.h
 - ext/swift/db/postgres/datetime.h
 - ext/swift/db/postgres/result.h