do_sqlite3 0.9.11 → 0.9.12

data/ext/do_sqlite3_ext/extconf.rb

@@ -36,5 +36,7 @@ end
 # 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(extension_name)
 end

data/lib/do_sqlite3/version.rb

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

data/spec/command_spec.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+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'
+end

data/spec/connection_spec.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'data_objects/spec/connection_spec'
+
+describe DataObjects::Sqlite3::Connection do
+
+  before :all do
+    @driver = CONFIG.scheme
+    @user   = CONFIG.user
+    @password = CONFIG.pass
+    @host   = CONFIG.host
+    @port   = CONFIG.port
+    @database = CONFIG.database
+  end
+
+  it_should_behave_like 'a Connection'
+end

data/spec/lib/rspec_immediate_feedback_formatter.rb

@@ -0,0 +1,3 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'data_objects', 'spec', 'lib', 'rspec_immediate_feedback_formatter'))

data/spec/reader_spec.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+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'
+end

data/spec/result_spec.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'data_objects/spec/result_spec'
+
+describe DataObjects::Sqlite3::Result do
+  it_should_behave_like 'a Result'
+  it_should_behave_like 'a Result which returns inserted keys'
+end

data/spec/spec_helper.rb

@@ -2,15 +2,23 @@ $TESTING=true
 JRUBY = RUBY_PLATFORM =~ /java/
 
 require 'rubygems'
+
+gem 'rspec', '>1.1.12'
 require 'spec'
+
 require 'date'
+require 'ostruct'
 require 'pathname'
+require 'fileutils'
 
 # 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 }
+
 if JRUBY
   $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'do_jdbc', 'lib'))
   require 'do_jdbc'
@@ -27,27 +35,90 @@ DataObjects::Sqlite3.logger = DataObjects::Logger.new(log_path, :debug)
 
 at_exit { DataObjects.logger.flush }
 
-module Sqlite3SpecHelpers
+Spec::Runner.configure do |config|
+  config.include(DataObjects::Spec::PendingHelpers)
+end
 
-  def insert(query, *args)
-    result = @connection.create_command(query).execute_non_query(*args)
-    result.insert_id
-  end
+CONFIG = OpenStruct.new
+CONFIG.scheme   = 'sqlite3'
+CONFIG.database = ENV['DO_SQLITE3_DATABASE'] || "#{File.expand_path(File.dirname(__FILE__))}/test.db"
 
-  def exec(query, *args)
-    @connection.create_command(query).execute_non_query(*args)
-  end
+CONFIG.uri = ENV["DO_SQLITE3_SPEC_URI"] || "#{CONFIG.scheme}://#{CONFIG.database}"
+
+module DataObjectsSpecHelpers
+
+  def setup_test_environment
+    conn = DataObjects::Connection.new(CONFIG.uri)
+
+    conn.create_command(<<-EOF).execute_non_query
+      DROP TABLE IF EXISTS "invoices"
+    EOF
 
-  def select(query, types = nil, *args)
-    begin
-      command = @connection.create_command(query)
-      command.set_types types unless types.nil?
-      reader = command.execute_reader(*args)
-      reader.next!
-      yield reader
-    ensure
-      reader.close if reader
+    conn.create_command(<<-EOF).execute_non_query
+      DROP TABLE IF EXISTS "users"
+    EOF
+
+    conn.create_command(<<-EOF).execute_non_query
+      DROP TABLE IF EXISTS "widgets"
+    EOF
+
+    conn.create_command(<<-EOF).execute_non_query
+      CREATE TABLE "users" (
+        "id" SERIAL,
+        "name" VARCHAR(200) default 'Billy' NULL,
+        "fired_at" timestamp,
+        PRIMARY KEY  ("id")
+      );
+    EOF
+
+    conn.create_command(<<-EOF).execute_non_query
+      CREATE TABLE "invoices" (
+        "id" SERIAL,
+        "invoice_number" varchar(50) NOT NULL,
+        PRIMARY KEY  ("id")
+      );
+    EOF
+
+    conn.create_command(<<-EOF).execute_non_query
+      CREATE TABLE "widgets" (
+        "id" INTEGER PRIMARY KEY AUTOINCREMENT,
+        "code" char(8) default 'A14' NULL,
+        "name" varchar(200) default 'Super Widget' NULL,
+        "shelf_location" text NULL,
+        "description" text NULL,
+        "image_data" blob NULL,
+        "ad_description" text NULL,
+        "ad_image" blob NULL,
+        "whitepaper_text" text NULL,
+        "cad_drawing" blob,
+        "flags" char default 'f',
+        "number_in_stock" smallint default 500,
+        "number_sold" integer default 0,
+        "super_number" bigint default 9223372036854775807,
+        "weight" float default 1.23,
+        "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_timestamp" timestamp with time zone default '2008-02-14 00:31:31'
+      );
+    EOF
+
+    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);
+      EOF
     end
