swift-db-postgres 0.1.1 → 0.1.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.1.2 (2012-07-29)
+
+* gc guard bind parameters during execute.
+
 == 0.1.1 (2012-07-26)
 
 * Updated compile flags.

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

@@ -70,7 +70,7 @@ VALUE db_postgres_adapter_initialize(VALUE self, VALUE options) {
 
     db   = rb_hash_aref(options, ID2SYM(rb_intern("db")));
     user = rb_hash_aref(options, ID2SYM(rb_intern("user")));
-    pass = rb_hash_aref(options, ID2SYM(rb_intern("pass")));
+    pass = rb_hash_aref(options, ID2SYM(rb_intern("password")));
     host = rb_hash_aref(options, ID2SYM(rb_intern("host")));
     port = rb_hash_aref(options, ID2SYM(rb_intern("port")));
     ssl  = rb_hash_aref(options, ID2SYM(rb_intern("ssl")));
@@ -137,6 +137,7 @@ VALUE db_postgres_adapter_execute(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)) {
@@ -166,6 +167,7 @@ VALUE db_postgres_adapter_execute(int argc, VALUE *argv, VALUE self) {
         };
 
         pg_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);
         free(bind_args_fmt);

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

@@ -110,6 +110,7 @@ VALUE db_postgres_statement_execute(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)) {
@@ -138,6 +139,7 @@ VALUE db_postgres_statement_execute(int argc, VALUE *argv, VALUE self) {
         };
 
         result = (PGresult *)rb_thread_blocking_region(nogvl_pq_exec_prepared, &q, RUBY_UBF_IO, 0);
+        rb_gc_unregister_address(&bind);
         free(bind_args_fmt);
         free(bind_args_size);
         free(bind_args_data);

data/test/test_adapter.rb

@@ -46,6 +46,9 @@ require 'helper'
     result = db.execute('select * from users')
     assert_equal %w(id name age created_at).map(&:to_sym), result.fields
     assert_equal %w(integer text integer timestamp), result.types
+
+    # like query
+    assert db.execute('select * from users where name like ?', '%foo%')
   end
 
   it 'should close handle' do
@@ -105,4 +108,20 @@ require 'helper'
     assert_raises(Swift::RuntimeError) { db.write("users", "bar") }
     assert_raises(Swift::RuntimeError) { db.write("users", %w(name), "bar") }
   end
+
+  # TODO
+  it 'should not change the hstore ? operator' do
+    skip
+    assert db.execute('create extension if not exists hstore')
+    assert db.execute('drop table if exists hstore_test')
+    assert db.execute('create table hstore_test(id int, payload hstore)')
+    assert db.execute('insert into hstore_test values(1, ?)', 'a => 1, b => 2')
+
+    assert_equal 1, db.execute('select * from hstore_test where payload ? $1', 'a').selected_rows
+    assert_equal 0, db.execute('select * from hstore_test where payload ? $1', 'c').selected_rows
+    assert_equal 1, db.execute('select * from hstore_test where payload ? ?',  'a').selected_rows
+
+    assert_equal 1, db.execute('select * from hstore_test where payload ?| ARRAY[?, ?]', 'a', 'b').selected_rows
+    assert_equal 1, db.execute('select * from hstore_test where payload ?& ARRAY[?, ?]', 'a', 'b').selected_rows
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swift-db-postgres
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-26 00:00:00.000000000 Z
+date: 2012-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -36,12 +36,12 @@ extensions:
 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/typecast.c
 - ext/swift/db/postgres/statement.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/adapter.c
 - ext/swift/db/postgres/typecast.h
 - ext/swift/db/postgres/common.h
 - ext/swift/db/postgres/datetime.h
@@ -52,8 +52,8 @@ files:
 - test/test_ssl.rb
 - test/test_adapter.rb
 - test/test_encoding.rb
-- test/helper.rb
 - test/test_async.rb
+- test/helper.rb
 - lib/swift/db/postgres.rb
 - lib/swift-db-postgres.rb
 - README.md
@@ -84,4 +84,3 @@ signing_key:
 specification_version: 3
 summary: Swift postgres adapter
 test_files: []
-has_rdoc: