do_sqlite3 0.10.0-java → 0.10.1-java

data/ext/do_sqlite3/error.h

@@ -0,0 +1,106 @@
+static struct errcodes {
+  int  error_no;
+  const char *error_name;
+  const char *exception;
+} errors [] = {
+#ifdef SQLITE_ERROR
+  {    SQLITE_ERROR,
+      "SQLITE_ERROR", "SyntaxError"},
+#endif
+#ifdef SQLITE_INTERNAL
+  {    SQLITE_INTERNAL,
+      "SQLITE_INTERNAL", "SQLError"},
+#endif
+#ifdef SQLITE_PERM
+  {    SQLITE_PERM,
+      "SQLITE_PERM", "ConnectionError"},
+#endif
+#ifdef SQLITE_ABORT
+  {    SQLITE_ABORT,
+      "SQLITE_ABORT", "ConnectionError"},
+#endif
+#ifdef SQLITE_BUSY
+  {    SQLITE_BUSY,
+      "SQLITE_BUSY", "ConnectionError"},
+#endif
+
+#ifdef SQLITE_LOCKED
+  {    SQLITE_LOCKED,
+      "SQLITE_LOCKED", "ConnectionError"},
+#endif
+#ifdef SQLITE_NOMEM
+  {    SQLITE_NOMEM,
+      "SQLITE_NOMEM", "ConnectionError"},
+#endif
+#ifdef SQLITE_READONLY
+  {    SQLITE_READONLY,
+      "SQLITE_READONLY", "ConnectionError"},
+#endif
+#ifdef SQLITE_INTERRUPT
+  {    SQLITE_INTERRUPT,
+      "SQLITE_INTERRUPT", "ConnectionError"},
+#endif
+#ifdef SQLITE_IOERR
+  {    SQLITE_IOERR,
+      "SQLITE_IOERR", "ConnectionError"},
+#endif
+#ifdef SQLITE_CORRUPT
+  {    SQLITE_CORRUPT,
+      "SQLITE_CORRUPT", "ConnectionError"},
+#endif
+#ifdef SQLITE_FULL
+  {    SQLITE_FULL,
+      "SQLITE_FULL", "ConnectionError"},
+#endif
+#ifdef SQLITE_CANTOPEN
+  {    SQLITE_CANTOPEN,
+      "SQLITE_CANTOPEN", "ConnectionError"},
+#endif
+#ifdef SQLITE_EMPTY
+  {    SQLITE_EMPTY,
+      "SQLITE_EMPTY", "ConnectionError"},
+#endif
+#ifdef SQLITE_SCHEMA
+  {    SQLITE_SCHEMA,
+      "SQLITE_SCHEMA", "DataError"},
+#endif
+#ifdef SQLITE_TOOBIG
+  {    SQLITE_TOOBIG,
+      "SQLITE_TOOBIG", "DataError"},
+#endif
+#ifdef SQLITE_MISMATCH
+  {    SQLITE_MISMATCH,
+      "SQLITE_MISMATCH", "DataError"},
+#endif
+#ifdef SQLITE_CONSTRAINT
+  {    SQLITE_CONSTRAINT,
+      "SQLITE_CONSTRAINT", "IntegrityError"},
+#endif
+#ifdef SQLITE_MISUSE
+  {    SQLITE_MISUSE,
+      "SQLITE_MISUSE", "SQLError"},
+#endif
+
+#ifdef SQLITE_NOLFS
+  {    SQLITE_NOLFS,
+      "SQLITE_NOLFS", "ConnectionError"},
+#endif
+#ifdef SQLITE_FORMAT
+  {    SQLITE_FORMAT,
+      "SQLITE_FORMAT", "SyntaxError"},
+#endif
+#ifdef SQLITE_RANGE
+  {    SQLITE_RANGE,
+      "SQLITE_RANGE", "DataError"},
+#endif
+#ifdef SQLITE_NOTADB
+  {    SQLITE_NOTADB,
+      "SQLITE_NOTADB", "ConnectionError"},
+#endif
+
+#ifdef SQLITE_ROW
+  {    SQLITE_ROW,
+      "SQLITE_ROW", "SyntaxError"},
+#endif
+  {0, NULL, NULL}
+};

data/ext/do_sqlite3/extconf.rb