+
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set flags = 't' where id = 2
+    EOF
+
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set ad_description = NULL where id = 3
+    EOF
+
+    conn.close
   end
 
 end

data/spec/typecast/array_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/array_spec'
+
+describe 'DataObjects::Sqlite3 with Array' do
+  it_should_behave_like 'supporting Array'
+end

data/spec/typecast/bigdecimal_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/bigdecimal_spec'
+
+describe 'DataObjects::Sqlite3 with BigDecimal' do
+  it_should_behave_like 'supporting BigDecimal'
+end

data/spec/typecast/boolean_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/boolean_spec'
+
+describe 'DataObjects::Sqlite3 with Boolean' do
+  it_should_behave_like 'supporting Boolean'
+end

data/spec/typecast/byte_array_spec.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+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'
+end

data/spec/typecast/class_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/class_spec'
+
+describe 'DataObjects::Sqlite3 with Class' do
+  it_should_behave_like 'supporting Class'
+end

data/spec/typecast/date_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/date_spec'
+
+describe 'DataObjects::Sqlite3 with Date' do
+  it_should_behave_like 'supporting Date'
+end

data/spec/typecast/datetime_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/datetime_spec'
+
+describe 'DataObjects::Sqlite3 with DateTime' do
+  it_should_behave_like 'supporting DateTime'
+end

data/spec/typecast/float_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/float_spec'
+
+describe 'DataObjects::Sqlite3 with Float' do
+  it_should_behave_like 'supporting Float'
+end

data/spec/typecast/integer_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/integer_spec'
+
+describe 'DataObjects::Sqlite3 with Integer' do
+  it_should_behave_like 'supporting Integer'
+end

data/spec/typecast/nil_spec.rb

@@ -0,0 +1,10 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'data_objects/spec/typecast/nil_spec'
+
+describe 'DataObjects::Sqlite3 with Nil' do
+  it_should_behave_like 'supporting Nil'
+# it_should_behave_like 'supporting writing an Nil'
+  it_should_behave_like 'supporting Nil autocasting'
+end

data/spec/typecast/range_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/range_spec'
+
+describe 'DataObjects::Sqlite3 with Range' do
+  it_should_behave_like 'supporting Range'
+end

data/spec/typecast/string_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/string_spec'
+
+describe 'DataObjects::Sqlite3 with String' do
+  it_should_behave_like 'supporting String'
+end

data/spec/typecast/time_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/time_spec'
+
+describe 'DataObjects::Sqlite3 with Time' do
+  it_should_behave_like 'supporting Time'
+end

data/tasks/gem.rake

@@ -0,0 +1,61 @@
+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_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/install.rake

@@ -0,0 +1,15 @@
+def sudo_gem(cmd)
+  sh "#{SUDO} #{RUBY} -S gem #{cmd}", :verbose => false
+end
+
+# Installation
+
+desc "Install #{GEM_SPEC.name} #{GEM_SPEC.version}"
+task :install => [ :package ] do
+  sudo_gem "install pkg/#{GEM_SPEC.name}-#{GEM_SPEC.version} --no-update-sources"
+end
+
+desc "Uninstall #{GEM_SPEC.name} #{GEM_SPEC.version}"
+task :uninstall => [ :clean ] do
+  sudo_gem "uninstall #{GEM_SPEC.name} -v#{GEM_SPEC.version} -I -x"
+end

data/tasks/native.rake

@@ -0,0 +1,35 @@
+begin
+  gem('rake-compiler')
+  require 'rake/extensiontask'
+
+  # compile the extension
+  if JRUBY
+    # XXX: is it necessary to run this everytime?
+    Rake::Task['compile:jruby'].invoke
+  end
+
+  Rake::ExtensionTask.new('do_sqlite3_ext', GEM_SPEC) do |ext|
+
+    sqlite3_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', 'sqlite3'))
+
+    ext.cross_compile = true
+    ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60']
+    ext.cross_config_options << "--with-sqlite3-dir=#{sqlite3_lib}"
+
+    # automatically add build options to avoid need of manual input
+    if RUBY_PLATFORM =~ /mswin|mingw/ then
+      ext.config_options << "--with-sqlite3-dir=#{sqlite3_lib}"
+    end
+
+  end
+rescue LoadError
+  warn "To cross-compile, install rake-compiler (gem install rake-compiler)"
+
+  if (tasks_dir = ROOT.parent + 'tasks').directory?
+    require tasks_dir + 'ext_helper'
+    require tasks_dir + 'ext_helper_java'
+
+    setup_c_extension("#{GEM_SPEC.name}_ext", GEM_SPEC)
+    setup_java_extension("#{GEM_SPEC.name}_ext", GEM_SPEC)
+  end
+end