do_sqlite3 0.10.1.1-x86-mswin32-60 → 0.10.2-x86-mswin32-60

data/ChangeLog.markdown

@@ -1,4 +1,7 @@
-## 0.10.2 (unreleased, in git)
+## 0.10.2 2010-05-19
+* Make Encoding.default_internal aware
+* Rework logging for making callbacks possible
+* Remove handling Object types directly
 
 ## 0.10.1.1 2010-01-24
 

data/Rakefile

@@ -11,7 +11,7 @@ JRUBY    = RUBY_PLATFORM =~ /java/
 IRONRUBY = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ironruby'
 WINDOWS  = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i)
 SUDO     = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])
-BINARY_VERSION = '3_6_21'
+BINARY_VERSION = '3_6_23_1'
 
 CLEAN.include(%w[ {tmp,pkg}/ **/*.{o,so,bundle,jar,log,a,gem,dSYM,obj,pdb,exp,DS_Store,rbc,db} ext/do_sqlite3/Makefile ext-java/target ])
 
@@ -35,7 +35,7 @@ begin
     # and modify dependencies and extensions appropriately
     gem.extensions << 'ext/do_sqlite3/extconf.rb'
 
-    gem.add_dependency 'data_objects', '0.10.1'
+    gem.add_dependency 'data_objects', DataObjects::Sqlite3::VERSION
 
     gem.add_development_dependency 'bacon',         '~>1.1'
     gem.add_development_dependency 'rake-compiler', '~>0.7'

data/ext/do_sqlite3/do_sqlite3.c

@@ -1,69 +1,13 @@
-#include <ruby.h>
-#include <string.h>
-#include <math.h>
-#include <time.h>
-#include <locale.h>
-#include <sqlite3.h>
-#include "compat.h"
+#include "do_sqlite3.h"
 #include "error.h"
-
-#ifdef HAVE_RUBY_ENCODING_H
-#include <ruby/encoding.h>
-
-#define DO_STR_NEW2(str, encoding) \
-  ({ \
-    VALUE _string = rb_str_new2((const char *)str); \
-    if(encoding != -1) { \
-      rb_enc_associate_index(_string, encoding); \
-    } \
-    _string; \
-  })
-
-#define DO_STR_NEW(str, len, encoding) \
-  ({ \
-    VALUE _string = rb_str_new((const char *)str, (long)len); \
-    if(encoding != -1) { \
-      rb_enc_associate_index(_string, encoding); \
-    } \
-    _string; \
-  })
-
-#else
-
-#define DO_STR_NEW2(str, encoding) \
-  rb_str_new2((const char *)str)
-
-#define DO_STR_NEW(str, len, encoding) \
-  rb_str_new((const char *)str, (long)len)
-#endif
-
-
-#define ID_CONST_GET rb_intern("const_get")
-#define ID_PATH rb_intern("path")
-#define ID_NEW rb_intern("new")
-#define ID_ESCAPE rb_intern("escape_sql")
-#define ID_QUERY rb_intern("query")
-
-#define RUBY_CLASS(name) rb_const_get(rb_cObject, rb_intern(name))
-#define CONST_GET(scope, constant) (rb_funcall(scope, ID_CONST_GET, 1, rb_str_new2(constant)))
-#define SQLITE3_CLASS(klass, parent) (rb_define_class_under(mSqlite3, klass, parent))
-
-#ifdef _WIN32
-#define do_int64 signed __int64
-#else
-#define do_int64 signed long long int
-#endif
-
-#ifndef HAVE_SQLITE3_PREPARE_V2
-#define sqlite3_prepare_v2 sqlite3_prepare
-#endif
-
 // To store rb_intern values
+
+static ID ID_NEW;
 static ID ID_NEW_DATE;
+static ID ID_CONST_GET;
 static ID ID_RATIONAL;
-static ID ID_LOGGER;
-static ID ID_DEBUG;
-static ID ID_LEVEL;
+static ID ID_ESCAPE;
+static ID ID_LOG;
 
 static VALUE mExtlib;
 
@@ -73,6 +17,8 @@ static VALUE cDO_Connection;
 static VALUE cDO_Command;
 static VALUE cDO_Result;
 static VALUE cDO_Reader;
+static VALUE cDO_Logger;
+static VALUE cDO_Logger_Message;
 
 static VALUE rb_cDate;
 static VALUE rb_cDateTime;
@@ -84,8 +30,6 @@ static VALUE cConnection;
 static VALUE cCommand;
 static VALUE cResult;
 static VALUE cReader;
-
-static VALUE eArgumentError;
 static VALUE eConnectionError;
 static VALUE eDataError;
 
@@ -120,28 +64,16 @@ static int jd_from_date(int year, int month, int day) {
   return (int) (floor(365.25 * (year + 4716)) + floor(30.6001 * (month + 1)) + day + b - 1524);
 }
 
-static void data_objects_debug(VALUE string, struct timeval* start) {
+static void data_objects_debug(VALUE connection, VALUE string, struct timeval* start) {
   struct timeval stop;
-  char *message;
-
-  const char *query = rb_str_ptr_readonly(string);
-  size_t length     = rb_str_len(string);
-  char total_time[32];
-  do_int64 duration = 0;
-
-  VALUE logger = rb_funcall(mSqlite3, ID_LOGGER, 0);
-  int log_level = NUM2INT(rb_funcall(logger, ID_LEVEL, 0));
+  VALUE message;
 
-  if (0 == log_level) {
-    gettimeofday(&stop, NULL);
+  gettimeofday(&stop, NULL);
+  do_int64 duration = (stop.tv_sec - start->tv_sec) * 1000000 + stop.tv_usec - start->tv_usec;
 
-    duration = (stop.tv_sec - start->tv_sec) * 1000000 + stop.tv_usec - start->tv_usec;
+  message = rb_funcall(cDO_Logger_Message, ID_NEW, 3, string, rb_time_new(start->tv_sec, start->tv_usec), INT2NUM(duration));
 
-    snprintf(total_time, 32, "%.6f", duration / 1000000.0);
-    message = (char *)calloc(length + strlen(total_time) + 4, sizeof(char));
-    snprintf(message, length + strlen(total_time) + 4, "(%s) %s", total_time, query);
-    rb_funcall(logger, ID_DEBUG, 1, rb_str_new(message, length + strlen(total_time) + 3));
-  }
+  rb_funcall(connection, ID_LOG, 1, message);
 }
 
 static void raise_error(VALUE self, sqlite3 *result, VALUE query) {
@@ -330,6 +262,12 @@ static VALUE typecast(sqlite3_stmt *stmt, int i, VALUE type, int encoding) {
     return ruby_value;
   }
 
+#ifdef HAVE_RUBY_ENCODING_H
+  rb_encoding * internal_encoding = rb_default_internal_encoding();
+#else
+  void * internal_encoding = NULL;
+#endif
+
   if(type == Qnil) {
     switch(original_type) {
       case SQLITE_INTEGER: {
@@ -354,7 +292,7 @@ static VALUE typecast(sqlite3_stmt *stmt, int i, VALUE type, int encoding) {
   if (type == rb_cInteger) {
     return LL2NUM(sqlite3_column_int64(stmt, i));
   } else if (type == rb_cString) {
-    return DO_STR_NEW((char*)sqlite3_column_text(stmt, i), length, encoding);
+    return DO_STR_NEW((char*)sqlite3_column_text(stmt, i), length, encoding, internal_encoding);
   } else if (type == rb_cFloat) {
     return rb_float_new(sqlite3_column_double(stmt, i));
   } else if (type == rb_cBigDecimal) {
@@ -371,12 +309,10 @@ static VALUE typecast(sqlite3_stmt *stmt, int i, VALUE type, int encoding) {
     return rb_funcall(rb_cByteArray, ID_NEW, 1, rb_str_new((char*)sqlite3_column_blob(stmt, i), length));
   } else if (type == rb_cClass) {
     return rb_funcall(mDO, rb_intern("full_const_get"), 1, rb_str_new((char*)sqlite3_column_text(stmt, i), length));
-  } else if (type == rb_cObject) {
-    return rb_marshal_load(rb_str_new((char*)sqlite3_column_text(stmt, i), length));
   } else if (type == rb_cNilClass) {
     return Qnil;
   } else {
-    return DO_STR_NEW((char*)sqlite3_column_text(stmt, i), length, encoding);
+    return DO_STR_NEW((char*)sqlite3_column_text(stmt, i), length, encoding, internal_encoding);
   }
 }
 
@@ -385,7 +321,7 @@ static VALUE typecast(sqlite3_stmt *stmt, int i, VALUE type, int encoding) {
 #define FLAG_PRESENT(query_values, flag) !NIL_P(rb_hash_aref(query_values, flag))
 
 static int flags_from_uri(VALUE uri) {
-  VALUE query_values = rb_funcall(uri, ID_QUERY, 0);
+  VALUE query_values = rb_funcall(uri, rb_intern("query"), 0);
 
   int flags = 0;
 
@@ -425,7 +361,7 @@ static VALUE cConnection_initialize(VALUE self, VALUE uri) {
   VALUE path;
   sqlite3 *db;
 
-  path = rb_funcall(uri, ID_PATH, 0);
+  path = rb_funcall(uri, rb_intern("path"), 0);
 
 #ifdef HAVE_SQLITE3_OPEN_V2
   ret = sqlite3_open_v2(rb_str_ptr_readonly(path), &db, flags_from_uri(uri), 0);
@@ -488,11 +424,11 @@ static VALUE cCommand_set_types(int argc, VALUE *argv, VALUE self) {
         if(TYPE(sub_entry) == T_CLASS) {
           rb_ary_push(type_strings, sub_entry);
         } else {
-          rb_raise(eArgumentError, "Invalid type given");
+          rb_raise(rb_eArgError, "Invalid type given");
         }
       }
     } else {
-      rb_raise(eArgumentError, "Invalid type given");
+      rb_raise(rb_eArgError, "Invalid type given");
     }
   }
 
@@ -570,7 +506,7 @@ static VALUE cCommand_execute_non_query(int argc, VALUE *argv, VALUE self) {
   if ( status != SQLITE_OK ) {
     raise_error(self, db, query);
   }
-  data_objects_debug(query, &start);
+  data_objects_debug(connection, query, &start);
 
   affected_rows = sqlite3_changes(db);
   insert_id = sqlite3_last_insert_rowid(db);
@@ -602,7 +538,7 @@ static VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
 
   gettimeofday(&start, NULL);
   status = sqlite3_prepare_v2(db, rb_str_ptr_readonly(query), -1, &sqlite3_reader, 0);
-  data_objects_debug(query, &start);
+  data_objects_debug(connection, query, &start);
 
   if ( status != SQLITE_OK ) {
     raise_error(self, db, query);
@@ -624,7 +560,7 @@ static VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
     // Whoops...  wrong number of types passed to set_types.  Close the reader and raise
     // and error
     rb_funcall(reader, rb_intern("close"), 0);
-    rb_raise(eArgumentError, "Field-count mismatch. Expected %ld fields, but the query yielded %d", RARRAY_LEN(field_types), field_count);
+    rb_raise(rb_eArgError, "Field-count mismatch. Expected %ld fields, but the query yielded %d", RARRAY_LEN(field_types), field_count);
   }
 
   for ( i = 0; i < field_count; i++ ) {
@@ -720,13 +656,14 @@ static VALUE cReader_field_count(VALUE self) {
 void Init_do_sqlite3() {
   rb_require("bigdecimal");
   rb_require("date");
+  rb_require("data_objects");
 
-  // Get references classes needed for Date/Time parsing
-  rb_cDate = RUBY_CLASS("Date");
-  rb_cDateTime = RUBY_CLASS( "DateTime");
-  rb_cBigDecimal = RUBY_CLASS("BigDecimal");
+  ID_CONST_GET = rb_intern("const_get");
 
-  rb_funcall(rb_mKernel, rb_intern("require"), 1, rb_str_new2("data_objects"));
+  // Get references classes needed for Date/Time parsing
+  rb_cDate = CONST_GET(rb_mKernel, "Date");
+  rb_cDateTime = CONST_GET(rb_mKernel, "DateTime");
+  rb_cBigDecimal = CONST_GET(rb_mKernel, "BigDecimal");
 
 #ifdef RUBY_LESS_THAN_186
   ID_NEW_DATE = rb_intern("new0");
@@ -734,9 +671,9 @@ void Init_do_sqlite3() {
   ID_NEW_DATE = rb_intern("new!");
 #endif
   ID_RATIONAL = rb_intern("Rational");
-  ID_LOGGER = rb_intern("logger");
-  ID_DEBUG = rb_intern("debug");
-  ID_LEVEL = rb_intern("level");
+  ID_NEW = rb_intern("new");
+  ID_ESCAPE = rb_intern("escape_sql");
+  ID_LOG = rb_intern("log");
 
   // Get references to the Extlib module
   mExtlib = CONST_GET(rb_mKernel, "Extlib");
@@ -749,15 +686,16 @@ void Init_do_sqlite3() {
   cDO_Command = CONST_GET(mDO, "Command");
   cDO_Result = CONST_GET(mDO, "Result");
   cDO_Reader = CONST_GET(mDO, "Reader");
+  cDO_Logger = CONST_GET(mDO, "Logger");
+  cDO_Logger_Message = CONST_GET(cDO_Logger, "Message");
 
   // Initialize the DataObjects::Sqlite3 module, and define its classes
   mSqlite3 = rb_define_module_under(mDO, "Sqlite3");
 
-  eArgumentError = CONST_GET(rb_mKernel, "ArgumentError");
   eConnectionError = CONST_GET(mDO, "ConnectionError");
   eDataError = CONST_GET(mDO, "DataError");
 
-  cConnection = SQLITE3_CLASS("Connection", cDO_Connection);
+  cConnection = DRIVER_CLASS("Connection", cDO_Connection);
   rb_define_method(cConnection, "initialize", cConnection_initialize, 1);
   rb_define_method(cConnection, "dispose", cConnection_dispose, 0);
   rb_define_method(cConnection, "quote_boolean", cConnection_quote_boolean, 1);
@@ -765,20 +703,41 @@ void Init_do_sqlite3() {
   rb_define_method(cConnection, "quote_byte_array", cConnection_quote_byte_array, 1);
   rb_define_method(cConnection, "character_set", cConnection_character_set, 0);
 
-  cCommand = SQLITE3_CLASS("Command", cDO_Command);
+  cCommand = DRIVER_CLASS("Command", cDO_Command);
   rb_define_method(cCommand, "set_types", cCommand_set_types, -1);
   rb_define_method(cCommand, "execute_non_query", cCommand_execute_non_query, -1);
   rb_define_method(cCommand, "execute_reader", cCommand_execute_reader, -1);
 
-  cResult = SQLITE3_CLASS("Result", cDO_Result);
+  cResult = DRIVER_CLASS("Result", cDO_Result);
 
-  cReader = SQLITE3_CLASS("Reader", cDO_Reader);
+  cReader = DRIVER_CLASS("Reader", cDO_Reader);
   rb_define_method(cReader, "close", cReader_close, 0);
   rb_define_method(cReader, "next!", cReader_next, 0);
   rb_define_method(cReader, "values", cReader_values, 0);
   rb_define_method(cReader, "fields", cReader_fields, 0);
   rb_define_method(cReader, "field_count", cReader_field_count, 0);
 
+  rb_global_variable(&ID_NEW_DATE);
+  rb_global_variable(&ID_RATIONAL);
+  rb_global_variable(&ID_CONST_GET);
+  rb_global_variable(&ID_ESCAPE);
+  rb_global_variable(&ID_LOG);
+  rb_global_variable(&ID_NEW);
+
+  rb_global_variable(&rb_cDate);
+  rb_global_variable(&rb_cDateTime);
+  rb_global_variable(&rb_cBigDecimal);
+  rb_global_variable(&rb_cByteArray);
+
+  rb_global_variable(&mDO);
+  rb_global_variable(&cDO_Logger_Message);
+
+  rb_global_variable(&cResult);
+  rb_global_variable(&cReader);
+
+  rb_global_variable(&eConnectionError);
+  rb_global_variable(&eDataError);
+
   OPEN_FLAG_READONLY = rb_str_new2("read_only");
   rb_global_variable(&OPEN_FLAG_READONLY);
   OPEN_FLAG_READWRITE = rb_str_new2("read_write");
@@ -790,4 +749,5 @@ void Init_do_sqlite3() {
   OPEN_FLAG_FULL_MUTEX = rb_str_new2("full_mutex");
   rb_global_variable(&OPEN_FLAG_FULL_MUTEX);
 
+  Init_do_sqlite3_extension();
 }

data/ext/do_sqlite3/do_sqlite3.h

@@ -0,0 +1,65 @@
+#ifndef DO_SQLITE3_H
+#define DO_SQLITE3_H
+
+#include <ruby.h>
+#include <string.h>
+#include <math.h>
+#include <time.h>
+#include <locale.h>
+#include <sqlite3.h>
+#include "compat.h"
+
+#ifdef HAVE_RUBY_ENCODING_H
+#include <ruby/encoding.h>
+
+#define DO_STR_NEW2(str, encoding, internal_encoding) \
+  ({ \
+    VALUE _string = rb_str_new2((const char *)str); \
+    if(encoding != -1) { \
+      rb_enc_associate_index(_string, encoding); \
+    } \
+    if(internal_encoding) { \
+      _string = rb_str_export_to_enc(_string, internal_encoding); \
+    } \
+    _string; \
+  })
+
+#define DO_STR_NEW(str, len, encoding, internal_encoding) \
+  ({ \
+    VALUE _string = rb_str_new((const char *)str, (long)len); \
+    if(encoding != -1) { \
+      rb_enc_associate_index(_string, encoding); \
+    } \
+    if(internal_encoding) { \
+      _string = rb_str_export_to_enc(_string, internal_encoding); \
+    } \
+    _string; \
+  })
+
+#else
+
+#define DO_STR_NEW2(str, encoding, internal_encoding) \
+  rb_str_new2((const char *)str)
+
+#define DO_STR_NEW(str, len, encoding, internal_encoding) \
+  rb_str_new((const char *)str, (long)len)
+#endif
+
+#define CONST_GET(scope, constant) (rb_funcall(scope, ID_CONST_GET, 1, rb_str_new2(constant)))
+#define DRIVER_CLASS(klass, parent) (rb_define_class_under(mSqlite3, klass, parent))
+
+#ifdef _WIN32
+#define do_int64 signed __int64
+#else
+#define do_int64 signed long long int
+#endif
+
+#ifndef HAVE_SQLITE3_PREPARE_V2
+#define sqlite3_prepare_v2 sqlite3_prepare
+#endif
+
+static ID ID_CONST_GET;
+
+void Init_do_sqlite3_extension();
+
+#endif

data/ext/do_sqlite3/do_sqlite3_extension.c

@@ -0,0 +1,78 @@
+#include "do_sqlite3.h"
+
+static VALUE ID_CONST_GET;
+static VALUE mDO;
+static VALUE mSqlite3;
+static VALUE eConnectionError;
+static VALUE cDO_Extension;
+static VALUE cExtension;
+
+/*****************************************************/
+/* File used for providing extensions on the default */
+/* API that are driver specific.                     */
+/*****************************************************/
+static VALUE cExtension_enable_load_extension(VALUE self, VALUE on) {
+  VALUE id_connection = rb_intern("connection");
+
+  VALUE connection = rb_funcall(self, id_connection, 0);
+  sqlite3 *db;
+  int status;
+
+  if (connection == Qnil) { return Qfalse; }
+
+  // Retrieve the actual connection from the
+  connection = rb_iv_get(self, "@connection");
+
+  if (connection == Qnil) { return Qfalse; }
+
+  db = DATA_PTR(connection);
+
+  if(db == NULL) { return Qfalse; }
+
+  status = sqlite3_enable_load_extension(db, on == Qtrue ? 1 : 0);
+
+  if ( status != SQLITE_OK ) {
+    rb_raise(eConnectionError, "Couldn't enable extension loading");
+  }
+  return Qtrue;
+}
+
+static VALUE cExtension_load_extension(VALUE self, VALUE path) {
+  VALUE id_connection = rb_intern("connection");
+
+  VALUE connection = rb_funcall(self, id_connection, 0);
+  sqlite3 *db;
+  const char *extension_path  = rb_str_ptr_readonly(path);
+  char* errmsg = sqlite3_malloc(1024);
+  int status;
+
+  if (connection == Qnil) { return Qfalse; }
+
+  // Retrieve the actual connection from the
+  connection = rb_iv_get(self, "@connection");
+
+  if (connection == Qnil) { return Qfalse; }
+
+  db = DATA_PTR(connection);
+
+  if(db == NULL) { return Qfalse; }
+
+  status = sqlite3_load_extension(db, extension_path, 0, &errmsg);
+
+  if ( status != SQLITE_OK ) {
+    VALUE errexp = rb_exc_new2(eConnectionError, errmsg);
+    sqlite3_free(errmsg);
+    rb_exc_raise(errexp);
+  }
+  return Qtrue;
+}
+
+void Init_do_sqlite3_extension() {
+  ID_CONST_GET = rb_intern("const_get");
+  mDO = CONST_GET(rb_mKernel, "DataObjects");
+  cDO_Extension = CONST_GET(mDO, "Extension");
+  mSqlite3 = rb_define_module_under(mDO, "Sqlite3");
+  cExtension = DRIVER_CLASS("Extension", cDO_Extension);
+  rb_define_method(cExtension, "load_extension", cExtension_load_extension, 1);
+  rb_define_method(cExtension, "enable_load_extension", cExtension_enable_load_extension, 1);
+}

data/ext/do_sqlite3/error.h

@@ -1,3 +1,6 @@
+#ifndef DO_SQLITE3_ERROR_H
+#define DO_SQLITE3_ERROR_H
+
 static struct errcodes {
   int  error_no;
   const char *error_name;
@@ -104,3 +107,5 @@ static struct errcodes {
 #endif
   {0, NULL, NULL}
 };
+
+#endif

data/lib/do_sqlite3/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Sqlite3
-    VERSION = '0.10.1.1'.freeze
+    VERSION = '0.10.2'
   end
 end

data/spec/encoding_spec.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'data_objects/spec/encoding_spec'
+
+describe DataObjects::Sqlite3::Connection do
+  behaves_like 'returning correctly encoded strings for the default database encoding'
+  behaves_like 'returning correctly encoded strings for the default internal encoding'
+end

data/spec/result_spec.rb

@@ -15,5 +15,5 @@ describe DataObjects::Sqlite3::Result do
 end
 
 describe DataObjects::Sqlite3::Result do
-  behaves_like 'a Result which returns inserted keys'
+  behaves_like 'a Result which returns inserted key with sequences'
 end

data/spec/spec_helper.rb

@@ -61,9 +61,8 @@ module DataObjectsSpecHelpers
 
     conn.create_command(<<-EOF).execute_non_query
       CREATE TABLE "invoices" (
-        "id" SERIAL,
         "invoice_number" varchar(50) NOT NULL,
-        PRIMARY KEY  ("id")
+        PRIMARY KEY  ("invoice_number")
       );
     EOF
 

data/tasks/compile.rake

@@ -56,7 +56,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.1'
+      gem.add_dependency 'do_jdbc',      '0.10.2'
     end
   end
 rescue LoadError

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: do_sqlite3
 version: !ruby/object:Gem::Version 
-  version: 0.10.1.1
+  prerelease: false
+  segments: 
+  - 0
+  - 10
+  - 2
+  version: 0.10.2
 platform: x86-mswin32-60
 authors: 
 - Dirkjan Bussink
@@ -9,39 +14,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-31 00:00:00 +01:00
+date: 2010-05-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: data_objects
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.10.1
-    version: 
+        segments: 
+        - 0
+        - 10
+        - 2
+        version: 0.10.2
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bacon
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
         version: "1.1"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 7
         version: "0.7"
-    version: 
+  type: :development
+  version_requirements: *id003
 description: Implements the DataObjects API for Sqlite3
 email: d.bussink@gmail.com
 executables: []
@@ -58,6 +73,7 @@ files:
 - lib/do_sqlite3.rb
 - spec/command_spec.rb
 - spec/connection_spec.rb
+- spec/encoding_spec.rb
 - spec/reader_spec.rb
 - spec/result_spec.rb
 - spec/spec_helper.rb
@@ -81,7 +97,9 @@ files:
 - tasks/spec.rake
 - ext/do_sqlite3/extconf.rb
 - ext/do_sqlite3/do_sqlite3.c
+- ext/do_sqlite3/do_sqlite3_extension.c
 - ext/do_sqlite3/compat.h
+- ext/do_sqlite3/do_sqlite3.h
 - ext/do_sqlite3/error.h
 - LICENSE
 - Rakefile
@@ -98,13 +116,13 @@ post_install_message: |+
   =============================================================================
   
     You've installed the binary version of do_sqlite3.
-    It was built using Sqlite3 version 3_6_21.
+    It was built using Sqlite3 version 3_6_23_1.
     It's recommended to use the exact same version to avoid potential issues.
   
     At the time of building this gem, the necessary DLL files where available
     in the following download:
   
-    http://www.sqlite.org/sqlitedll-3_6_21.zip
+    http://www.sqlite.org/sqlitedll-3_6_23_1.zip
   
     You can put the sqlite3.dll available in this package in your Ruby bin
     directory, for example C:\Ruby\bin
@@ -119,24 +137,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: dorb
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: DataObjects Sqlite3 Driver
 test_files: 
 - spec/command_spec.rb
 - spec/connection_spec.rb
+- spec/encoding_spec.rb
 - spec/reader_spec.rb
 - spec/result_spec.rb
 - spec/spec_helper.rb