sqlite3-ruby 1.2.1-mswin32 → 1.2.2-mswin32

data/{README → README.rdoc}

@@ -39,13 +39,9 @@ FAQ, please send them to jamis@37signals.com
 
 == Source Code
 
-The source repository is accessible via subversion:
+The source repository is accessible via git:
 
-  svn co http://svn.jamisbuck.org/sqlite3-ruby/trunk
-
-Individual releases are tagged in the tags directory:
-
-  svn co http://svn.jamisbuck.org/sqlite3-ruby/tags
+  git clone git://github.com/jamis/sqlite3-ruby.git
 
 == Contact Information
 

data/doc/faq/faq.rb

@@ -1,35 +1,3 @@
-#--
-# =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 
-#     * Redistributions of source code must retain the above copyright notice,
-#       this list of conditions and the following disclaimer.
-# 
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-# 
-#     * The names of its contributors may not be used to endorse or promote
-#       products derived from this software without specific prior written
-#       permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# =============================================================================
-#++
-
 require 'yaml'
 require 'redcloth'
 
@@ -93,7 +61,7 @@ def add_api_links( text )
     disp_obj = obj = $1
 
     case obj
-      when "Pragmas": disp_obj = "Database"
+      when "Pragmas"; disp_obj = "Database"
     end
 
     method = $3

data/ext/sqlite3_api/extconf.rb

@@ -4,10 +4,13 @@ SWIG_WRAP = "sqlite3_api_wrap.c"
 
 dir_config( "sqlite3", "/usr/local" )
 
+have_library( "rt", "fdatasync" )
+
 if have_header( "sqlite3.h" ) && have_library( "sqlite3", "sqlite3_open" )
   if !File.exists?( SWIG_WRAP ) || with_config( "swig", false )
     puts "creating #{SWIG_WRAP}"
     system "swig -ruby sqlite3_api.i" or raise "could not build wrapper via swig (perhaps swig is not installed?)"
   end
+
   create_makefile( "sqlite3_api" )
 end

data/ext/sqlite3_api/sqlite3_api.i

