do_sqlite3 0.9.12-java → 0.10.0-java

data/{History.txt → HISTORY.markdown}

@@ -1,10 +1,18 @@
-== 0.9.11 2009-01-19
+## 0.10.0 2009-10-15
+* Improvements
+  * JRuby Support (using *do_jdbc*)
+
+## 0.9.12 2009-05-17
+* Improvements
+  * rake-compiler for Windows support
+
+## 0.9.11 2009-01-19
 * Improvements
   * Ruby 1.9 support
 * Fixes
   * Fix Windows gem
 
-== 0.9.9 2008-11-27
+## 0.9.9 2008-11-27
 * Improvements
   * Added cross compile rake tasks for Windows gems [Jonathan Stott, Luis Lavena]
   * Added initial support for Ruby 1.9 [John Harrison]

data/Manifest.txt

@@ -1,8 +1,8 @@
 .gitignore
-History.txt
+HISTORY.markdown
 LICENSE
 Manifest.txt
-README.txt
+README.markdown
 Rakefile
 buildfile
 ext-java/src/main/java/DoSqlite3ExtService.java

data/{README.txt → README.markdown}

@@ -1,3 +1,4 @@
-= do_sqlite3
+do_sqlite3
+==========
 
 A DataObjects driver for SQLite3

data/Rakefile

@@ -8,9 +8,9 @@ require 'lib/do_sqlite3/version'
 ROOT    = Pathname(__FILE__).dirname.expand_path
 JRUBY   = RUBY_PLATFORM =~ /java/
 WINDOWS = Gem.win_platform?
-SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
+SUDO    = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])
 BINARY_VERSION = '3_6_13'
 
