amalgalite 0.15.0-x86-mswin32 → 1.0.0-x86-mswin32

data/{HISTORY → HISTORY.rdoc}

@@ -1,4 +1,18 @@
 = Amalgalite Changelog
+== Version 1.0.0 - 2011-01-16
+
+=== Enhancements
+
+* Update to 1.0.0
+* Update to SQLite 3.7.4
+* Update all runtime and development dependencies to the latest version
+
+=== Bug Fixes
+
+* Fix FasterCSV/CSV compatibility issues with ruby 1.8/1.9 [github issue #4]
+* Fix building issues for Ruby 1.9 [gitHub issue #5]
+* Fix cross compilation problems when using rvm
+
 == Version 0.15.0 - 2010-10-30
 
 === Enhancements
@@ -9,7 +23,7 @@
 
 === Bug Fixes
 
-* Unable to run specs from gem [GH-3]
+* Unable to run specs from gem [GH Issue #3]
 
 == Version 0.12.1 - 2010-02-17
 

data/{README → README.rdoc}

@@ -4,6 +4,7 @@
 * {Rubyforge Project}[http://rubyforge.org/projects/copiousfreetime/]
 * email jeremy at copiousfreetime dot org
 * git clone url git://github.com/copiousfreetime/amalgalite.git
+* {Github}[http://github.com/copiousfreetime/amalgalite/]
 
 == Articles
 
@@ -40,7 +41,7 @@ Amalgalite adds in the following additional non-default SQLite extension(s):
 
 == CHANGES
 
-Read the HISTORY file.
+Read the HISTORY.rdoc file.
 
 == LICENSE
 

data/ext/amalgalite/amalgalite3.c

@@ -81,7 +81,7 @@ VALUE am_sqlite3_set_temp_directory( VALUE self, VALUE new_dir )
     return Qnil;
 }
 
-VALUE amalgalite_format_string( char* pattern, VALUE string )
+VALUE amalgalite_format_string( const char* pattern, VALUE string )
 {
     VALUE to_s= rb_funcall( string, rb_intern("to_s"), 0 );
     VALUE str = StringValue( to_s );

data/ext/amalgalite/amalgalite3_blob.c

@@ -161,7 +161,7 @@ VALUE am_sqlite3_blob_write( VALUE self, VALUE buf )
     am_sqlite3_blob *am_blob;
     int              rc;
     VALUE            str = StringValue( buf );
-    int              n   = RSTRING_LEN( str );
+    int              n   = (int)RSTRING_LEN( str );
     char            *chk_buf = NULL;
 
     Data_Get_Struct(self, am_sqlite3_blob, am_blob);

data/ext/amalgalite/amalgalite3_constants.c

@@ -16,14 +16,76 @@ void Init_amalgalite3_constants( )
      * module encapsulating all the SQLite C extension constants 
      */
     VALUE mC = rb_define_module_under( mas, "Constants");
+    /**
+     * module encapsulating the SQLite3 C extension constants for Config 
+     */
+    VALUE mC_Config = rb_define_module_under(mC, "Config");
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Config, "GETMALLOC", INT2FIX(SQLITE_CONFIG_GETMALLOC));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Config, "GETMUTEX", INT2FIX(SQLITE_CONFIG_GETMUTEX));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Config, "GETPCACHE", INT2FIX(SQLITE_CONFIG_GETPCACHE));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Config, "HEAP", INT2FIX(SQLITE_CONFIG_HEAP));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Config, "LOG", INT2FIX(SQLITE_CONFIG_LOG));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Config, "LOOKASIDE", INT2FIX(SQLITE_CONFIG_LOOKASIDE));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Config, "MALLOC", INT2FIX(SQLITE_CONFIG_MALLOC));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Config, "MEMSTATUS", INT2FIX(SQLITE_CONFIG_MEMSTATUS));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Config, "MULTITHREAD", INT2FIX(SQLITE_CONFIG_MULTITHREAD));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Config, "MUTEX", INT2FIX(SQLITE_CONFIG_MUTEX));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Config, "PAGECACHE", INT2FIX(SQLITE_CONFIG_PAGECACHE));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Config, "PCACHE", INT2FIX(SQLITE_CONFIG_PCACHE));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Config, "SCRATCH", INT2FIX(SQLITE_CONFIG_SCRATCH));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Config, "SERIALIZED", INT2FIX(SQLITE_CONFIG_SERIALIZED));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Config, "SINGLETHREAD", INT2FIX(SQLITE_CONFIG_SINGLETHREAD));
+
     /**
      * module encapsulating the SQLite3 C extension constants for DBStatus 
      */
     VALUE mC_DBStatus = rb_define_module_under(mC, "DBStatus");
 
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_DBStatus, "CACHE_USED", INT2FIX(SQLITE_DBSTATUS_CACHE_USED));
+
     /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
     rb_define_const(mC_DBStatus, "LOOKASIDE_USED", INT2FIX(SQLITE_DBSTATUS_LOOKASIDE_USED));
 
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_DBStatus, "MAX", INT2FIX(SQLITE_DBSTATUS_MAX));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_DBStatus, "SCHEMA_USED", INT2FIX(SQLITE_DBSTATUS_SCHEMA_USED));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_DBStatus, "STMT_USED", INT2FIX(SQLITE_DBSTATUS_STMT_USED));
+
     /**
      * module encapsulating the SQLite3 C extension constants for DataType 
      */