@@ -0,0 +1,26 @@
+ENV["RC_ARCHS"] = "" if RUBY_PLATFORM =~ /darwin/
+
+# Loads mkmf which is used to make makefiles for Ruby extensions
+require 'mkmf'
+
+# Allow for custom compiler to be specified.
+RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
+
+# Use some default search paths
+dir_config("sqlite3", ["/usr/local", "/opt/local", "/usr"])
+
+# NOTE: use GCC flags unless Visual C compiler is used
+$CFLAGS << ' -Wall ' unless RUBY_PLATFORM =~ /mswin/
+
+if RUBY_VERSION < '1.8.6'
+  $CFLAGS << ' -DRUBY_LESS_THAN_186'
+end
+
+# Do the work
+# create_makefile(extension_name)
+if have_header( "sqlite3.h" ) && have_library( "sqlite3", "sqlite3_open" )
+  have_func("sqlite3_prepare_v2")
+  have_func("sqlite3_open_v2")
+
+  create_makefile('do_sqlite3/do_sqlite3')
+end

data/lib/do_sqlite3.rb

@@ -18,22 +18,30 @@ if RUBY_PLATFORM =~ /java/
   java_import driver
 end
 
-require 'do_sqlite3_ext'
+begin
+  require 'do_sqlite3/do_sqlite3'
+rescue LoadError
+  if RUBY_PLATFORM =~ /mingw|mswin/ then
+    RUBY_VERSION =~ /(\d+.\d+)/
+    require "do_sqlite3/#{$1}/do_sqlite3"
+  else
+    raise
+  end
+end
+
 require 'do_sqlite3/version'
-require 'do_sqlite3/transaction'
+require 'do_sqlite3/transaction' if RUBY_PLATFORM !~ /java/
 
 if RUBY_PLATFORM =~ /java/
 
-  module DataObjects
-    module Sqlite3
-      class Connection
-        def self.pool_size
-          # sqlite3 can have only one write access at a time, with this
-          # concurrent write access will result in "Database locked" errors
-          1
-        end
-      end
+  DataObjects::Sqlite3::Connection.class_eval do
+
+    def self.pool_size
+      # sqlite3 can have only one write access at a time, with this
+      # concurrent write access will result in "Database locked" errors
+      1
     end
+
   end
 
 end

data/lib/do_sqlite3/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Sqlite3
-    VERSION = "0.10.0"
+    VERSION = '0.10.1'.freeze
   end
 end

data/spec/command_spec.rb

@@ -4,5 +4,5 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 require 'data_objects/spec/command_spec'
 
 describe DataObjects::Sqlite3::Command do
-  it_should_behave_like 'a Command'
+  behaves_like 'a Command'
 end

data/spec/connection_spec.rb

@@ -5,14 +5,16 @@ require 'data_objects/spec/connection_spec'
 
 describe DataObjects::Sqlite3::Connection do
 
-  before :all do
-    @driver = CONFIG.scheme
-    @user   = CONFIG.user
+  before 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
 
-  it_should_behave_like 'a Connection'
+  behaves_like 'a Connection'
+  behaves_like 'a Connection via JDNI' if JRUBY
+  # FIXME: behaves_like 'a Connection with JDBC URL support' if JRUBY
 end

data/spec/reader_spec.rb

@@ -4,5 +4,5 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 require 'data_objects/spec/reader_spec'
 
 describe DataObjects::Sqlite3::Reader do
-  it_should_behave_like 'a Reader'
+  behaves_like 'a Reader'
 end

data/spec/result_spec.rb

@@ -4,16 +4,16 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 require 'data_objects/spec/result_spec'
 
 # splitting the descibe into two separate declaration avoids
-# concurrent execution of the "it_should_behave_like ....." calls
+# concurrent execution of the "behaves_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
-  it_should_behave_like 'a Result'
+  behaves_like 'a Result'
 end
 
 describe DataObjects::Sqlite3::Result do
-  it_should_behave_like 'a Result which returns inserted keys'
+  behaves_like 'a Result which returns inserted keys'
 end

data/spec/spec_helper.rb

@@ -2,51 +2,36 @@ $TESTING=true
 JRUBY = RUBY_PLATFORM =~ /java/
 
 require 'rubygems'
