ext/pool.cc in swift-0.7.2 vs ext/pool.cc in swift-0.8.0
- old
+ new
@@ -24,11 +24,11 @@
VALUE driver = rb_hash_aref(options, ID2SYM(rb_intern("driver")));
if (NIL_P(db)) rb_raise(eSwiftArgumentError, "Pool#new called without :db");
if (NIL_P(driver)) rb_raise(eSwiftArgumentError, "#new called without :driver");
- user = NIL_P(user) ? rb_str_new2(getlogin()) : user;
+ user = NIL_P(user) ? CURRENT_USER() : user;
if (NUM2INT(n) < 1) rb_raise(eSwiftArgumentError, "Pool#new called with invalid pool size.");
try {
DATA_PTR(self) = new dbi::ConnectionPool(
NUM2INT(n),
@@ -74,10 +74,10 @@
else
rb_iv_set(callback, "@timezone", rb_iv_get(self, "@timezone"));
try {
Query query;
- query_bind_values(&query, bind_values, pool->driver());
+ query_bind_values(&query, bind_values);
request = request_alloc(cSwiftRequest);
DATA_PTR(request) = pool->execute(CSTRING(sql), query.bind, pool_callback, (void*)callback);
return request;
}
CATCH_DBI_EXCEPTIONS();