swift-db-postgres 0.2.3 → 0.2.4

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.2.4 (2012-08-18)
+
+* gc protect bind args.
+
 == 0.2.3 (2012-07-31)
 
 * remove rb_protect from Result#each.

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

@@ -396,6 +396,7 @@ VALUE db_postgres_adapter_query(int argc, VALUE *argv, VALUE self) {
         bind_args_fmt  = (int   *) malloc(sizeof(int)    * RARRAY_LEN(bind));
         bind_args_data = (char **) malloc(sizeof(char *) * RARRAY_LEN(bind));
 
+        rb_gc_register_address(&bind);
         for (n = 0; n < RARRAY_LEN(bind); n++) {
             data = rb_ary_entry(bind, n);
             if (NIL_P(data)) {
@@ -418,6 +419,7 @@ VALUE db_postgres_adapter_query(int argc, VALUE *argv, VALUE self) {
         ok = PQsendQueryParams(a->connection, RSTRING_PTR(sql), RARRAY_LEN(bind), 0,
             (const char* const *)bind_args_data, bind_args_size, bind_args_fmt, 0);
 
+        rb_gc_unregister_address(&bind);
         free(bind_args_size);
         free(bind_args_data);
         free(bind_args_fmt);

data/ext/swift/db/postgres/extconf.rb

@@ -22,12 +22,13 @@ lib_paths = %w(
   /sw/lib
 )
 
-(inc_paths << ENV['SPG_INCLUDE_DIRS']).compact!
-(lib_paths << ENV['SPG_LIBRARY_DIRS']).compact!
+uuid_inc,  uuid_lib  = dir_config('uuid',  '/usr/include/uuid', '/usr/lib')
+libpq_inc, libpq_lib = dir_config('postgresql')
 
-find_header('libpq-fe.h',  *inc_paths) or raise 'unable to locate postgresql headers set SPG_INCLUDE_DIRS'
-find_header('uuid/uuid.h', *inc_paths) or raise 'unable to locate uuid headers set SPG_INCLUDE_DIRS'
+find_header 'uuid/uuid.h', *inc_paths.dup.unshift(uuid_inc).compact
+find_header 'libpq-fe.h',  *inc_paths.dup.unshift(libpq_inc).compact
+
+find_library 'uuid', 'main', *lib_paths.dup.unshift(uuid_lib).compact
+find_library 'pq',   'main', *lib_paths.dup.unshift(libpq_lib).compact
 
-find_library('pq',  'main', *lib_paths) or raise 'unable to locate postgresql lib set SPG_LIBRARY_DIRS'
-find_library('uuid','main', *lib_paths) or raise 'unable to locate uuid lib set SPG_LIBRARY_DIRS'
 create_makefile('swift_db_postgres_ext')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swift-db-postgres
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2012-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -35,13 +35,13 @@ extensions:
 - ext/swift/db/postgres/extconf.rb
 extra_rdoc_files: []
 files:
-- ext/swift/db/postgres/result.c
 - ext/swift/db/postgres/datetime.c
+- ext/swift/db/postgres/result.c
 - ext/swift/db/postgres/adapter.c
+- ext/swift/db/postgres/statement.c
 - ext/swift/db/postgres/typecast.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/common.h
 - ext/swift/db/postgres/datetime.h