sqlite3 1.4.2 → 1.7.2

data/ext/sqlite3/database.c

@@ -1,6 +1,11 @@
 #include <sqlite3_ruby.h>
 #include <aggregator.h>
 
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable : 4028 )
+#endif
+
 #define REQUIRE_OPEN_DB(_ctxt) \
   if(!_ctxt->db) \
     rb_raise(rb_path2class("SQLite3::Exception"), "cannot use a closed database");
@@ -16,37 +21,61 @@ static void deallocate(void * ctx)
   xfree(c);
 }
 
+static size_t database_memsize(const void *ctx)
+{
+  const sqlite3RubyPtr c = (const sqlite3RubyPtr)ctx;
+  // NB: can't account for ctx->db because the type is incomplete.
+  return sizeof(*c);
+}
+
+static const rb_data_type_t database_type = {
+  "SQLite3::Backup",
+  {
+      NULL,
+      deallocate,
+      database_memsize,
+  },
+  0,
+  0,
+  RUBY_TYPED_WB_PROTECTED, // Not freed immediately because the dfree function do IOs.
+};
+
 static VALUE allocate(VALUE klass)
 {
-  sqlite3RubyPtr ctx = xcalloc((size_t)1, sizeof(sqlite3Ruby));
-  return Data_Wrap_Struct(klass, NULL, deallocate, ctx);
+  sqlite3RubyPtr ctx;
+  return TypedData_Make_Struct(klass, sqlite3Ruby, &database_type, ctx);
 }
 
 static char *
 utf16_string_value_ptr(VALUE str)
 {
   StringValue(str);
-  rb_str_buf_cat(str, "\x00", 1L);
+  rb_str_buf_cat(str, "\x00\x00", 2L);
   return RSTRING_PTR(str);
 }
 
 static VALUE sqlite3_rb_close(VALUE self);
 
