Merge branch 'master' of http://github.com/yoshimoto/sqlite3-ruby int…

…o yoshimoto-master
andrewschaaf · Oct 30, 2010 · 69ddfaf · 69ddfaf
2 parents 1a9edb8 + d4a109b
commit 69ddfaf
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/ext/sqlite3/database.c b/ext/sqlite3/database.c
@@ -60,18 +60,24 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
     if(Qtrue == rb_hash_aref(opts, sym_utf16)) {
       status = sqlite3_open16(utf16_string_value_ptr(file), &ctx->db);
     } else {
+      int mode;	
 
 #ifdef HAVE_RUBY_ENCODING_H
       if(!UTF8_P(file)) {
         file = rb_str_export_to_enc(file, rb_utf8_encoding());
       }
 #endif
 
+      if (Qtrue == rb_hash_aref(opts, ID2SYM(rb_intern("readonly")))) {
+	mode = SQLITE_OPEN_READONLY;
+      } else {
+	mode = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE;
+      }
       status = sqlite3_open_v2(
           StringValuePtr(file),
           &ctx->db,
-          SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE,
-          NIL_P(zvfs) ? NULL : StringValuePtr(zvfs)
+          mode,
+	  NIL_P(zvfs) ? NULL : StringValuePtr(zvfs)
       );
     }