-Dir['tasks/*.rake'].each { |f| import f }
+Dir['tasks/*.rake'].sort.each { |f| import f }
 
 CLEAN.include(%w[ {tmp,pkg}/ **/*.{o,so,bundle,jar,log,a,gem,dSYM,obj,pdb,exp,DS_Store,rbc,db} ext/do_sqlite3_ext/Makefile ext-java/target ])

data/lib/do_sqlite3.rb

@@ -1,35 +1,36 @@
-# HACK: If running on Windows, then add the current directory to the PATH
-# for the current process so it can find the bundled dlls before the require
-# of the actual extension file.
-if RUBY_PLATFORM.match(/mingw|mswin/i)
-  libdir = File.expand_path(File.dirname(__FILE__)).gsub(File::SEPARATOR, File::ALT_SEPARATOR)
-  ENV['PATH'] = "#{libdir};" + ENV['PATH']
-end
-
-require 'rubygems'
 require 'data_objects'
 if RUBY_PLATFORM =~ /java/
   require 'do_jdbc'
   require 'java'
-  gem 'jdbc-sqlite3'
-  require 'jdbc/sqlite3' # the JDBC driver, packaged as a gem
+
+  driver =  'org.sqlite.JDBC'
+  begin
+    java.lang.Thread.currentThread.getContextClassLoader().loadClass(driver, true)
+  rescue
+    require 'jdbc/sqlite3' # the JDBC driver, packaged as a gem
+  end
+
+  # Another way of loading the JDBC Class. This seems to be more reliable
+  # than Class.forName() or
+  # Thread.currentThread.getContextClassLoader().loadClass() within the
+  # data_objects.Connection Java class, which is currently not working as
+  # expected.
+  java_import driver
 end
 
 require 'do_sqlite3_ext'
-require File.expand_path(File.join(File.dirname(__FILE__), 'do_sqlite3', 'version'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'do_sqlite3', 'transaction'))
+require 'do_sqlite3/version'
+require 'do_sqlite3/transaction'
 
 if RUBY_PLATFORM =~ /java/
-  # Another way of loading the JDBC Class. This seems to be more reliable
-  # than Class.forName() within the data_objects.Connection Java class,
-  # which is currently not working as expected.
-  import 'org.sqlite.JDBC'
 
   module DataObjects
     module Sqlite3
       class Connection
         def self.pool_size
-          20
+          # 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/transaction.rb

@@ -5,28 +5,20 @@ module DataObjects
 
     class Transaction < DataObjects::Transaction
 
-      def begin
-        cmd = "BEGIN"
-        connection.create_command(cmd).execute_non_query
+      def begin_prepared
+        raise NotImplementedError
       end
 
-      def commit
-        cmd = "COMMIT"
-        connection.create_command(cmd).execute_non_query
-      end
-
-      def rollback
-        cmd = "ROLLBACK"
-        connection.create_command(cmd).execute_non_query
+      def commit_prepared
+        raise NotImplementedError
       end
 
       def rollback_prepared
-        cmd = "ROLLBACK"
-        connection.create_command(cmd).execute_non_query
+        raise NotImplementedError
       end
 
       def prepare
-        # Eek, I don't know how to do this. Lets hope a commit arrives soon...
+        raise NotImplementedError
       end
 
     end

data/lib/do_sqlite3/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Sqlite3
-    VERSION = "0.9.12"
+    VERSION = "0.10.0"
   end
 end

data/spec/result_spec.rb

@@ -3,7 +3,17 @@
 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
+# 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'
+end
+
+describe DataObjects::Sqlite3::Result do
   it_should_behave_like 'a Result which returns inserted keys'
 end

data/spec/spec_helper.rb

@@ -11,21 +11,24 @@ require 'ostruct'
 require 'pathname'
 require 'fileutils'
 
+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!
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'data_objects', 'lib'))
-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 }
+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
-  $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'do_jdbc', 'lib'))
+  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'
 end
 
-# put the pre-compiled extension in the path to be found
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+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 'do_sqlite3'
 
 log_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'log', 'do.log'))
@@ -79,6 +82,8 @@ module DataObjectsSpecHelpers
       );
     EOF
 
+    local_offset = Rational(Time.local(2008, 2, 14).utc_offset, 86400)
+    t = DateTime.civil(2008, 2, 14, 00, 31, 12, local_offset)
     conn.create_command(<<-EOF).execute_non_query
       CREATE TABLE "widgets" (
         "id" INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -91,7 +96,7 @@ module DataObjectsSpecHelpers
         "ad_image" blob NULL,
         "whitepaper_text" text NULL,
         "cad_drawing" blob,
-        "flags" char default 'f',
+        "flags" boolean default 'f',
         "number_in_stock" smallint default 500,
         "number_sold" integer default 0,
         "super_number" bigint default 9223372036854775807,
@@ -99,7 +104,7 @@ module DataObjectsSpecHelpers
         "cost1" double precision default 10.23,
         "cost2" decimal(8,2) default 50.23,
         "release_date" date default '2008-02-14',
-        "release_datetime" timestamp default '2008-02-14T00:31:12+00:00',
+        "release_datetime" timestamp default '#{t.to_s}',
         "release_timestamp" timestamp with time zone default '2008-02-14 00:31:31'
       );
     EOF
@@ -118,6 +123,30 @@ module DataObjectsSpecHelpers
       update widgets set ad_description = NULL where id = 3
     EOF
 
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set flags = NULL where id = 4
+    EOF
+
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set cost1 = NULL where id = 5
+    EOF
+
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set cost2 = NULL where id = 6
+    EOF
+
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set release_date = NULL where id = 7
+    EOF
+
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set release_datetime = NULL where id = 8
+    EOF
+
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set release_timestamp = NULL where id = 9
+    EOF
+
     conn.close
   end
 

data/spec/typecast/bigdecimal_spec.rb

@@ -3,6 +3,9 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/bigdecimal_spec'
 
+# Sqlite3 doesn't support decimals natively, so autocasting is not available:
+# http://www.sqlite.org/datatype3.html
+
 describe 'DataObjects::Sqlite3 with BigDecimal' do
   it_should_behave_like 'supporting BigDecimal'
 end

data/spec/typecast/boolean_spec.rb

@@ -3,6 +3,9 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/boolean_spec'
 
+# Sqlite3 doesn't support booleans natively, so autocasting is not available:
+# http://www.sqlite.org/datatype3.html
+
 describe 'DataObjects::Sqlite3 with Boolean' do
   it_should_behave_like 'supporting Boolean'
 end

data/spec/typecast/date_spec.rb

@@ -3,6 +3,9 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/date_spec'
 
+# Sqlite3 doesn't support dates natively, so autocasting is not available:
+# http://www.sqlite.org/datatype3.html
+
 describe 'DataObjects::Sqlite3 with Date' do
   it_should_behave_like 'supporting Date'
 end

data/spec/typecast/datetime_spec.rb

@@ -3,6 +3,9 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/datetime_spec'
 
+# Sqlite3 doesn't support datetimes natively, so autocasting is not available:
+# http://www.sqlite.org/datatype3.html
+
 describe 'DataObjects::Sqlite3 with DateTime' do
   it_should_behave_like 'supporting DateTime'
 end

data/spec/typecast/float_spec.rb

@@ -6,3 +6,7 @@ require 'data_objects/spec/typecast/float_spec'
 describe 'DataObjects::Sqlite3 with Float' do
   it_should_behave_like 'supporting Float'
 end
+
+describe 'DataObjects::Sqlite3 with Float' do
+  it_should_behave_like 'supporting Float autocasting'
+end

data/spec/typecast/nil_spec.rb

@@ -3,8 +3,18 @@
 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
+# which would lock the database
+
 describe 'DataObjects::Sqlite3 with Nil' do
   it_should_behave_like 'supporting Nil'
-# it_should_behave_like 'supporting writing an Nil'
+end
+
+describe 'DataObjects::Sqlite3 with Nil' do
+  it_should_behave_like 'supporting writing an Nil'
+end
+
+describe 'DataObjects::Sqlite3 with Nil' do
   it_should_behave_like 'supporting Nil autocasting'
 end

data/tasks/gem.rake

@@ -1,61 +1,8 @@
 require 'rubygems/package_task'
 
-GEM_SPEC = Gem::Specification.new do |s|
-  # basic information
-  s.name        = "do_sqlite3"
-  s.version     = DataObjects::Sqlite3::VERSION
-
-  # description and details
-  s.summary     = 'DataObjects Sqlite3 Driver'
-  s.description = "Implements the DataObjects API for Sqlite3"
-
-  # dependencies
-  s.add_dependency "addressable", "~>2.0.0"
-  s.add_dependency "extlib", "~>0.9.12"
-  s.add_dependency "data_objects", DataObjects::Sqlite3::VERSION
-
-  if JRUBY
-    s.add_dependency "jdbc-sqlite3", ">=3.5.8"
-    s.add_dependency "do_jdbc", DataObjects::Sqlite3::VERSION
-    s.platform = "java"
-    # components, files and paths
-    s.files = FileList["lib/**/*.rb", "spec/**/*.rb", "tasks/**/*.rake",
-                        "LICENSE", "Rakefile", "*.{rdoc,txt,yml}", "lib/*.jar"]
-  else
-    s.platform    = Gem::Platform::RUBY
-    s.extensions << 'ext/do_sqlite3_ext/extconf.rb'
-    # components, files and paths
-    s.files = FileList["lib/**/*.rb", "spec/**/*.rb", "tasks/**/*.rake", "ext/**/*.{rb,c}",
-                        "LICENSE", "Rakefile", "*.{rdoc,txt,yml}"]
-  end
-
-  # development dependencies
-  s.add_development_dependency 'rspec', '~>1.2.0'
-
-
-  s.require_path = 'lib'
-
-  # documentation
-  s.has_rdoc = false
-
-  # project information
-  s.homepage          = 'http://github.com/datamapper/do'
-  s.rubyforge_project = 'dorb'
-
-  # author and contributors
-  s.author      = 'Dirkjan Bussink'
-  s.email       = 'd.bussink@gmail.com'
-end
+GEM_SPEC = eval(File.read('do_sqlite3.gemspec'))
 
 gem_package = Gem::PackageTask.new(GEM_SPEC) do |pkg|
   pkg.need_tar = false
   pkg.need_zip = false
 end
-
-file "#{GEM_SPEC.name}.gemspec" => ['Rakefile', 'tasks/gem.rake'] do |t|
-  puts "Generating #{t.name}"
-  File.open(t.name, 'w') { |f| f.puts GEM_SPEC.to_yaml }
-end
-
-desc "Generate or update the standalone gemspec file for the project"
-task :gemspec => ["#{GEM_SPEC.name}.gemspec"]

data/tasks/release.rake

@@ -8,7 +8,7 @@ end
 if defined?(RubyForge) then
   if defined?(GEM_SPEC) then
     desc 'Package and upload to RubyForge'
-    task :release => [:package] do |t|
+    task :release do |t|
       ver = ENV['VERSION'] or fail "Must supply VERSION (rake release VERSION=x.y.z)."
 
       # compare versions to avoid mistakes
@@ -26,19 +26,19 @@ if defined?(RubyForge) then
 
       # read project info and overview
       notes = begin
-                r = File.read("README.rdoc")
-                r.split(/^(=+ .*)/)[1..4].join.strip
+                r = File.read("README.markdown")
+                r.split(/^(.*\n\-+)/)[1..4].join.strip
               rescue
-                warn "Missing README.rdoc"
+                warn "Missing README.markdown"
                 ''
               end
 
       # read changes
       changes = begin
-                  h = File.read("History.txt")
-                  h.split(/^(==+ .*)/)[1..2].join.strip
+                  h = File.read("HISTORY.markdown")
+                  h.split(/^(##+ .*)/)[1..2].join.strip
                 rescue
-                  warn "Missing History.txt"
+                  warn "Missing HISTORY.markdown"
                   ''
                 end
 

data/tasks/retrieve.rake

@@ -36,7 +36,7 @@ begin
     url = "http://www.sqlite.org/#{File.basename(t.name)}"
     when_writing "downloading #{t.name}" do
       cd File.dirname(t.name) do
-        system "wget -c #{url} || curl -C - -O #{url}"
+        system "wget -c #{url} || curl -L -C - -O #{url}"
       end
     end
   end
@@ -46,7 +46,7 @@ begin
     url = "http://www.sqlite.org/#{File.basename(t.name)}"
     when_writing "downloading #{t.name}" do
       cd File.dirname(t.name) do
-        system "wget -c #{url} || curl -C - -O #{url}"
+        system "wget -c #{url} || curl -L -C - -O #{url}"
       end
     end
   end

data/tasks/spec.rake

@@ -5,6 +5,7 @@ desc 'Run specifications'
 Spec::Rake::SpecTask.new(:spec => [ :clean, :compile ]) do |t|
   t.spec_opts << '--options' << ROOT + 'spec/spec.opts'
   t.spec_files = Pathname.glob(ENV['FILES'] || 'spec/**/*_spec.rb').map { |f| f.to_s }
+  t.libs << 'lib'
 
   begin
     # RCov is run by default, except on the JRuby platform

metadata

@@ -57,9 +57,9 @@ files:
 - tasks/spec.rake
 - LICENSE
 - Rakefile
-- History.txt
+- HISTORY.markdown
+- README.markdown
 - Manifest.txt
-- README.txt
 - lib/do_sqlite3_ext.jar
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
@@ -69,17 +69,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 extensions: []
 
-rubygems_version: 1.3.2
+rubygems_version: 1.3.3
 requirements: []
 
 authors: 
 - Dirkjan Bussink
-date: 2009-05-16 22:00:00 +00:00
+date: 2009-09-19 22:00:00 +00:00
 platform: java
 test_files: []
 
 version: !ruby/object:Gem::Version 
-  version: 0.9.12
+  version: 0.10.0
 require_paths: 
 - lib
 dependencies: 
@@ -88,7 +88,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.0.0
+        version: "2.0"
     version: 
   type: :runtime
   version_requirement: 
@@ -108,7 +108,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.12
+        version: 0.10.0
     version: 
   type: :runtime
   version_requirement: 
@@ -128,7 +128,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.12
+        version: 0.10.0
     version: 
   type: :runtime
   version_requirement: 
@@ -144,4 +144,4 @@ dependencies:
   version_requirement: 
   name: rspec
 bindir: bin
-has_rdoc: false
+has_rdoc: true