-
-gem 'rspec', '>1.1.12'
-require 'spec'
-
 require 'date'
 require 'ostruct'
-require 'pathname'
 require 'fileutils'
+require 'win32console' if RUBY_PLATFORM =~ /mingw|mswin/
+
+driver_lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(driver_lib) unless $LOAD_PATH.include?(driver_lib)
 
-dir = File.dirname(__FILE__)
-lib_path = File.expand_path("#{dir}/../lib")
-$LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
-# put data_objects from repository in the load path
-# DO NOT USE installed gem of data_objects!
-do_lib_path = File.expand_path("#{dir}/../../data_objects/lib")
-$LOAD_PATH.unshift do_lib_path unless $LOAD_PATH.include?(do_lib_path)
-
-if JRUBY
-  jdbc_lib_path = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'do_jdbc', 'lib'))
-  $LOAD_PATH.unshift jdbc_lib_path unless $LOAD_PATH.include?(jdbc_lib_path)
-  require 'do_jdbc'
+# Prepend data_objects/do_jdbc in the repository to the load path.
+# DO NOT USE installed gems, except when running the specs from gem.
+repo_root = File.expand_path('../../..', __FILE__)
+(['data_objects'] << ('do_jdbc' if JRUBY)).compact.each do |lib|
+  lib_path = "#{repo_root}/#{lib}/lib"
+  $LOAD_PATH.unshift(lib_path) if File.directory?(lib_path) && !$LOAD_PATH.include?(lib_path)
 end
 
 require 'data_objects'
-
-DATAOBJECTS_SPEC_ROOT = Pathname(__FILE__).dirname.parent.parent + 'data_objects' + 'spec'
-Pathname.glob((DATAOBJECTS_SPEC_ROOT + 'lib/**/*.rb').to_s).each { |f| require f }
+require 'data_objects/spec/bacon'
 require 'do_sqlite3'
 
-log_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'log', 'do.log'))
-FileUtils.mkdir_p(File.dirname(log_path))
-
-DataObjects::Sqlite3.logger = DataObjects::Logger.new(log_path, :debug)
-
+DataObjects::Sqlite3.logger = DataObjects::Logger.new(STDOUT, :off)
 at_exit { DataObjects.logger.flush }
 
-Spec::Runner.configure do |config|
-  config.include(DataObjects::Spec::PendingHelpers)
-end
-
 CONFIG = OpenStruct.new
 CONFIG.scheme   = 'sqlite3'
-CONFIG.database = ENV['DO_SQLITE3_DATABASE'] || "#{File.expand_path(File.dirname(__FILE__))}/test.db"
+CONFIG.database = ENV['DO_SQLITE3_DATABASE'] || ":memory:"
 
-CONFIG.uri = ENV["DO_SQLITE3_SPEC_URI"] || "#{CONFIG.scheme}://#{CONFIG.database}"
+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")
 
 module DataObjectsSpecHelpers
 
@@ -111,7 +96,7 @@ module DataObjectsSpecHelpers
 
     1.upto(16) do |n|
       conn.create_command(<<-EOF).execute_non_query
-        insert into widgets(code, name, shelf_location, description, image_data, ad_description, ad_image, whitepaper_text, cad_drawing, super_number, weight) VALUES ('W#{n.to_s.rjust(7,"0")}', 'Widget #{n}', 'A14', 'This is a description', 'IMAGE DATA', 'Buy this product now!', 'AD IMAGE DATA', 'String', 'CAD DRAWING', 1234, 13.4);
+        insert into widgets(code, name, shelf_location, description, image_data, ad_description, ad_image, whitepaper_text, cad_drawing, super_number, weight) VALUES ('W#{n.to_s.rjust(7,"0")}', 'Widget #{n}', 'A14', 'This is a description', 'IMAGE DATA', 'Buy this product now!', 'AD IMAGE DATA', 'String', X'434144200120002044524157494e47', 1234, 13.4);
       EOF
     end
 
@@ -151,3 +136,5 @@ module DataObjectsSpecHelpers
   end
 
 end
+
+include DataObjectsSpecHelpers

data/spec/typecast/array_spec.rb

@@ -4,5 +4,5 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/array_spec'
 
 describe 'DataObjects::Sqlite3 with Array' do
