swift-db-mysql 0.1.0 → 0.1.2

data/CHANGELOG

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

data/README.md

@@ -21,6 +21,7 @@ MRI adapter for MySQL
     #commit(savepoint = nil)
     #rollback(savepoint = nil)
     #transaction(savepoint = nil, &block)
+    #ping
     #close
     #closed?
     #escape(text)
@@ -103,6 +104,10 @@ Don't read too much into it. Each library has its advantages and disadvantages.
 ```
 # insert 1000 rows and read them back 100 times
 
+$ ruby -v
+
+ruby 1.9.3p125 (2012-02-16 revision 34643) [x86_64-linux]
+
 $ ruby check.rb
                       user     system      total        real
 do_mysql insert   0.170000   0.100000   0.270000 (  0.629025)

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

@@ -95,7 +95,7 @@ VALUE db_mysql_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")));
@@ -159,8 +159,10 @@ VALUE db_mysql_adapter_execute(int argc, VALUE *argv, VALUE self) {
     rb_scan_args(argc, argv, "10*", &sql, &bind);
     sql = TO_S(sql);
 
+    rb_gc_register_address(&bind);
     if (RARRAY_LEN(bind) > 0)
         sql = db_mysql_bind_sql(self, sql, bind);
+    rb_gc_unregister_address(&bind);
 
     Query q = {.connection = c, .sql = sql};
 
@@ -304,6 +306,11 @@ VALUE db_mysql_adapter_closed_q(VALUE self) {
     return a->connection ? Qfalse : Qtrue;
 }
 
+VALUE db_mysql_adapter_ping(VALUE self) {
+    Adapter *a = db_mysql_adapter_handle(self);
+    return a->connection && mysql_ping(a->connection) == 0 ? Qtrue : Qfalse;
+}
+
 VALUE db_mysql_adapter_prepare(VALUE self, VALUE sql) {
     return db_mysql_statement_initialize(db_mysql_statement_allocate(cDMS), self, sql);
 }
@@ -424,6 +431,7 @@ void init_swift_db_mysql_adapter() {
     rb_define_method(cDMA, "transaction", db_mysql_adapter_transaction, -1);
     rb_define_method(cDMA, "close",       db_mysql_adapter_close,        0);
     rb_define_method(cDMA, "closed?",     db_mysql_adapter_closed_q,     0);
+    rb_define_method(cDMA, "ping",        db_mysql_adapter_ping,         0);
     rb_define_method(cDMA, "escape",      db_mysql_adapter_escape,       1);
     rb_define_method(cDMA, "fileno",      db_mysql_adapter_fileno,       0);
     rb_define_method(cDMA, "query",       db_mysql_adapter_query,       -1);

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

@@ -2,7 +2,7 @@
 
 require 'mkmf'
 
-$CFLAGS = '-std=c99'
+$CFLAGS = '-std=c99 -Os'
 
 inc_paths = %w(
   /usr/include

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

@@ -89,6 +89,7 @@ VALUE db_mysql_statement_execute(int argc, VALUE *argv, VALUE self) {
         mysql_bind = (MYSQL_BIND *)malloc(sizeof(MYSQL_BIND) * RARRAY_LEN(bind));
         memset(mysql_bind, 0, sizeof(MYSQL_BIND) * 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)) {
@@ -105,12 +106,14 @@ VALUE db_mysql_statement_execute(int argc, VALUE *argv, VALUE self) {
         }
 
         if (mysql_stmt_bind_param(s->statement, mysql_bind) != 0) {
+            rb_gc_unregister_address(&bind);
             free(mysql_bind);
             rb_raise(eSwiftRuntimeError, mysql_stmt_error(s->statement));
         }
 
         error = (int)rb_thread_blocking_region(nogvl_mysql_statement_execute, s->statement, RUBY_UBF_IO, 0);
         free(mysql_bind);
+        rb_gc_unregister_address(&bind);
     }
     else {
         if ((n = mysql_stmt_param_count(s->statement)) > 0)

data/test/test_adapter.rb

@@ -1,54 +1,56 @@
 require 'helper'
 
 describe 'mysql adapter' do
-   it 'should initialize' do
-     assert db
-   end
-
-   it 'should execute sql' do
-     assert db.execute("select * from information_schema.tables limit 1")
-   end
-
-   it 'should expect the correct number of bind args' do
-     assert_raises(Swift::ArgumentError) { db.execute("select * from information_schema.tables where table_name = ?", 1, 2) }
-   end
-
-   it 'should return result on #execute' do
-     now = Time.now.utc
-     assert db.execute('drop table if exists users')
-     assert db.execute('create table users (id int auto_increment primary key, name text, age integer, created_at datetime)')
-     assert db.execute('insert into users(name, age, created_at) values(?, ?, ?)', 'test', nil, now)
-
-     result = db.execute('select * from users')
-
-     assert_equal 1, result.selected_rows
-     assert_equal 0, result.affected_rows
-     assert_equal %w(id name age created_at).map(&:to_sym), result.fields
-     assert_equal %w(integer text integer timestamp), result.types
-
-     row = result.first
-     assert_equal 1,      row[:id]
-     assert_equal 'test', row[:name]
-     assert_equal nil,    row[:age]
-     assert_equal now.to_i, row[:created_at].to_time.to_i
-
-     result = db.execute('delete from users where id = 0')
-     assert_equal 0, result.selected_rows
-     assert_equal 0, result.affected_rows
-
-     assert_equal 1, db.execute('select count(*) as count from users').first[:count]
-
-     result = db.execute('delete from users')
-     assert_equal 0, result.selected_rows
-     assert_equal 1, result.affected_rows
-   end
-
-   it 'should close handle' do
-     assert !db.closed?
-     assert db.close
-     assert db.closed?
-
-     assert_raises(Swift::ConnectionError) { db.execute("select * from users") }
+  it 'should initialize' do
+    assert db
+  end
+
+  it 'should execute sql' do
+    assert db.execute("select * from information_schema.tables limit 1")
+  end
+
+  it 'should expect the correct number of bind args' do
+    assert_raises(Swift::ArgumentError) { db.execute("select * from information_schema.tables where table_name = ?", 1, 2) }
+  end
+
+  it 'should return result on #execute' do
+    now = Time.now.utc
+    assert db.execute('drop table if exists users')
+    assert db.execute('create table users (id int auto_increment primary key, name text, age integer, created_at datetime)')
+    assert db.execute('insert into users(name, age, created_at) values(?, ?, ?)', 'test', nil, now)
+
+    result = db.execute('select * from users')
+
+    assert_equal 1, result.selected_rows
+    assert_equal 0, result.affected_rows
+    assert_equal %w(id name age created_at).map(&:to_sym), result.fields
+    assert_equal %w(integer text integer timestamp), result.types
+
+    row = result.first
+    assert_equal 1,      row[:id]
+    assert_equal 'test', row[:name]
+    assert_equal nil,    row[:age]
+    assert_equal now.to_i, row[:created_at].to_time.to_i
+
+    result = db.execute('delete from users where id = 0')
+    assert_equal 0, result.selected_rows
+    assert_equal 0, result.affected_rows
+
+    assert_equal 1, db.execute('select count(*) as count from users').first[:count]
+
+    result = db.execute('delete from users')
+    assert_equal 0, result.selected_rows
+    assert_equal 1, result.affected_rows
+  end
+
+  it 'should close handle' do
+    assert db.ping
+    assert !db.closed?
+    assert db.close
+    assert db.closed?
+    assert !db.ping
+
+    assert_raises(Swift::ConnectionError) { db.execute("select * from users") }
   end
 
   it 'should prepare & release statement' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swift-db-mysql
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000 Z
+date: 2012-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -36,11 +36,11 @@ extensions:
 extra_rdoc_files: []
 files:
 - ext/swift/db/mysql/datetime.c
-- ext/swift/db/mysql/statement.c
 - ext/swift/db/mysql/main.c
-- ext/swift/db/mysql/typecast.c
-- ext/swift/db/mysql/result.c
 - ext/swift/db/mysql/adapter.c
+- ext/swift/db/mysql/result.c
+- ext/swift/db/mysql/typecast.c
+- ext/swift/db/mysql/statement.c
 - ext/swift/db/mysql/common.c
 - ext/swift/db/mysql/typecast.h
 - ext/swift/db/mysql/datetime.h
@@ -52,8 +52,8 @@ files:
 - test/helper.rb
 - test/test_ssl.rb
 - test/test_encoding.rb
-- test/test_async.rb
 - test/test_adapter.rb
+- test/test_async.rb
 - lib/swift/db/mysql.rb
 - lib/swift-db-mysql.rb
 - README.md