+sqlite3RubyPtr sqlite3_database_unwrap(VALUE database){
+  sqlite3RubyPtr ctx;
+  TypedData_Get_Struct(database, sqlite3Ruby, &database_type, ctx);
+  return ctx;
+}
+
 static VALUE rb_sqlite3_open_v2(VALUE self, VALUE file, VALUE mode, VALUE zvfs)
 {
   sqlite3RubyPtr ctx;
-  VALUE flags;
   int status;
 
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
 
 #if defined TAINTING_SUPPORT
-#if defined StringValueCStr
+#  if defined StringValueCStr
   StringValuePtr(file);
   rb_check_safe_obj(file);
-#else
+#  else
   Check_SafeStr(file);
-#endif
+#  endif
 #endif
 
       status = sqlite3_open_v2(
@@ -61,6 +90,23 @@ static VALUE rb_sqlite3_open_v2(VALUE self, VALUE file, VALUE mode, VALUE zvfs)
   return self;
 }
 
+static VALUE rb_sqlite3_disable_quirk_mode(VALUE self)
+{
+#if defined SQLITE_DBCONFIG_DQS_DDL
+  sqlite3RubyPtr ctx;
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
+
+  if(!ctx->db) return Qfalse;
+
+  sqlite3_db_config(ctx->db, SQLITE_DBCONFIG_DQS_DDL, 0, (void*)0);
+  sqlite3_db_config(ctx->db, SQLITE_DBCONFIG_DQS_DML, 0, (void*)0);
+
+  return Qtrue;
+#else
+  return Qfalse;
+#endif
+}
+
 /* call-seq: db.close
  *
  * Closes this database.
@@ -69,7 +115,7 @@ static VALUE sqlite3_rb_close(VALUE self)
 {
   sqlite3RubyPtr ctx;
   sqlite3 * db;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
 
   db = ctx->db;
   CHECK(db, sqlite3_close(ctx->db));
@@ -88,7 +134,7 @@ static VALUE sqlite3_rb_close(VALUE self)
 static VALUE closed_p(VALUE self)
 {
   sqlite3RubyPtr ctx;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
 
   if(!ctx->db) return Qtrue;
 
@@ -103,10 +149,10 @@ static VALUE closed_p(VALUE self)
 static VALUE total_changes(VALUE self)
 {
   sqlite3RubyPtr ctx;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
-  return INT2NUM((long)sqlite3_total_changes(ctx->db));
+  return INT2NUM(sqlite3_total_changes(ctx->db));
 }
 
 static void tracefunc(void * data, const char *sql)
@@ -129,7 +175,7 @@ static VALUE trace(int argc, VALUE *argv, VALUE self)
   sqlite3RubyPtr ctx;
   VALUE block;
 
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   rb_scan_args(argc, argv, "01", &block);
@@ -147,7 +193,7 @@ static int rb_sqlite3_busy_handler(void * ctx, int count)
 {
   VALUE self = (VALUE)(ctx);
   VALUE handle = rb_iv_get(self, "@busy_handler");
-  VALUE result = rb_funcall(handle, rb_intern("call"), 1, INT2NUM((long)count));
+  VALUE result = rb_funcall(handle, rb_intern("call"), 1, INT2NUM(count));
 
   if(Qfalse == result) return 0;
 
@@ -174,7 +220,7 @@ static VALUE busy_handler(int argc, VALUE *argv, VALUE self)
   VALUE block;
   int status;
 
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   rb_scan_args(argc, argv, "01", &block);
@@ -199,7 +245,7 @@ static VALUE busy_handler(int argc, VALUE *argv, VALUE self)
 static VALUE last_insert_row_id(VALUE self)
 {
   sqlite3RubyPtr ctx;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   return LL2NUM(sqlite3_last_insert_rowid(ctx->db));
@@ -319,7 +365,7 @@ static VALUE define_function_with_flags(VALUE self, VALUE name, VALUE flags)
   VALUE block;
   int status;
 
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   block = rb_block_proc();
@@ -359,7 +405,7 @@ static VALUE define_function(VALUE self, VALUE name)
 static VALUE interrupt(VALUE self)
 {
   sqlite3RubyPtr ctx;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   sqlite3_interrupt(ctx->db);
@@ -375,7 +421,7 @@ static VALUE interrupt(VALUE self)
 static VALUE errmsg(VALUE self)
 {
   sqlite3RubyPtr ctx;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   return rb_str_new2(sqlite3_errmsg(ctx->db));
@@ -389,10 +435,10 @@ static VALUE errmsg(VALUE self)
 static VALUE errcode_(VALUE self)
 {
   sqlite3RubyPtr ctx;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
-  return INT2NUM((long)sqlite3_errcode(ctx->db));
+  return INT2NUM(sqlite3_errcode(ctx->db));
 }
 
 /* call-seq: complete?(sql)
@@ -417,7 +463,7 @@ static VALUE complete_p(VALUE UNUSED(self), VALUE sql)
 static VALUE changes(VALUE self)
 {
   sqlite3RubyPtr ctx;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   return INT2NUM(sqlite3_changes(ctx->db));
@@ -462,7 +508,7 @@ static VALUE set_authorizer(VALUE self, VALUE authorizer)
   sqlite3RubyPtr ctx;
   int status;
 
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   status = sqlite3_set_authorizer(
@@ -489,7 +535,7 @@ static VALUE set_authorizer(VALUE self, VALUE authorizer)
 static VALUE set_busy_timeout(VALUE self, VALUE timeout)
 {
   sqlite3RubyPtr ctx;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   CHECK(ctx->db, sqlite3_busy_timeout(ctx->db, (int)NUM2INT(timeout)));
@@ -505,7 +551,7 @@ static VALUE set_busy_timeout(VALUE self, VALUE timeout)
 static VALUE set_extended_result_codes(VALUE self, VALUE enable)
 {
   sqlite3RubyPtr ctx;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   CHECK(ctx->db, sqlite3_extended_result_codes(ctx->db, RTEST(enable) ? 1 : 0));
@@ -550,7 +596,7 @@ int rb_comparator_func(void * ctx, int a_len, const void * a, int b_len, const v
 static VALUE collation(VALUE self, VALUE name, VALUE comparator)
 {
   sqlite3RubyPtr ctx;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   CHECK(ctx->db, sqlite3_create_collation(
@@ -579,10 +625,10 @@ static VALUE load_extension(VALUE self, VALUE file)
   int status;
   char *errMsg;
   VALUE errexp;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
-  status = sqlite3_load_extension(ctx->db, RSTRING_PTR(file), 0, &errMsg);
+  status = sqlite3_load_extension(ctx->db, StringValuePtr(file), 0, &errMsg);
   if (status != SQLITE_OK)
   {
     errexp = rb_exc_new2(rb_eRuntimeError, errMsg);
@@ -603,7 +649,7 @@ static VALUE enable_load_extension(VALUE self, VALUE onoff)
 {
   sqlite3RubyPtr ctx;
   int onoffparam;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   if (Qtrue == onoff) {
@@ -640,7 +686,7 @@ static VALUE db_encoding(VALUE self)
   sqlite3RubyPtr ctx;
   VALUE enc;
 
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   enc = rb_iv_get(self, "@encoding");
@@ -660,7 +706,7 @@ static VALUE db_encoding(VALUE self)
 static VALUE transaction_active_p(VALUE self)
 {
   sqlite3RubyPtr ctx;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   return sqlite3_get_autocommit(ctx->db) ? Qfalse : Qtrue;
@@ -705,7 +751,7 @@ static int regular_callback_function(VALUE callback_ary, int count, char **data,
 
 /* Is invoked by calling db.execute_batch2(sql, &block)
  *
- * Executes all statments in a given string separated by semicolons.
+ * Executes all statements in a given string separated by semicolons.
  * If a query is made, all values returned are strings
  * (except for 'NULL' values which return nil),
  * so the user may parse values with a block.
@@ -719,13 +765,13 @@ static VALUE exec_batch(VALUE self, VALUE sql, VALUE results_as_hash)
   char *errMsg;
   VALUE errexp;
 
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   if(results_as_hash == Qtrue) {
-    status = sqlite3_exec(ctx->db, StringValuePtr(sql), hash_callback_function, callback_ary, &errMsg);
+    status = sqlite3_exec(ctx->db, StringValuePtr(sql), (sqlite3_callback)hash_callback_function, (void*)callback_ary, &errMsg);
   } else {
-    status = sqlite3_exec(ctx->db, StringValuePtr(sql), regular_callback_function, callback_ary, &errMsg);
+    status = sqlite3_exec(ctx->db, StringValuePtr(sql), (sqlite3_callback)regular_callback_function, (void*)callback_ary, &errMsg);
   }
 
   if (status != SQLITE_OK)
@@ -747,7 +793,7 @@ static VALUE db_filename(VALUE self, VALUE db_name)
 {
   sqlite3RubyPtr ctx;
   const char * fname;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   fname = sqlite3_db_filename(ctx->db, StringValueCStr(db_name));
@@ -761,7 +807,7 @@ static VALUE rb_sqlite3_open16(VALUE self, VALUE file)
   int status;
   sqlite3RubyPtr ctx;
 
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
 
 #if defined TAINTING_SUPPORT
 #if defined StringValueCStr
@@ -779,7 +825,7 @@ static VALUE rb_sqlite3_open16(VALUE self, VALUE file)
   return INT2NUM(status);
 }
 
-void init_sqlite3_database()
+void init_sqlite3_database(void)
 {
 #if 0
   VALUE mSqlite3 = rb_define_module("SQLite3");
@@ -800,6 +846,7 @@ void init_sqlite3_database()
   /* public "define_aggregator" is now a shim around define_aggregator2
    * implemented in Ruby */
   rb_define_private_method(cSqlite3Database, "define_aggregator2", rb_sqlite3_define_aggregator2, 2);
+  rb_define_private_method(cSqlite3Database, "disable_quirk_mode", rb_sqlite3_disable_quirk_mode, 0);
   rb_define_method(cSqlite3Database, "interrupt", interrupt, 0);
   rb_define_method(cSqlite3Database, "errmsg", errmsg, 0);
   rb_define_method(cSqlite3Database, "errcode", errcode_, 0);
@@ -825,3 +872,7 @@ void init_sqlite3_database()
 
   rb_sqlite3_aggregator_init();
 }
+
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif

data/ext/sqlite3/database.h

@@ -12,6 +12,8 @@ typedef sqlite3Ruby * sqlite3RubyPtr;
 
 void init_sqlite3_database();
 void set_sqlite3_func_result(sqlite3_context * ctx, VALUE result);
+
+sqlite3RubyPtr sqlite3_database_unwrap(VALUE database);
 VALUE sqlite3val2rb(sqlite3_value * val);
 
 #endif