@@ -49,15 +111,60 @@ void Init_amalgalite3_constants( )
      */
     VALUE mC_Open = rb_define_module_under(mC, "Open");
 
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Open, "AUTOPROXY", INT2FIX(SQLITE_OPEN_AUTOPROXY));
+
     /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
     rb_define_const(mC_Open, "CREATE", INT2FIX(SQLITE_OPEN_CREATE));
 
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Open, "DELETEONCLOSE", INT2FIX(SQLITE_OPEN_DELETEONCLOSE));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Open, "EXCLUSIVE", INT2FIX(SQLITE_OPEN_EXCLUSIVE));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Open, "FULLMUTEX", INT2FIX(SQLITE_OPEN_FULLMUTEX));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Open, "MAIN_DB", INT2FIX(SQLITE_OPEN_MAIN_DB));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Open, "MAIN_JOURNAL", INT2FIX(SQLITE_OPEN_MAIN_JOURNAL));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Open, "MASTER_JOURNAL", INT2FIX(SQLITE_OPEN_MASTER_JOURNAL));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Open, "NOMUTEX", INT2FIX(SQLITE_OPEN_NOMUTEX));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Open, "PRIVATECACHE", INT2FIX(SQLITE_OPEN_PRIVATECACHE));
+
     /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
     rb_define_const(mC_Open, "READONLY", INT2FIX(SQLITE_OPEN_READONLY));
 
     /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
     rb_define_const(mC_Open, "READWRITE", INT2FIX(SQLITE_OPEN_READWRITE));
 
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Open, "SHAREDCACHE", INT2FIX(SQLITE_OPEN_SHAREDCACHE));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Open, "SUBJOURNAL", INT2FIX(SQLITE_OPEN_SUBJOURNAL));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Open, "TEMP_DB", INT2FIX(SQLITE_OPEN_TEMP_DB));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Open, "TEMP_JOURNAL", INT2FIX(SQLITE_OPEN_TEMP_JOURNAL));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Open, "TRANSIENT_DB", INT2FIX(SQLITE_OPEN_TRANSIENT_DB));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Open, "WAL", INT2FIX(SQLITE_OPEN_WAL));
+
     /**
      * module encapsulating the SQLite3 C extension constants for ResultCode 
      */
@@ -72,9 +179,15 @@ void Init_amalgalite3_constants( )
     /*  5 -- The database file is locked */
     rb_define_const(mC_ResultCode, "BUSY", INT2FIX(SQLITE_BUSY));
 
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_ResultCode, "BUSY_RECOVERY", INT2FIX(SQLITE_BUSY_RECOVERY));
+
     /*  14 -- Unable to open the database file */
     rb_define_const(mC_ResultCode, "CANTOPEN", INT2FIX(SQLITE_CANTOPEN));
 
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_ResultCode, "CANTOPEN_NOTEMPDIR", INT2FIX(SQLITE_CANTOPEN_NOTEMPDIR));
+
     /*  19 -- Abort due to constraint violation */
     rb_define_const(mC_ResultCode, "CONSTRAINT", INT2FIX(SQLITE_CONSTRAINT));
 