@@ -3,7 +3,6 @@
 %{
 #include <sqlite3.h>
 #include "ruby.h"
-#include "intern.h"
 
 #define Init_API Init_sqlite3_api
 
@@ -14,8 +13,8 @@ struct CallbackData {
 };
 
 typedef struct CallbackData CallbackData;
-typedef void BLOB;
-typedef void VALBLOB;
+typedef void RUBY_BLOB;
+typedef void RUBY_VALBLOB;
 
 int Sqlite3_ruby_busy_handler(void* data,int value) {
   VALUE result;
@@ -109,7 +108,7 @@ struct CallbackData {
 };
 
 %typemap(in) const void *str {
-  $1 = (void*)RSTRING($input)->ptr;
+  $1 = (void*)RSTRING_PTR($input);
 }
 
 %typemap(in) (const char *filename, sqlite3**) {
@@ -127,7 +126,7 @@ struct CallbackData {
 }
 
 %typemap(in) (const void *filename, sqlite3**) {
-  $1 = (void*)RSTRING($input)->ptr;
+  $1 = (void*)RSTRING_PTR($input);
   $2 = (sqlite3**)malloc( sizeof( sqlite3* ) );
 }
 
@@ -140,14 +139,14 @@ struct CallbackData {
   $result = ary;
 }
 
-typedef void BLOB;
-%typemap(out) const BLOB * {
+typedef void RUBY_BLOB;
+%typemap(out) const RUBY_BLOB * {
   $result = $1 ?
     rb_str_new( (char*)$1, sqlite3_column_bytes( arg1, arg2 ) ) : Qnil;
 }
 
-typedef void VALBLOB;
-%typemap(out) const VALBLOB * {
+typedef void RUBY_VALBLOB;
+%typemap(out) const RUBY_VALBLOB * {
   $result = $1 ? rb_str_new( (char*)$1, sqlite3_value_bytes( arg1 ) ) : Qnil;
 }
 
@@ -160,8 +159,8 @@ typedef void VALBLOB;
 }
 
 %typemap(in) (const char * sql,int,sqlite3_stmt**,const char**) (sqlite3_stmt *stmt, char *errmsg) {
-  $1 = RSTRING($input)->ptr;
-  $2 = RSTRING($input)->len;
+  $1 = RSTRING_PTR($input);
+  $2 = RSTRING_LEN($input);
   $3 = &stmt2;
   $4 = &errmsg2;
 }
@@ -176,8 +175,8 @@ typedef void VALBLOB;
 }
 
 %typemap(in) (const void* sql,int,sqlite3_stmt**,const void**) (sqlite3_stmt *stmt, void *errmsg) {
-  $1 = RSTRING($input)->ptr;
-  $2 = RSTRING($input)->len;
+  $1 = RSTRING_PTR($input);
+  $2 = RSTRING_LEN($input);
   $3 = &stmt2;
   $4 = &errmsg2;
 }
@@ -196,35 +195,35 @@ typedef void VALBLOB;
 }
 
 %typemap(in) (const void *blob,int) {
-  $1 = (void*)RSTRING($input)->ptr;
-  $2 = RSTRING($input)->len;
+  $1 = (void*)RSTRING_PTR($input);
+  $2 = RSTRING_LEN($input);
 }
 
 %typemap(in) (const void *blob,int,void(*free)(void*)) {
-  $1 = (void*)RSTRING($input)->ptr;
-  $2 = RSTRING($input)->len;
+  $1 = (void*)RSTRING_PTR($input);
+  $2 = RSTRING_LEN($input);
   $3 = SQLITE_TRANSIENT;
 }
 
 %typemap(in) (const char *text,int) {
-  $1 = RSTRING($input)->ptr;
-  $2 = RSTRING($input)->len;
+  $1 = RSTRING_PTR($input);
+  $2 = RSTRING_LEN($input);
 }
 
 %typemap(in) (const char *text,int,void(*free)(void*)) {
-  $1 = RSTRING($input)->ptr;
-  $2 = RSTRING($input)->len;
+  $1 = RSTRING_PTR($input);
+  $2 = RSTRING_LEN($input);
   $3 = SQLITE_TRANSIENT;
 }
 
 %typemap(in) (const void *utf16,int) {
-  $1 = (void*)RSTRING($input)->ptr;
-  $2 = RSTRING($input)->len;
+  $1 = (void*)RSTRING_PTR($input);
+  $2 = RSTRING_LEN($input);
 }
 
 %typemap(in) (const void *utf16,int,void(*free)(void*)) {
-  $1 = (void*)RSTRING($input)->ptr;
-  $2 = RSTRING($input)->len;
+  $1 = (void*)RSTRING_PTR($input);
+  $2 = RSTRING_LEN($input);
   $3 = SQLITE_TRANSIENT;
 }
 
@@ -237,7 +236,7 @@ typedef void VALBLOB;
 }
 
 %typemap(in) sqlite_int64 {
-  $1 = rb_big2ll( $input );
+  $1 = rb_num2ll( $input );
 }
 
 %typemap(in) (sqlite3_context*,int data_size) {
@@ -305,7 +304,7 @@ int sqlite3_step(sqlite3_stmt*);
 
 int sqlite3_data_count(sqlite3_stmt*);
 
-const BLOB *sqlite3_column_blob(sqlite3_stmt*,int);
+const RUBY_BLOB *sqlite3_column_blob(sqlite3_stmt*,int);
 int sqlite3_column_bytes(sqlite3_stmt*,int);
 int sqlite3_column_bytes16(sqlite3_stmt*,int);
 double sqlite3_column_double(sqlite3_stmt*,int);
@@ -324,7 +323,7 @@ int sqlite3_create_function16(sqlite3*,const void*str,int,int,void*,void(*func)(
 
 int sqlite3_aggregate_count(sqlite3_context*);
 
-const VALBLOB *sqlite3_value_blob(sqlite3_value*);
+const RUBY_VALBLOB *sqlite3_value_blob(sqlite3_value*);
 int sqlite3_value_bytes(sqlite3_value*);
 int sqlite3_value_bytes16(sqlite3_value*);
 double sqlite3_value_double(sqlite3_value*);

data/ext/sqlite3_api/sqlite3_api_wrap.c

@@ -1063,7 +1063,6 @@ extern "C" {
 
 #include <sqlite3.h>
 #include "ruby.h"
-#include "intern.h"
 
 #define Init_API Init_sqlite3_api
 
@@ -1074,8 +1073,8 @@ struct CallbackData {
 };
 
 typedef struct CallbackData CallbackData;
-typedef void BLOB;
-typedef void VALBLOB;
+typedef void RUBY_BLOB;
+typedef void RUBY_VALBLOB;
 
 int Sqlite3_ruby_busy_handler(void* data,int value) {
   VALUE result;
@@ -1409,7 +1408,7 @@ _wrap_sqlite3_complete16(int argc, VALUE *argv, VALUE self) {
     if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     {
-        arg1 = (void*)RSTRING(argv[0])->ptr;
+        arg1 = (void*)RSTRING_PTR(argv[0]);
     }
     result = (int)sqlite3_complete16((void const *)arg1);
     
@@ -1534,7 +1533,7 @@ _wrap_sqlite3_open16(int argc, VALUE *argv, VALUE self) {
     if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     {
-        arg1 = (void*)RSTRING(argv[0])->ptr;
+        arg1 = (void*)RSTRING_PTR(argv[0]);
         arg2 = (sqlite3**)malloc( sizeof( sqlite3* ) );
     }
     result = (int)sqlite3_open16((void const *)arg1,arg2);
@@ -1624,8 +1623,8 @@ _wrap_sqlite3_prepare(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3, 0);
     {
-        arg2 = RSTRING(argv[1])->ptr;
-        arg3 = RSTRING(argv[1])->len;
+        arg2 = RSTRING_PTR(argv[1]);
+        arg3 = RSTRING_LEN(argv[1]);
         arg4 = &stmt2;
         arg5 = &errmsg2;
     }
@@ -1660,8 +1659,8 @@ _wrap_sqlite3_prepare16(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3, 0);
     {
-        arg2 = RSTRING(argv[1])->ptr;
-        arg3 = RSTRING(argv[1])->len;
+        arg2 = RSTRING_PTR(argv[1]);
+        arg3 = RSTRING_LEN(argv[1]);
         arg4 = &stmt2;
         arg5 = &errmsg2;
     }
@@ -1699,8 +1698,8 @@ _wrap_sqlite3_bind_blob(int argc, VALUE *argv, VALUE self) {
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3_stmt, 0);
     arg2 = NUM2INT(argv[1]);
     {
-        arg3 = (void*)RSTRING(argv[2])->ptr;
-        arg4 = RSTRING(argv[2])->len;
+        arg3 = (void*)RSTRING_PTR(argv[2]);
+        arg4 = RSTRING_LEN(argv[2]);
         arg5 = SQLITE_TRANSIENT;
     }
     result = (int)sqlite3_bind_blob(arg1,arg2,(void const *)arg3,arg4,arg5);
@@ -1763,7 +1762,7 @@ _wrap_sqlite3_bind_int64(int argc, VALUE *argv, VALUE self) {
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3_stmt, 0);
     arg2 = NUM2INT(argv[1]);
     {
-        arg3 = rb_big2ll( argv[2] );
+        arg3 = rb_num2ll( argv[2] );
     }
     result = (int)sqlite3_bind_int64(arg1,arg2,arg3);
     
@@ -1805,8 +1804,8 @@ _wrap_sqlite3_bind_text(int argc, VALUE *argv, VALUE self) {
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3_stmt, 0);
     arg2 = NUM2INT(argv[1]);
     {
-        arg3 = RSTRING(argv[2])->ptr;
-        arg4 = RSTRING(argv[2])->len;
+        arg3 = RSTRING_PTR(argv[2]);
+        arg4 = RSTRING_LEN(argv[2]);
         arg5 = SQLITE_TRANSIENT;
     }
     result = (int)sqlite3_bind_text(arg1,arg2,(char const *)arg3,arg4,arg5);
@@ -1831,8 +1830,8 @@ _wrap_sqlite3_bind_text16(int argc, VALUE *argv, VALUE self) {
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3_stmt, 0);
     arg2 = NUM2INT(argv[1]);
     {
-        arg3 = (void*)RSTRING(argv[2])->ptr;
-        arg4 = RSTRING(argv[2])->len;
+        arg3 = (void*)RSTRING_PTR(argv[2]);
+        arg4 = RSTRING_LEN(argv[2]);
         arg5 = SQLITE_TRANSIENT;
     }
     result = (int)sqlite3_bind_text16(arg1,arg2,(void const *)arg3,arg4,arg5);
@@ -2036,14 +2035,14 @@ static VALUE
 _wrap_sqlite3_column_blob(int argc, VALUE *argv, VALUE self) {
     sqlite3_stmt *arg1 = (sqlite3_stmt *) 0 ;
     int arg2 ;
-    BLOB *result;
+    RUBY_BLOB *result;
     VALUE vresult = Qnil;
     
     if ((argc < 2) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3_stmt, 0);
     arg2 = NUM2INT(argv[1]);
-    result = (BLOB *)sqlite3_column_blob(arg1,arg2);
+    result = (RUBY_BLOB *)sqlite3_column_blob(arg1,arg2);
     
     {
         vresult = result ?
@@ -2286,7 +2285,7 @@ _wrap_sqlite3_create_function16(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 8)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3, 0);
     {
-        arg2 = (void*)RSTRING(argv[1])->ptr;
+        arg2 = (void*)RSTRING_PTR(argv[1]);
     }
     arg3 = NUM2INT(argv[2]);
     arg4 = NUM2INT(argv[3]);
@@ -2320,13 +2319,13 @@ _wrap_sqlite3_aggregate_count(int argc, VALUE *argv, VALUE self) {
 static VALUE
 _wrap_sqlite3_value_blob(int argc, VALUE *argv, VALUE self) {
     sqlite3_value *arg1 = (sqlite3_value *) 0 ;
-    VALBLOB *result;
+    RUBY_VALBLOB *result;
     VALUE vresult = Qnil;
     
     if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3_value, 0);
-    result = (VALBLOB *)sqlite3_value_blob(arg1);
+    result = (RUBY_VALBLOB *)sqlite3_value_blob(arg1);
     
     {
         vresult = result ? rb_str_new( (char*)result, sqlite3_value_bytes( arg1 ) ) : Qnil;
@@ -2528,8 +2527,8 @@ _wrap_sqlite3_result_blob(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3_context, 0);
     {
-        arg2 = (void*)RSTRING(argv[1])->ptr;
-        arg3 = RSTRING(argv[1])->len;
+        arg2 = (void*)RSTRING_PTR(argv[1]);
+        arg3 = RSTRING_LEN(argv[1]);
         arg4 = SQLITE_TRANSIENT;
     }
     sqlite3_result_blob(arg1,(void const *)arg2,arg3,arg4);
@@ -2563,8 +2562,8 @@ _wrap_sqlite3_result_error(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3_context, 0);
     {
-        arg2 = RSTRING(argv[1])->ptr;
-        arg3 = RSTRING(argv[1])->len;
+        arg2 = RSTRING_PTR(argv[1]);
+        arg3 = RSTRING_LEN(argv[1]);
     }
     sqlite3_result_error(arg1,(char const *)arg2,arg3);
     
@@ -2582,8 +2581,8 @@ _wrap_sqlite3_result_error16(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3_context, 0);
     {
-        arg2 = (void*)RSTRING(argv[1])->ptr;
-        arg3 = RSTRING(argv[1])->len;
+        arg2 = (void*)RSTRING_PTR(argv[1]);
+        arg3 = RSTRING_LEN(argv[1]);
     }
     sqlite3_result_error16(arg1,(void const *)arg2,arg3);
     
@@ -2615,7 +2614,7 @@ _wrap_sqlite3_result_int64(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3_context, 0);
     {
-        arg2 = rb_big2ll( argv[1] );
+        arg2 = rb_num2ll( argv[1] );
     }
     sqlite3_result_int64(arg1,arg2);
     
@@ -2634,8 +2633,8 @@ _wrap_sqlite3_result_text(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3_context, 0);
     {
-        arg2 = RSTRING(argv[1])->ptr;
-        arg3 = RSTRING(argv[1])->len;
+        arg2 = RSTRING_PTR(argv[1]);
+        arg3 = RSTRING_LEN(argv[1]);
         arg4 = SQLITE_TRANSIENT;
     }
     sqlite3_result_text(arg1,(char const *)arg2,arg3,arg4);
@@ -2655,8 +2654,8 @@ _wrap_sqlite3_result_text16(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3_context, 0);
     {
-        arg2 = (void*)RSTRING(argv[1])->ptr;
-        arg3 = RSTRING(argv[1])->len;
+        arg2 = (void*)RSTRING_PTR(argv[1]);
+        arg3 = RSTRING_LEN(argv[1]);
         arg4 = SQLITE_TRANSIENT;
     }
     sqlite3_result_text16(arg1,(void const *)arg2,arg3,arg4);
@@ -2676,8 +2675,8 @@ _wrap_sqlite3_result_text16le(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3_context, 0);
     {
-        arg2 = (void*)RSTRING(argv[1])->ptr;
-        arg3 = RSTRING(argv[1])->len;
+        arg2 = (void*)RSTRING_PTR(argv[1]);
+        arg3 = RSTRING_LEN(argv[1]);
         arg4 = SQLITE_TRANSIENT;
     }
     sqlite3_result_text16le(arg1,(void const *)arg2,arg3,arg4);
@@ -2697,8 +2696,8 @@ _wrap_sqlite3_result_text16be(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3_context, 0);
     {
-        arg2 = (void*)RSTRING(argv[1])->ptr;
-        arg3 = RSTRING(argv[1])->len;
+        arg2 = (void*)RSTRING_PTR(argv[1]);
+        arg3 = RSTRING_LEN(argv[1]);
         arg4 = SQLITE_TRANSIENT;
     }
     sqlite3_result_text16be(arg1,(void const *)arg2,arg3,arg4);
@@ -2764,7 +2763,7 @@ static swig_type_info _swigt__p_sqlite3_stmt = {"_p_sqlite3_stmt", "sqlite3_stmt
 static swig_type_info _swigt__p_sqlite3_value = {"_p_sqlite3_value", "sqlite3_value *", 0, 0, 0};
 static swig_type_info _swigt__p_sqlite_int64 = {"_p_sqlite_int64", "sqlite_int64 *", 0, 0, 0};
 static swig_type_info _swigt__p_unsigned_long = {"_p_unsigned_long", "unsigned long *|VALUE *", 0, 0, 0};
-static swig_type_info _swigt__p_void = {"_p_void", "void *|VALBLOB *", 0, 0, 0};
+static swig_type_info _swigt__p_void = {"_p_void", "void *|RUBY_VALBLOB *", 0, 0, 0};
 
 static swig_type_info *swig_type_initial[] = {
   &_swigt__p_CallbackData,