-  it_should_behave_like 'supporting Array'
+  behaves_like 'supporting Array'
 end

data/spec/typecast/bigdecimal_spec.rb

@@ -7,5 +7,5 @@ require 'data_objects/spec/typecast/bigdecimal_spec'
 # http://www.sqlite.org/datatype3.html
 
 describe 'DataObjects::Sqlite3 with BigDecimal' do
-  it_should_behave_like 'supporting BigDecimal'
+  behaves_like 'supporting BigDecimal'
 end

data/spec/typecast/boolean_spec.rb

@@ -7,5 +7,5 @@ require 'data_objects/spec/typecast/boolean_spec'
 # http://www.sqlite.org/datatype3.html
 
 describe 'DataObjects::Sqlite3 with Boolean' do
-  it_should_behave_like 'supporting Boolean'
+  behaves_like 'supporting Boolean'
 end

data/spec/typecast/byte_array_spec.rb

@@ -4,6 +4,5 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/byte_array_spec'
 
 describe 'DataObjects::Sqlite3 with ByteArray' do
-  # We need to switch to using parameter binding for this to work with Sqlite3
-  # it_should_behave_like 'supporting ByteArray'
+  behaves_like 'supporting ByteArray'
 end

data/spec/typecast/class_spec.rb

@@ -4,5 +4,5 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/class_spec'
 
 describe 'DataObjects::Sqlite3 with Class' do
-  it_should_behave_like 'supporting Class'
+  behaves_like 'supporting Class'
 end

data/spec/typecast/date_spec.rb

@@ -7,5 +7,5 @@ require 'data_objects/spec/typecast/date_spec'
 # http://www.sqlite.org/datatype3.html
 
 describe 'DataObjects::Sqlite3 with Date' do
-  it_should_behave_like 'supporting Date'
+  behaves_like 'supporting Date'
 end

data/spec/typecast/datetime_spec.rb

@@ -7,5 +7,5 @@ require 'data_objects/spec/typecast/datetime_spec'
 # http://www.sqlite.org/datatype3.html
 
 describe 'DataObjects::Sqlite3 with DateTime' do
-  it_should_behave_like 'supporting DateTime'
+  behaves_like 'supporting DateTime'
 end

data/spec/typecast/float_spec.rb

@@ -4,9 +4,9 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/float_spec'
 
 describe 'DataObjects::Sqlite3 with Float' do
-  it_should_behave_like 'supporting Float'
+  behaves_like 'supporting Float'
 end
 
 describe 'DataObjects::Sqlite3 with Float' do
-  it_should_behave_like 'supporting Float autocasting'
+  behaves_like 'supporting Float autocasting'
 end

data/spec/typecast/integer_spec.rb

@@ -4,5 +4,5 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/integer_spec'
 
 describe 'DataObjects::Sqlite3 with Integer' do
-  it_should_behave_like 'supporting Integer'
+  behaves_like 'supporting Integer'
 end

data/spec/typecast/nil_spec.rb

@@ -4,17 +4,17 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/nil_spec'
 
 # splitting the descibe into two separate declaration avoids
-# concurrent execution of the "it_should_behave_like ....." calls
+# concurrent execution of the "behaves_like ....." calls
 # which would lock the database
 
 describe 'DataObjects::Sqlite3 with Nil' do
-  it_should_behave_like 'supporting Nil'
+  behaves_like 'supporting Nil'
 end
 
 describe 'DataObjects::Sqlite3 with Nil' do
-  it_should_behave_like 'supporting writing an Nil'
+  behaves_like 'supporting writing an Nil'
 end
 
 describe 'DataObjects::Sqlite3 with Nil' do
-  it_should_behave_like 'supporting Nil autocasting'
+  behaves_like 'supporting Nil autocasting'
 end

data/spec/typecast/other_spec.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'data_objects/spec/typecast/other_spec'
+
+describe 'DataObjects::H2 with other (unknown) type' do
+  behaves_like 'supporting other (unknown) type'
+end

data/spec/typecast/range_spec.rb

@@ -4,5 +4,5 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/range_spec'
 
 describe 'DataObjects::Sqlite3 with Range' do
-  it_should_behave_like 'supporting Range'
+  behaves_like 'supporting Range'
 end