@@ -105,12 +218,24 @@ void Init_amalgalite3_constants( )
     /*  10 -- Some kind of disk I/O error occurred */
     rb_define_const(mC_ResultCode, "IOERR", INT2FIX(SQLITE_IOERR));
 
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_ResultCode, "IOERR_ACCESS", INT2FIX(SQLITE_IOERR_ACCESS));
+
     /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
     rb_define_const(mC_ResultCode, "IOERR_BLOCKED", INT2FIX(SQLITE_IOERR_BLOCKED));
 
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_ResultCode, "IOERR_CHECKRESERVEDLOCK", INT2FIX(SQLITE_IOERR_CHECKRESERVEDLOCK));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_ResultCode, "IOERR_CLOSE", INT2FIX(SQLITE_IOERR_CLOSE));
+
     /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
     rb_define_const(mC_ResultCode, "IOERR_DELETE", INT2FIX(SQLITE_IOERR_DELETE));
 
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_ResultCode, "IOERR_DIR_CLOSE", INT2FIX(SQLITE_IOERR_DIR_CLOSE));
+
     /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
     rb_define_const(mC_ResultCode, "IOERR_DIR_FSYNC", INT2FIX(SQLITE_IOERR_DIR_FSYNC));
 
@@ -120,6 +245,9 @@ void Init_amalgalite3_constants( )
     /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
     rb_define_const(mC_ResultCode, "IOERR_FSYNC", INT2FIX(SQLITE_IOERR_FSYNC));
 
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_ResultCode, "IOERR_LOCK", INT2FIX(SQLITE_IOERR_LOCK));
+
     /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
     rb_define_const(mC_ResultCode, "IOERR_NOMEM", INT2FIX(SQLITE_IOERR_NOMEM));
 
@@ -129,6 +257,15 @@ void Init_amalgalite3_constants( )
     /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
     rb_define_const(mC_ResultCode, "IOERR_READ", INT2FIX(SQLITE_IOERR_READ));
 
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_ResultCode, "IOERR_SHMLOCK", INT2FIX(SQLITE_IOERR_SHMLOCK));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_ResultCode, "IOERR_SHMOPEN", INT2FIX(SQLITE_IOERR_SHMOPEN));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_ResultCode, "IOERR_SHMSIZE", INT2FIX(SQLITE_IOERR_SHMSIZE));
+
     /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
     rb_define_const(mC_ResultCode, "IOERR_SHORT_READ", INT2FIX(SQLITE_IOERR_SHORT_READ));
 
@@ -144,6 +281,9 @@ void Init_amalgalite3_constants( )
     /*  6 -- A table in the database is locked */
     rb_define_const(mC_ResultCode, "LOCKED", INT2FIX(SQLITE_LOCKED));
 
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_ResultCode, "LOCKED_SHAREDCACHE", INT2FIX(SQLITE_LOCKED_SHAREDCACHE));
+
     /*  20 -- Data type mismatch */
     rb_define_const(mC_ResultCode, "MISMATCH", INT2FIX(SQLITE_MISMATCH));
 
@@ -186,11 +326,28 @@ void Init_amalgalite3_constants( )
     /*  18 -- String or BLOB exceeds size limit */
     rb_define_const(mC_ResultCode, "TOOBIG", INT2FIX(SQLITE_TOOBIG));
 
+    /**
+     * module encapsulating the SQLite3 C extension constants for StatementStatus 
+     */
+    VALUE mC_StatementStatus = rb_define_module_under(mC, "StatementStatus");
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_StatementStatus, "AUTOINDEX", INT2FIX(SQLITE_STMTSTATUS_AUTOINDEX));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_StatementStatus, "FULLSCAN_STEP", INT2FIX(SQLITE_STMTSTATUS_FULLSCAN_STEP));
+
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_StatementStatus, "SORT", INT2FIX(SQLITE_STMTSTATUS_SORT));
+
     /**
      * module encapsulating the SQLite3 C extension constants for Status 
      */
     VALUE mC_Status = rb_define_module_under(mC, "Status");
 
