do_sqlite3 0.10.3 → 0.10.4.rc1

data/ext/do_sqlite3/do_sqlite3.h

@@ -9,57 +9,11 @@
 #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();
+extern VALUE mSqlite3;
+extern void Init_do_sqlite3_extension();
 
-#endif
+#endif

data/ext/do_sqlite3/do_sqlite3_extension.c

@@ -1,22 +1,16 @@
+#include <ruby.h>
+#include "do_common.h"
 #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;
+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 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; }
 
@@ -25,26 +19,24 @@ static VALUE cExtension_enable_load_extension(VALUE self, VALUE on) {
 
   if (connection == Qnil) { return Qfalse; }
 
-  db = DATA_PTR(connection);
+  sqlite3 *db;
 
-  if(db == NULL) { return Qfalse; }
+  if (!(db = DATA_PTR(connection))) {
+    return Qfalse;
+  }
 
-  status = sqlite3_enable_load_extension(db, on == Qtrue ? 1 : 0);
+  int status = sqlite3_enable_load_extension(db, on == Qtrue ? 1 : 0);
 
-  if ( status != SQLITE_OK ) {
+  if (status != SQLITE_OK) {
     rb_raise(eConnectionError, "Couldn't enable extension loading");
   }
+
   return Qtrue;
 }
 
-static VALUE cExtension_load_extension(VALUE self, VALUE path) {
+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; }
 
@@ -53,26 +45,33 @@ static VALUE cExtension_load_extension(VALUE self, VALUE path) {
 
   if (connection == Qnil) { return Qfalse; }
 
-  db = DATA_PTR(connection);
+  sqlite3 *db;
+
+  if (!(db = DATA_PTR(connection))) {
+    return Qfalse;
+  }
+
+  const char *extension_path  = rb_str_ptr_readonly(path);
+  char *errmsg;
 
-  if(db == NULL) { return Qfalse; }
+  if (!(errmsg = sqlite3_malloc(1024))) {
+    return Qfalse;
+  }
 
-  status = sqlite3_load_extension(db, extension_path, 0, &errmsg);
+  int status = sqlite3_load_extension(db, extension_path, 0, &errmsg);
 
-  if ( status != SQLITE_OK ) {
+  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);
+  cExtension = rb_define_class_under(mSqlite3, "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,111 +1,85 @@
-#ifndef DO_SQLITE3_ERROR_H
-#define DO_SQLITE3_ERROR_H
+#ifndef _DO_SQLITE3_ERROR_H_
+#define _DO_SQLITE3_ERROR_H_
 
-static struct errcodes {
-  int  error_no;
-  const char *error_name;
-  const char *exception;
-} errors [] = {
+#include "do_common.h"
+
+static struct errcodes errors[] = {
 #ifdef SQLITE_ERROR
-  {    SQLITE_ERROR,
-      "SQLITE_ERROR", "SyntaxError"},
+  ERRCODE(SQLITE_ERROR, "SyntaxError"),
 #endif
 #ifdef SQLITE_INTERNAL
-  {    SQLITE_INTERNAL,
-      "SQLITE_INTERNAL", "SQLError"},
+  ERRCODE(SQLITE_INTERNAL, "SQLError"),
 #endif
 #ifdef SQLITE_PERM
-  {    SQLITE_PERM,
-      "SQLITE_PERM", "ConnectionError"},
+  ERRCODE(SQLITE_PERM, "ConnectionError"),
 #endif
 #ifdef SQLITE_ABORT
-  {    SQLITE_ABORT,
-      "SQLITE_ABORT", "ConnectionError"},
+  ERRCODE(SQLITE_ABORT, "ConnectionError"),
 #endif
 #ifdef SQLITE_BUSY
-  {    SQLITE_BUSY,
-      "SQLITE_BUSY", "ConnectionError"},
+  ERRCODE(SQLITE_BUSY, "ConnectionError"),
 #endif
 
 #ifdef SQLITE_LOCKED
-  {    SQLITE_LOCKED,
-      "SQLITE_LOCKED", "ConnectionError"},
+  ERRCODE(SQLITE_LOCKED, "ConnectionError"),
 #endif
 #ifdef SQLITE_NOMEM
-  {    SQLITE_NOMEM,
-      "SQLITE_NOMEM", "ConnectionError"},
+  ERRCODE(SQLITE_NOMEM, "ConnectionError"),
 #endif
 #ifdef SQLITE_READONLY
-  {    SQLITE_READONLY,
-      "SQLITE_READONLY", "ConnectionError"},
+  ERRCODE(SQLITE_READONLY, "ConnectionError"),
 #endif
 #ifdef SQLITE_INTERRUPT
-  {    SQLITE_INTERRUPT,
-      "SQLITE_INTERRUPT", "ConnectionError"},
+  ERRCODE(SQLITE_INTERRUPT, "ConnectionError"),
 #endif
 #ifdef SQLITE_IOERR
-  {    SQLITE_IOERR,
-      "SQLITE_IOERR", "ConnectionError"},
+  ERRCODE(SQLITE_IOERR, "ConnectionError"),
 #endif
 #ifdef SQLITE_CORRUPT
-  {    SQLITE_CORRUPT,
-      "SQLITE_CORRUPT", "ConnectionError"},
+  ERRCODE(SQLITE_CORRUPT, "ConnectionError"),
 #endif
 #ifdef SQLITE_FULL
-  {    SQLITE_FULL,
-      "SQLITE_FULL", "ConnectionError"},
+  ERRCODE(SQLITE_FULL, "ConnectionError"),
 #endif
 #ifdef SQLITE_CANTOPEN
-  {    SQLITE_CANTOPEN,
-      "SQLITE_CANTOPEN", "ConnectionError"},
+  ERRCODE(SQLITE_CANTOPEN, "ConnectionError"),
 #endif
 #ifdef SQLITE_EMPTY
-  {    SQLITE_EMPTY,
-      "SQLITE_EMPTY", "ConnectionError"},
+  ERRCODE(SQLITE_EMPTY, "ConnectionError"),
 #endif
 #ifdef SQLITE_SCHEMA
-  {    SQLITE_SCHEMA,
-      "SQLITE_SCHEMA", "DataError"},
+  ERRCODE(SQLITE_SCHEMA, "DataError"),
 #endif
 #ifdef SQLITE_TOOBIG
-  {    SQLITE_TOOBIG,
-      "SQLITE_TOOBIG", "DataError"},
+  ERRCODE(SQLITE_TOOBIG, "DataError"),
 #endif
 #ifdef SQLITE_MISMATCH
-  {    SQLITE_MISMATCH,
-      "SQLITE_MISMATCH", "DataError"},
+  ERRCODE(SQLITE_MISMATCH, "DataError"),
 #endif
 #ifdef SQLITE_CONSTRAINT
-  {    SQLITE_CONSTRAINT,
-      "SQLITE_CONSTRAINT", "IntegrityError"},
+  ERRCODE(SQLITE_CONSTRAINT, "IntegrityError"),
 #endif
 #ifdef SQLITE_MISUSE
-  {    SQLITE_MISUSE,
-      "SQLITE_MISUSE", "SQLError"},
+  ERRCODE(SQLITE_MISUSE, "SQLError"),
 #endif
 
 #ifdef SQLITE_NOLFS
-  {    SQLITE_NOLFS,
-      "SQLITE_NOLFS", "ConnectionError"},
+  ERRCODE(SQLITE_NOLFS, "ConnectionError"),
 #endif
 #ifdef SQLITE_FORMAT
-  {    SQLITE_FORMAT,
-      "SQLITE_FORMAT", "SyntaxError"},
+  ERRCODE(SQLITE_FORMAT, "SyntaxError"),
 #endif
 #ifdef SQLITE_RANGE
-  {    SQLITE_RANGE,
-      "SQLITE_RANGE", "DataError"},
+  ERRCODE(SQLITE_RANGE, "DataError"),
 #endif
 #ifdef SQLITE_NOTADB
-  {    SQLITE_NOTADB,
-      "SQLITE_NOTADB", "ConnectionError"},
+  ERRCODE(SQLITE_NOTADB, "ConnectionError"),
 #endif
 
 #ifdef SQLITE_ROW
-  {    SQLITE_ROW,
-      "SQLITE_ROW", "SyntaxError"},
+  ERRCODE(SQLITE_ROW, "SyntaxError"),
 #endif
   {0, NULL, NULL}
 };
 
-#endif
+#endif

data/lib/do_sqlite3.rb

@@ -3,9 +3,14 @@ if RUBY_PLATFORM =~ /java/
   require 'do_jdbc'
   require 'java'
 
-  driver =  'org.sqlite.JDBC'
+  module DataObjects
+    module Sqlite3
+      JDBC_DRIVER = 'org.sqlite.JDBC'
+    end
+  end
+
   begin
-    java.lang.Thread.currentThread.getContextClassLoader().loadClass(driver, true)
+    java.lang.Thread.currentThread.getContextClassLoader().loadClass(DataObjects::Sqlite3::JDBC_DRIVER, true)
   rescue
     require 'jdbc/sqlite3' # the JDBC driver, packaged as a gem
   end
@@ -15,7 +20,7 @@ if RUBY_PLATFORM =~ /java/
   # Thread.currentThread.getContextClassLoader().loadClass() within the
   # data_objects.Connection Java class, which is currently not working as
   # expected.
-  java_import driver
+  java_import DataObjects::Sqlite3::JDBC_DRIVER
 end
 
 begin

data/lib/do_sqlite3/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Sqlite3
-    VERSION = '0.10.3'
+    VERSION = '0.10.4.rc1'
   end
 end

data/spec/command_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
-require 'data_objects/spec/command_spec'
+require 'data_objects/spec/shared/command_spec'
 
 describe DataObjects::Sqlite3::Command do
-  behaves_like 'a Command'
+  it_should_behave_like 'a Command'
 end

data/spec/connection_spec.rb

@@ -1,20 +1,20 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
-require 'data_objects/spec/connection_spec'
+require 'data_objects/spec/shared/connection_spec'
 
 describe DataObjects::Sqlite3::Connection do
 
-  before do
-    @driver   = CONFIG.scheme
-    @user     = CONFIG.user
+  before :all do
+    @driver = CONFIG.scheme
+    @user   = CONFIG.user
     @password = CONFIG.pass
-    @host     = CONFIG.host
-    @port     = CONFIG.port
+    @host   = CONFIG.host
+    @port   = CONFIG.port
     @database = CONFIG.database
   end
 
-  behaves_like 'a Connection'
-  behaves_like 'a Connection via JDNI' if JRUBY
-  # FIXME: behaves_like 'a Connection with JDBC URL support' if JRUBY
+  it_should_behave_like 'a Connection'
+  it_should_behave_like 'a Connection via JDNI' if JRUBY
+  it_should_behave_like 'a Connection with JDBC URL support' if JRUBY
 end

data/spec/encoding_spec.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
-require 'data_objects/spec/encoding_spec'
+require 'data_objects/spec/shared/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'
+  it_should_behave_like 'returning correctly encoded strings for the default database encoding'
+  it_should_behave_like 'returning correctly encoded strings for the default internal encoding'
 end

data/spec/error/sql_error_spec.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/error/sql_error_spec'
+require 'data_objects/spec/shared/error/sql_error_spec'
 
 describe 'DataObjects::Sqlite3 raising SQLError' do
 # This fails for now, need to think of a query that also exposes the issue on sqlite :S
-#  behaves_like 'raising a SQLError'
+#  it_should_behave_like 'raising a SQLError'
 end

data/spec/reader_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
-require 'data_objects/spec/reader_spec'
+require 'data_objects/spec/shared/reader_spec'
 
 describe DataObjects::Sqlite3::Reader do
-  behaves_like 'a Reader'
+  it_should_behave_like 'a Reader'
 end

data/spec/result_spec.rb

@@ -1,19 +1,19 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
-require 'data_objects/spec/result_spec'
+require 'data_objects/spec/shared/result_spec'
 
 # splitting the descibe into two separate declaration avoids
-# concurrent execution of the "behaves_like ....." calls
+# concurrent execution of the "it_should_behave_like ....." calls
 # which would lock the database
 
 # TODO
 # the locked database created a deadlock which is worth exploring since
 # such situation could appear in the wild too
 describe DataObjects::Sqlite3::Result do
-  behaves_like 'a Result'
+  it_should_behave_like 'a Result'
 end
 
 describe DataObjects::Sqlite3::Result do
-  behaves_like 'a Result which returns inserted key with sequences'
+  it_should_behave_like 'a Result which returns inserted key with sequences'
 end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ $TESTING=true
 JRUBY = RUBY_PLATFORM =~ /java/
 
 require 'rubygems'
+require 'rspec'
 require 'date'
 require 'ostruct'
 require 'fileutils'
@@ -19,19 +20,18 @@ repo_root = File.expand_path('../../..', __FILE__)
 end
 
 require 'data_objects'
-require 'data_objects/spec/bacon'
+require 'data_objects/spec/setup'
+require 'data_objects/spec/lib/pending_helpers'
 require 'do_sqlite3'
 
-DataObjects::Sqlite3.logger = DataObjects::Logger.new(STDOUT, :off)
-at_exit { DataObjects.logger.flush }
 
-CONFIG = OpenStruct.new
-CONFIG.scheme   = 'sqlite3'
-CONFIG.database = ENV['DO_SQLITE3_DATABASE'] || ":memory:"
-
-CONFIG.uri = ENV["DO_SQLITE3_SPEC_URI"] || "#{CONFIG.scheme}:#{CONFIG.database}"
-CONFIG.jdbc_driver = 'org.sqlite.JDBC'
-CONFIG.jdbc_uri = CONFIG.uri.sub(/sqlite3/,"jdbc:sqlite")
+CONFIG              = OpenStruct.new
+CONFIG.scheme       = 'sqlite3'
+CONFIG.database     = ENV['DO_SQLITE3_DATABASE'] || ":memory:"
+CONFIG.uri          = ENV["DO_SQLITE3_SPEC_URI"] || "#{CONFIG.scheme}:#{CONFIG.database}"
+CONFIG.driver       = 'sqlite3'
+CONFIG.jdbc_driver  = DataObjects::Sqlite3.const_get('JDBC_DRIVER') rescue nil
+CONFIG.jdbc_uri     = CONFIG.uri.sub(/sqlite3/,"jdbc:sqlite")
 
 module DataObjectsSpecHelpers
 
@@ -140,4 +140,7 @@ module DataObjectsSpecHelpers
 
 end
 
-include DataObjectsSpecHelpers
+RSpec.configure do |config|
+  config.include(DataObjectsSpecHelpers)
+  config.include(DataObjects::Spec::PendingHelpers)
+end