do_sqlite3 0.10.9-x86-mswin32-60 → 0.10.10-x86-mswin32-60

data/ChangeLog.markdown

@@ -1,3 +1,7 @@
+## 0.10.10 2012-10-11
+
+* Add support to C driver for busy\_timeout
+
 ## 0.10.9 2012-08-13
 
 * Fix segfault when loading custom extensions

data/ext/do_sqlite3/do_sqlite3.c

@@ -137,6 +137,20 @@ int do_sqlite3_flags_from_uri(VALUE uri) {
 
 #endif
 
+
+int do_sqlite3_busy_timeout_from_uri(VALUE uri) {
+  VALUE query_values = rb_funcall(uri, rb_intern("query"), 0);
+  if(query_values != Qnil && TYPE(query_values) == T_HASH) {
+    VALUE timeout = rb_hash_aref(query_values, rb_str_new2("busy_timeout"));
+    if(timeout == Qnil) {
+      return -1;
+    }
+
+    return rb_cstr2inum(RSTRING_PTR(timeout), 0);
+  }
+  return -1;
+}
+
 /****** Public API ******/
 
 VALUE do_sqlite3_cConnection_initialize(VALUE self, VALUE uri) {
@@ -154,6 +168,11 @@ VALUE do_sqlite3_cConnection_initialize(VALUE self, VALUE uri) {
     do_sqlite3_raise_error(self, db, Qnil);
   }
 
+  int timeout = do_sqlite3_busy_timeout_from_uri(uri);
+  if(timeout > 0) {
+    sqlite3_busy_timeout(db, timeout);
+  }
+
   rb_iv_set(self, "@uri", uri);
   rb_iv_set(self, "@connection", Data_Wrap_Struct(rb_cObject, 0, 0, db));
   // Sqlite3 only supports UTF-8, so this is the standard encoding

data/lib/do_sqlite3/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Sqlite3
-    VERSION = '0.10.9'
+    VERSION = '0.10.10'
   end
 end

data/spec/connection_spec.rb

@@ -17,4 +17,21 @@ describe DataObjects::Sqlite3::Connection do
   it_should_behave_like 'a Connection'
   it_should_behave_like 'a Connection via JDNI' if JRUBY
   it_should_behave_like 'a Connection with JDBC URL support' if JRUBY
+
+  unless JRUBY
+
+    describe 'connecting with busy timeout' do
+
+      it 'connects with a valid timeout' do
+        DataObjects::Connection.new("#{CONFIG.uri}?busy_timeout=200").should_not be_nil
+      end
+
+      it 'raises an error when passed an invalid value' do
+        lambda { DataObjects::Connection.new("#{CONFIG.uri}?busy_timeout=stuff") }.
+          should raise_error(ArgumentError)
+      end
+
+    end
+  end
+
 end

data/tasks/compile.rake

@@ -55,7 +55,7 @@ begin
     ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar'
     ext.java_compiling do |gem|
       gem.add_dependency 'jdbc-sqlite3', '>=3.5.8'
-      gem.add_dependency 'do_jdbc',      '0.10.9'
+      gem.add_dependency 'do_jdbc',      '0.10.10'
     end
   end
 rescue LoadError

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 10
-  - 9
-  version: 0.10.9
+  - 10
+  version: 0.10.10
 platform: x86-mswin32-60
 authors: 
 - Dirkjan Bussink
@@ -28,8 +28,8 @@ dependencies:
         segments: 
         - 0
         - 10
-        - 9
-        version: 0.10.9
+        - 10
+        version: 0.10.10
   requirement: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false