+    /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
+    rb_define_const(mC_Status, "MALLOC_COUNT", INT2FIX(SQLITE_STATUS_MALLOC_COUNT));
+
     /* no meaningful autogenerated documentation -- constant is self explanatory ?*/
     rb_define_const(mC_Status, "MALLOC_SIZE", INT2FIX(SQLITE_STATUS_MALLOC_SIZE));
 

data/ext/amalgalite/amalgalite3_database.c

@@ -282,7 +282,7 @@ VALUE am_sqlite3_database_prepare(VALUE self, VALUE rSQL)
     Data_Get_Struct(self, am_sqlite3, am_db);
 
     Data_Get_Struct(stmt, am_sqlite3_stmt, am_stmt);
-    rc = sqlite3_prepare_v2( am_db->db, RSTRING_PTR(sql), RSTRING_LEN(sql),
+    rc = sqlite3_prepare_v2( am_db->db, RSTRING_PTR(sql), (int)RSTRING_LEN(sql),
                             &(am_stmt->stmt), &tail);
     if ( SQLITE_OK != rc) {
         rb_raise(eAS_Error, "Failure to prepare statement %s : [SQLITE_ERROR %d] : %s\n",
@@ -445,7 +445,7 @@ void amalgalite_set_context_result( sqlite3_context* context, VALUE result )
             sqlite3_result_int64( context, 0);
             break;
         case T_STRING:
-            sqlite3_result_text( context, RSTRING_PTR(result), RSTRING_LEN(result), NULL);
+            sqlite3_result_text( context, RSTRING_PTR(result), (int)RSTRING_LEN(result), NULL);
             break;
         default:
             sqlite3_result_error( context, "Unable to convert ruby object to an SQL function result", -1 );
@@ -652,7 +652,7 @@ void amalgalite_xFunc( sqlite3_context* context, int argc, sqlite3_value** argv
     /* check the results */
     if ( state ) {
         VALUE msg = ERROR_INFO_MESSAGE();
-        sqlite3_result_error( context, RSTRING_PTR(msg), RSTRING_LEN(msg) );
+        sqlite3_result_error( context, RSTRING_PTR(msg), (int)RSTRING_LEN(msg) );
     } else {
         amalgalite_set_context_result( context, result );
     }
@@ -771,7 +771,7 @@ void amalgalite_xStep( sqlite3_context* context, int argc, sqlite3_value** argv
         rb_gc_register_address( aggregate_context );
         if ( state ) {
             VALUE msg = ERROR_INFO_MESSAGE();
-            sqlite3_result_error( context, RSTRING_PTR(msg), RSTRING_LEN(msg));
+            sqlite3_result_error( context, RSTRING_PTR(msg), (int)RSTRING_LEN(msg));
             rb_iv_set( *aggregate_context, "@_exception", rb_gv_get("$!" ));
             return;
         } else {
@@ -797,7 +797,7 @@ void amalgalite_xStep( sqlite3_context* context, int argc, sqlite3_value** argv
     /* check the results, if there is an error, set the @exception ivar */
     if ( state ) {
         VALUE msg = ERROR_INFO_MESSAGE();
-        sqlite3_result_error( context, RSTRING_PTR(msg), RSTRING_LEN(msg));
+        sqlite3_result_error( context, RSTRING_PTR(msg), (int)RSTRING_LEN(msg));
         rb_iv_set( *aggregate_context, "@_exception", rb_gv_get("$!" ));
     }
 
@@ -832,13 +832,13 @@ void amalgalite_xFinal( sqlite3_context* context )
         /* check the results */
         if ( state ) {
             VALUE msg = ERROR_INFO_MESSAGE();
-            sqlite3_result_error( context, RSTRING_PTR(msg), RSTRING_LEN(msg) );
+            sqlite3_result_error( context, RSTRING_PTR(msg), (int)RSTRING_LEN(msg) );
         } else {
             amalgalite_set_context_result( context, result );
         }
     } else {
         VALUE msg = rb_obj_as_string( exception );
-        sqlite3_result_error( context, RSTRING_PTR(msg), RSTRING_LEN(msg) );
+        sqlite3_result_error( context, RSTRING_PTR(msg), (int)RSTRING_LEN(msg) );
     }
 
 

data/ext/amalgalite/amalgalite3_requires_bootstrap.c

@@ -14,18 +14,17 @@ VALUE eARB_Error;
 
 /* 
  * cleanup the datatbase and statment values if they are currently open and then
- * raise the message.  It converts the error message to a String so that the C
- * string can be free'd and then raise with a ruby object in the hopes that
- * there is no memory leak from the C allocation.
+ * raise the message.  It is assumed that the *msg pointer passed in is NOT
+ * allocated via malloc() or the like.  It should be a local static buffer
+ * that we do not have to worry about freeing.
  */
-void am_bootstrap_cleanup_and_raise( char* msg, sqlite3* db, sqlite3_stmt* stmt )
+void am_bootstrap_cleanup_and_raise( const char* msg, sqlite3* db, sqlite3_stmt* stmt )
 {
 
     if ( NULL != stmt ) { sqlite3_finalize( stmt ); stmt = NULL; }
     if ( NULL != db   ) { sqlite3_close( db ); }
 
-    free( msg );
-    rb_raise(eARB_Error, msg );
+    rb_raise(eARB_Error, "%s", msg );
 }
 
 
@@ -68,13 +67,13 @@ VALUE am_bootstrap_lift( VALUE self, VALUE args )
     int  last_row_good; 
     char raise_msg[BUFSIZ];
 
-    VALUE     am_db_c     = rb_const_get( cARB, rb_intern("DEFAULT_DB") );
-    VALUE    am_tbl_c     = rb_const_get( cARB, rb_intern("DEFAULT_BOOTSTRAP_TABLE") );
-    VALUE     am_pk_c     = rb_const_get( cARB, rb_intern("DEFAULT_ROWID_COLUMN") );
-    VALUE  am_fname_c     = rb_const_get( cARB, rb_intern("DEFAULT_FILENAME_COLUMN") );
-    VALUE am_content_c    = rb_const_get( cARB, rb_intern("DEFAULT_CONTENTS_COLUMN") );
+    VALUE     am_db_c  = rb_const_get( cARB, rb_intern("DEFAULT_DB") );
+    VALUE    am_tbl_c  = rb_const_get( cARB, rb_intern("DEFAULT_BOOTSTRAP_TABLE") );
+    VALUE     am_pk_c  = rb_const_get( cARB, rb_intern("DEFAULT_ROWID_COLUMN") );
+    VALUE  am_fname_c  = rb_const_get( cARB, rb_intern("DEFAULT_FILENAME_COLUMN") );
+    VALUE am_content_c = rb_const_get( cARB, rb_intern("DEFAULT_CONTENTS_COLUMN") );
 
-    char*     dbfile = NULL;
+    char*      dbfile = NULL;
     char*    tbl_name = NULL;
     char*      pk_col = NULL;
     char*   fname_col = NULL;

data/ext/amalgalite/amalgalite3_statement.c

@@ -43,7 +43,7 @@ VALUE am_sqlite3_statement_bind_zeroblob( VALUE self, VALUE position, VALUE leng
 {
     am_sqlite3_stmt  *am_stmt;
     int               pos = FIX2INT( position );
-    int               n = FIX2INT( length );
+    int               n = (int)FIX2INT( length );
     int               rc;
 
     Data_Get_Struct(self, am_sqlite3_stmt, am_stmt);
@@ -73,7 +73,7 @@ VALUE am_sqlite3_statement_bind_blob( VALUE self, VALUE position, VALUE blob )
     int               rc;
 
     Data_Get_Struct(self, am_sqlite3_stmt, am_stmt);
-    rc = sqlite3_bind_blob( am_stmt->stmt, pos, RSTRING_PTR( str ), RSTRING_LEN( str ), SQLITE_TRANSIENT);
+    rc = sqlite3_bind_blob( am_stmt->stmt, pos, RSTRING_PTR( str ), (int)RSTRING_LEN( str ), SQLITE_TRANSIENT);
     if ( SQLITE_OK != rc ) {
         rb_raise(eAS_Error, "Error binding blob at position %d in statement: [SQLITE_ERROR %d] : %s\n",
                 pos,
@@ -173,7 +173,7 @@ VALUE am_sqlite3_statement_bind_text(VALUE self, VALUE position, VALUE value)
     int               rc;
 
     Data_Get_Struct(self, am_sqlite3_stmt, am_stmt);
-    rc = sqlite3_bind_text( am_stmt->stmt, pos, RSTRING_PTR(str), RSTRING_LEN(str), SQLITE_TRANSIENT);
+    rc = sqlite3_bind_text( am_stmt->stmt, pos, RSTRING_PTR(str), (int)RSTRING_LEN(str), SQLITE_TRANSIENT);
     if ( SQLITE_OK != rc ) {
         rb_raise(eAS_Error, "Error binding [%s] to text at position %d in statement: [SQLITE_ERROR %d] : %s\n",
                 RSTRING_PTR(str), pos,

data/ext/amalgalite/extconf.rb

@@ -1,36 +1,33 @@
 require 'mkmf'
 require 'rbconfig'
 
+# used by the ext:build_win-1.x.x tasks, really no one else but jeremy should be
+# using this hack
+$ruby = ARGV.shift if ARGV[0]
+
 # make available table and column meta data api
 $CFLAGS += " -DSQLITE_ENABLE_COLUMN_METADATA=1"  
 $CFLAGS += " -DSQLITE_ENABLE_RTREE=1"
 
 # we compile sqlite the same way that the installation of ruby is compiled.
-if Config::CONFIG['configure_args'].include?( "--enable-pthread" ) then
+if RbConfig::MAKEFILE_CONFIG['configure_args'].include?( "--enable-pthread" ) then
   $CFLAGS += " -DSQLITE_THREADSAFE=1"
 else
   $CFLAGS += " -DSQLITE_THREADSAFE=0"
 end
 
-# remove the -g if it exists
-$CFLAGS = $CFLAGS.gsub(/-g/,'')
-
-# remove -Wall if it exists
-$CFLAGS = $CFLAGS.gsub(/-Wall/,'')
-#$CFLAGS += " -Wall"
-
-# there are issues with the mingw compiler and compiling sqlite with debugging
-# on.  You will get lots of warnings of the sort 
-#
-#   Warning: .stabs: description field '16274' too big, try a different debug format
-#
-# it appears to be a known issue and has no affect on the normal usage of sqlite
-#
-# warnflags and debugflags appear to be 1.9 constructs
-#
-if CONFIG['arch'] =~ /(mswin|mingw)/i then
-  CONFIG['debugflags'] = CONFIG['debugflags'].gsub(/-g/,'') if CONFIG['debugflags']
-  CONFIG['warnflags'] = CONFIG['warnflags'].gsub(/-Wall/,'') if CONFIG['warnflags']
+# remove the -g flags  if it exists
+%w[ -ggdb -g ].each do |debug|
+  $CFLAGS = $CFLAGS.gsub(/#{debug}/,'')
+  RbConfig::MAKEFILE_CONFIG['debugflags'] = Config::MAKEFILE_CONFIG['debugflags'].gsub(/#{debug}/,'')   if Config::MAKEFILE_CONFIG['debugflags']
+end
+
+%w[ shorten-64-to-32 write-strings ].each do |warning|
+  $CFLAGS = $CFLAGS.gsub(/-W#{warning}/,'')
+  Config::MAKEFILE_CONFIG['warnflags'] = Config::MAKEFILE_CONFIG['warnflags'].gsub(/-W#{warning}/,'') if Config::MAKEFILE_CONFIG['warnflags'] 
 end
+
+
+
 subdir = RUBY_VERSION.sub(/\.\d$/,'')
 create_makefile("amalgalite/#{subdir}/amalgalite3")