do_sqlite3 0.9.10.1 → 0.9.11

data/History.txt

@@ -1,3 +1,9 @@
+== 0.9.11 2009-01-19
+* Improvements
+  * Ruby 1.9 support
+* Fixes
+  * Fix Windows gem
+
 == 0.9.9 2008-11-27
 * Improvements
   * Added cross compile rake tasks for Windows gems [Jonathan Stott, Luis Lavena]

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007 Yehuda Katz
+Copyright (c) 2007, 2008, 2009 Yehuda Katz, Dirkjan Bussink
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Manifest.txt

@@ -4,7 +4,6 @@ LICENSE
 Manifest.txt
 README.txt
 Rakefile
-TODO
 buildfile
 ext-java/src/main/java/DoSqlite3ExtService.java
 ext-java/src/main/java/do_sqlite3/Sqlite3DriverDefinition.java

data/Rakefile

@@ -10,8 +10,8 @@ JRUBY   = RUBY_PLATFORM =~ /java/
 WINDOWS = Gem.win_platform?
 SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
 
-AUTHOR = "Bernerd Schaefer"
-EMAIL  = "bj.schaefer@gmail.com"
+AUTHOR = "Dirkjan Bussink"
+EMAIL  = "d.bussink@gmail.com"
 GEM_NAME = "do_sqlite3"
 GEM_VERSION = DataObjects::Sqlite3::VERSION
 GEM_DEPENDENCIES = if JRUBY
@@ -21,27 +21,39 @@ else
 end
 
 # TODO: remove duplicates from here that are already listed in .gitignore
-clean = %w(o bundle log a gem dSYM obj pdb lib def exp DS_Store)
-
-if WINDOWS
-  GEM_EXTRAS = { :has_rdoc => false }
+clean = %w(o bundle jar log a gem dSYM obj pdb lib def exp DS_Store)
+
+GEM_EXTRAS = if WINDOWS
+  {
+    :has_rdoc => false
+  }
+elsif JRUBY
+  {
+    :has_rdoc => false,
+    :platform => 'java'
+  }
 else
-  GEM_EXTRAS = { :extensions => 'ext/do_sqlite3_ext/extconf.rb', :has_rdoc => false }
+  {
+    :has_rdoc => false,
+    :extensions => 'ext/do_sqlite3_ext/extconf.rb'
+  }
 end
 
-GEM_CLEAN = ["**/*.{#{clean.join(",")}}", 'ext/Makefile']
+GEM_CLEAN = ['**/test.db',"**/*.{#{clean.join(",")}}", 'ext/Makefile', 'ext-java/target']
 
 PROJECT_NAME = "dorb"
 PROJECT_URL  = "http://rubyforge.org/projects/dorb"
 PROJECT_DESCRIPTION = PROJECT_SUMMARY = "A DataObject.rb driver for Sqlite3"
 
-JAVA_DRIVER = true
 
 # RCov is run by default, except on the JRuby platform, or if NO_RCOV env is true
 RUN_RCOV = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
 
 if (tasks_dir = ROOT.parent + 'tasks').directory?
   require tasks_dir + 'hoe'
+  require tasks_dir + 'ext_helper_java'
+
+  setup_java_extension  "#{GEM_NAME}_ext", HOE.spec
 
   # use .gitignore to identify files to clean up
   File.read(ROOT.parent + '.gitignore').split(/\s+/).each do |pattern|
@@ -50,10 +62,21 @@ if (tasks_dir = ROOT.parent + 'tasks').directory?
   end
 end
 
+if JRUBY
+  HOE.spec.files += ['lib/do_sqlite3_ext.jar']
+  HOE.spec.require_paths = Dir['lib']
+end
+
 def sudo_gem(cmd)
   sh "#{SUDO} #{RUBY} -S gem #{cmd}", :verbose => false
 end
 
+# compile the extension
+if JRUBY
+  Rake::Task['compile:jruby'].invoke
+else
+end
+
 # Installation
 
 desc "Install #{GEM_NAME} #{GEM_VERSION}"
@@ -70,7 +93,7 @@ desc 'Run specifications'
 Spec::Rake::SpecTask.new(:spec) do |t|
   t.spec_opts << '--format' << 'specdoc' << '--colour'
   t.spec_opts << '--loadby' << 'random'
-  t.spec_files = Pathname.glob(ENV['FILES'] || 'spec/**/*_spec.rb')
+  t.spec_files = Pathname.glob(ENV['FILES'] || 'spec/**/*_spec.rb').map { |f| f.to_s }
 
   begin
     t.rcov = RUN_RCOV
@@ -120,6 +143,8 @@ CCROOT = ROOT.parent
 
 SQLITE_VERSION = '3_6_6_2'
 
+MINGW_PATH = ENV['MINGW_PATH'] || '/usr/i586-mingw32msvc'
+
 if (tasks_dir = ROOT.parent + 'tasks').directory?
   require tasks_dir + 'win32'
 
@@ -179,14 +204,13 @@ begin
   require 'rake/extensiontask'
   Rake::ExtensionTask.new('do_sqlite3_ext', HOE.spec) do |ext|
     ext.cross_compile = true                # enable cross compilation (requires cross compile toolchain)
-    ext.cross_platform = 'i386-mswin32'
+    ext.cross_platform = 'x86-mswin32-60'
     ext.cross_config_options << "--with-sqlite3-dir=#{SQLITE_DIR}"
   end
 rescue LoadError
   warn "To cross-compile, install rake-compiler (gem install rake-compiler)"
   if tasks_dir.directory?
     require tasks_dir + 'ext_helper'
-    setup_extension('do_sqlite3_ext', HOE.spec)
+    setup_c_extension('do_sqlite3_ext', HOE.spec)
   end
 end
-

data/buildfile

@@ -1,26 +1,27 @@
-# Apache Buildr buildfile for do_derby
+# Apache Buildr buildfile for do_sqlite3
 # see http://incubator.apache.org/buildr/ for more information on Apache Buildr
 require 'buildr'
 require 'pathname'
 
 VERSION_NUMBER = '1.0'
 JDBC_SUPPORT = ['data_objects:jdbc:jar:1.0']
+TARGET_DIR = 'pkg/classes'
 repositories.remote << 'http://www.ibiblio.org/maven2/'
 
 define 'do_sqlite3' do
   project.version = VERSION_NUMBER
   project.group = 'data_objects.rb'
 
-  manifest['Copyright'] = 'Alex Coles (C) 2008'
+  manifest['Copyright'] = 'Alex Coles (C) 2008-2009'
 
   compile.using :target => '1.5', :lint => 'all', :deprecation => 'true'
 
   define 'ext-java' do
-    package :jar
+    package(:jar).clean.include(TARGET_DIR)
         
     jdbc_support_jar = file('../../do_jdbc/lib/do_jdbc_internal.jar')
     jdbc_support = artifact('data_objects:jdbc:jar:1.0').from(jdbc_support_jar)
     
-    compile.with JDBC_SUPPORT
+    compile.into(TARGET_DIR).with(JDBC_SUPPORT)
   end
 end

data/ext-java/src/main/java/do_sqlite3/Sqlite3DriverDefinition.java

@@ -5,6 +5,11 @@ import data_objects.drivers.AbstractDriverDefinition;
 public class Sqlite3DriverDefinition extends AbstractDriverDefinition {
 
     public boolean supportsJdbcGeneratedKeys()
+    {
+        return true;
+    }
+
+    public boolean supportsConnectionPrepareStatementMethodWithGKFlag()
     {
         return false;
     }

data/ext/do_sqlite3_ext/do_sqlite3_ext.c

@@ -41,6 +41,7 @@
 
 // To store rb_intern values
 static ID ID_NEW_DATE;
+static ID ID_RATIONAL;
 static ID ID_LOGGER;
 static ID ID_DEBUG;
 static ID ID_LEVEL;
@@ -54,11 +55,6 @@ static VALUE cDO_Reader;
 
 static VALUE rb_cDate;
 static VALUE rb_cDateTime;
-
-#ifndef RUBY_19_COMPATIBILITY
-static VALUE rb_cRational;
-#endif
-
 static VALUE rb_cBigDecimal;
 
 static VALUE mSqlite3;
@@ -133,7 +129,7 @@ static VALUE parse_date(char *date) {
 
   // Math from Date.jd_to_ajd
   ajd = jd * 2 - 1;
-  rational = rb_funcall(rb_cRational, rb_intern("new!"), 2, INT2NUM(ajd), INT2NUM(2));
+  rational = rb_funcall(rb_mKernel, ID_RATIONAL, 2, INT2NUM(ajd), INT2NUM(2));
   return rb_funcall(rb_cDate, ID_NEW_DATE, 3, rational, INT2NUM(0), INT2NUM(2299161));
 }
 
@@ -141,7 +137,7 @@ static VALUE parse_date(char *date) {
 static VALUE seconds_to_offset(do_int64 num) {
   do_int64 den = 86400;
   reduce(&num, &den);
-  return rb_funcall(rb_cRational, rb_intern("new!"), 2, rb_ll2inum(num), rb_ll2inum(den));
+  return rb_funcall(rb_mKernel, ID_RATIONAL, 2, rb_ll2inum(num), rb_ll2inum(den));
 }
 
 static VALUE timezone_to_offset(int hour_offset, int minute_offset) {
@@ -239,7 +235,7 @@ static VALUE parse_date_time(char *date) {
 
   reduce(&num, &den);
 
-  ajd = rb_funcall(rb_cRational, rb_intern("new!"), 2, rb_ull2inum(num), rb_ull2inum(den));
+  ajd = rb_funcall(rb_mKernel, ID_RATIONAL, 2, rb_ull2inum(num), rb_ull2inum(den));
   offset = timezone_to_offset(hour_offset, minute_offset);
 
   return rb_funcall(rb_cDateTime, ID_NEW_DATE, 3, ajd, offset, INT2NUM(2299161));
@@ -263,7 +259,7 @@ static VALUE parse_time(char *date) {
 }
 
 static VALUE typecast(sqlite3_stmt *stmt, int i, VALUE ruby_class) {
-  char *ruby_type;
+  const char *ruby_type;
   VALUE ruby_value = Qnil;
   int original_type = sqlite3_column_type(stmt, i);
   int length        = sqlite3_column_bytes(stmt, i);
@@ -295,7 +291,7 @@ static VALUE typecast(sqlite3_stmt *stmt, int i, VALUE ruby_class) {
   }
 
   if ( strcmp(ruby_type, "Class") == 0) {
-    return rb_funcall(mDO, rb_intern("find_const"), 1, TAINTED_STRING((char*)sqlite3_column_text(stmt, i), length));
+    return rb_funcall(rb_cObject, rb_intern("full_const_get"), 1, TAINTED_STRING((char*)sqlite3_column_text(stmt, i), length));
   } else if ( strcmp(ruby_type, "Object") == 0 ) {
     return rb_marshal_load(rb_str_new2((char*)sqlite3_column_text(stmt, i)));
   } else if ( strcmp(ruby_type, "TrueClass") == 0 ) {
@@ -526,6 +522,14 @@ static VALUE cReader_fields(VALUE self) {
   return rb_iv_get(self, "@fields");
 }
 
+static VALUE cReader_field_count(VALUE self) {
+  return rb_iv_get(self, "@field_count");
+}
+
+static VALUE cReader_row_count(VALUE self) {
+  return rb_iv_get(self, "@row_count");
+}
+
 void Init_do_sqlite3_ext() {
   rb_require("bigdecimal");
   rb_require("date");
@@ -534,7 +538,6 @@ void Init_do_sqlite3_ext() {
   rb_cDate = CONST_GET(rb_mKernel, "Date");
   rb_cDateTime = CONST_GET(rb_mKernel, "DateTime");
   rb_cTime = CONST_GET(rb_mKernel, "Time");
-  rb_cRational = CONST_GET(rb_mKernel, "Rational");
   rb_cBigDecimal = CONST_GET(rb_mKernel, "BigDecimal");
 
   rb_funcall(rb_mKernel, rb_intern("require"), 1, rb_str_new2("data_objects"));
@@ -544,6 +547,7 @@ void Init_do_sqlite3_ext() {
 #else
   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");
@@ -580,5 +584,7 @@ void Init_do_sqlite3_ext() {
   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_define_method(cReader, "row_count", cReader_row_count, 0);
 
 }

data/ext/do_sqlite3_ext/extconf.rb

@@ -30,8 +30,6 @@ $CFLAGS << ' -Wall ' unless RUBY_PLATFORM =~ /mswin/
 
 if RUBY_VERSION < '1.8.6'
   $CFLAGS << ' -DRUBY_LESS_THAN_186'
-elsif RUBY_VERSION >= '1.9.0'
-  $CFLAGS << ' -DRUBY_19_COMPATIBILITY'
 end
 
 # Do the work

data/lib/do_sqlite3.rb

@@ -15,7 +15,7 @@ if RUBY_PLATFORM =~ /java/
   require 'jdbc/sqlite3' # the JDBC driver, packaged as a gem
 end
 
-require File.expand_path(File.join(File.dirname(__FILE__), 'do_sqlite3_ext'))
+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'))
 

data/lib/do_sqlite3/version.rb

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

data/spec/integration/do_sqlite3_spec.rb

@@ -5,8 +5,18 @@ describe "DataObjects::Sqlite3" do
   include Sqlite3SpecHelpers
 
   it "should raise error on bad connection string" do
+    pending
     # lambda { DataObjects::Connection.new("sqlite3:///ac0d9iopalmsdcasd/asdc9pomasd/test.db") }.should raise_error("unable to open database file")
   end
+
+  if JRUBY
+    it "should accept either DO or JDBC style URLs on JRuby" do
+      pending
+      @connection = DataObjects::Connection.new("jdbc:sqlite:test.db") # note the sqlite not sqlite3!
+      @connection = DataObjects::Connection.new("sqlite3://#{File.expand_path(File.dirname(__FILE__))}/test.db")
+    end
+  end
+
 end
 
 NOW = DateTime.now
@@ -15,17 +25,21 @@ describe "DataObjects::Sqlite3::Result" do
   include Sqlite3SpecHelpers
 
   before(:all) do
-    if JRUBY                                    # note the sqlite not sqlite3!
-      @connection = DataObjects::Connection.new("jdbc:sqlite:test.db")
-    else
-      @connection = DataObjects::Connection.new("sqlite3://#{File.expand_path(File.dirname(__FILE__))}/test.db")
-    end
+    @connection = DataObjects::Connection.new("sqlite3://#{File.expand_path(File.dirname(__FILE__))}/test.db")
+  end
+
+  before do
+    class ::Person; end
   end
 
   after :all do
     @connection.close
   end
 
+  after do
+    Object.send(:remove_const, :Person)
+  end
+
   it "should raise an error for a bad query" do
     command = @connection.create_command("INSER INTO table_which_doesnt_exist (id) VALUES (1)")
     lambda { command.execute_non_query }.should raise_error(Sqlite3Error, /near "INSER": syntax error/)
@@ -64,7 +78,7 @@ describe "DataObjects::Sqlite3::Result" do
     reader.close
   end
 
-  it "should do a paramaterized reader query" do
+  it "should do a parameterized reader query" do
     command = @connection.create_command("SELECT * FROM users WHERE id = ?")
     reader = command.execute_reader(1)
     reader.next!
@@ -111,8 +125,6 @@ describe "DataObjects::Sqlite3::Result" do
   end
 
   it "should do a custom typecast reader with Class" do
-    class Person; end
-
     id = insert("INSERT INTO users (name, age, type) VALUES (?, ?, ?)", 'Sam', 30, Person)
 
     select("SELECT name, age, type FROM users WHERE id = ?", [String, Integer, Class], id) do |reader|
@@ -178,8 +190,10 @@ describe "DataObjects::Sqlite3::Result" do
   end
 
   it "should return a BigDecimal" do
+    pending "We need to introduce something like Proxy for typeasting where each SQL type will have _rules_ of casting" if JRUBY
     balance = BigDecimal.new('10000000000.00')
 
+    #looks like inserting BigDecimals is not implemented in SQLITE's jdbc driver http://zentus.com/sqlitejdbc/src/src/org/sqlite/Unused.java
     id = insert("INSERT INTO users (name, age, type, created_at, balance) VALUES (?, ?, ?, ?, ?)", 'Scott', 27, Person, DateTime.now, balance)
 
     select("SELECT balance FROM users WHERE id = ?", [BigDecimal], id) do |reader|
@@ -187,74 +201,78 @@ describe "DataObjects::Sqlite3::Result" do
     end
   end
 
-  describe "quoting" do
+  unless JRUBY
 
-    before do
-      @connection.create_command("DROP TABLE IF EXISTS sail_boats").execute_non_query
-      @connection.create_command("CREATE TABLE sail_boats ( id INTEGER PRIMARY KEY, name VARCHAR(50), port VARCHAR(50), notes VARCHAR(50), vintage BOOLEAN )").execute_non_query
-      command = @connection.create_command("INSERT INTO sail_boats (id, name, port, name, vintage) VALUES (?, ?, ?, ?, ?)")
-      command.execute_non_query(1, "A", "C", "Fortune Pig!", false)
-      command.execute_non_query(2, "B", "B", "Happy Cow!", true)
-      command.execute_non_query(3, "C", "A", "Spoon", true)
-    end
+    describe "quoting" do
 
-    after do
-      @connection.create_command("DROP TABLE sail_boats").execute_non_query
-    end
+      before do
+        @connection.create_command("DROP TABLE IF EXISTS sail_boats").execute_non_query
+        @connection.create_command("CREATE TABLE sail_boats ( id INTEGER PRIMARY KEY, name VARCHAR(50), port VARCHAR(50), notes VARCHAR(50), vintage BOOLEAN )").execute_non_query
+        command = @connection.create_command("INSERT INTO sail_boats (id, name, port, name, vintage) VALUES (?, ?, ?, ?, ?)")
+        command.execute_non_query(1, "A", "C", "Fortune Pig!", false)
+        command.execute_non_query(2, "B", "B", "Happy Cow!", true)
+        command.execute_non_query(3, "C", "A", "Spoon", true)
+      end
 
-    it "should quote a String" do
-      command = @connection.create_command("INSERT INTO users (name) VALUES (?)")
-      result = command.execute_non_query("John Doe")
-      result.to_i.should == 1
-    end
+      after do
+        @connection.create_command("DROP TABLE sail_boats").execute_non_query
+      end
 
-    it "should quote multiple values" do
-      command = @connection.create_command("INSERT INTO users (name, age) VALUES (?, ?)")
-      result = command.execute_non_query("Sam Smoot", 1)
-      result.to_i.should == 1
-    end
+      it "should quote a String" do
+        command = @connection.create_command("INSERT INTO users (name) VALUES (?)")
+        result = command.execute_non_query("John Doe")
+        result.to_i.should == 1
+      end
 
+      it "should quote multiple values" do
+        command = @connection.create_command("INSERT INTO users (name, age) VALUES (?, ?)")
+        result = command.execute_non_query("Sam Smoot", 1)
+        result.to_i.should == 1
+      end
 
-    it "should handle boolean columns gracefully" do
-      command = @connection.create_command("INSERT INTO sail_boats (id, name, port, name, vintage) VALUES (?, ?, ?, ?, ?)")
-      result = command.execute_non_query(4, "Scooner", "Port au Prince", "This is one gangster boat!", true)
-      result.to_i.should == 1
-    end
 
-    it "should quote an Array" do
-      command = @connection.create_command("SELECT id, notes FROM sail_boats WHERE (id IN ?)")
-      reader = command.execute_reader([1, 2, 3])
+      it "should handle boolean columns gracefully" do
+        command = @connection.create_command("INSERT INTO sail_boats (id, name, port, name, vintage) VALUES (?, ?, ?, ?, ?)")
+        result = command.execute_non_query(4, "Scooner", "Port au Prince", "This is one gangster boat!", true)
+        result.to_i.should == 1
+      end
+
+      it "should quote an Array" do
+        command = @connection.create_command("SELECT id, notes FROM sail_boats WHERE (id IN ?)")
+        reader = command.execute_reader([1, 2, 3])
 
-      i = 1
-      while(reader.next!)
-        reader.values[0].should == i
-        i += 1
+        i = 1
+        while(reader.next!)
+          reader.values[0].should == i
+          i += 1
+        end
       end
-    end
 
-    it "should quote an Array with NULL values returned" do
-      command = @connection.create_command("SELECT id, NULL AS notes FROM sail_boats WHERE (id IN ?)")
-      reader = command.execute_reader([1, 2, 3])
+      it "should quote an Array with NULL values returned" do
+        command = @connection.create_command("SELECT id, NULL AS notes FROM sail_boats WHERE (id IN ?)")
+        reader = command.execute_reader([1, 2, 3])
 
-      i = 1
-      while(reader.next!)
-        reader.values[0].should == i
-        i += 1
+        i = 1
+        while(reader.next!)
+          reader.values[0].should == i
+          i += 1
+        end
       end
-    end
 
-    it "should quote an Array with NULL values returned AND set_types called" do
-      command = @connection.create_command("SELECT id, NULL AS notes FROM sail_boats WHERE (id IN ?)")
-      command.set_types [ Integer, String ]
+      it "should quote an Array with NULL values returned AND set_types called" do
+        command = @connection.create_command("SELECT id, NULL AS notes FROM sail_boats WHERE (id IN ?)")
+        command.set_types [ Integer, String ]
 
-      reader = command.execute_reader([1, 2, 3])
+        reader = command.execute_reader([1, 2, 3])
 
-      i = 1
-      while(reader.next!)
-        reader.values[0].should == i
-        i += 1
+        i = 1
+        while(reader.next!)
+          reader.values[0].should == i
+          i += 1
+        end
       end
-    end
 
-  end # describe "quoting"
+    end # describe "quoting"
+
+  end
 end

data/spec/integration/logging_spec.rb

@@ -4,11 +4,7 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 describe DataObjects::Sqlite3::Command do
 
   before(:each) do
-    if JRUBY                                    # note the sqlite not sqlite3!
-      @connection = DataObjects::Connection.new("jdbc:sqlite:test.db")
-    else
       @connection = DataObjects::Connection.new("sqlite3://#{File.expand_path(File.dirname(__FILE__))}/test.db")
-    end
   end
 
   after(:each) do
@@ -18,11 +14,12 @@ describe DataObjects::Sqlite3::Command do
   describe "Executing a Reader" do
 
     it "should log reader queries when the level is Debug (0)" do
+      pending "SQLiteJDBC does not implement java.sql.Statement#toString" if JRUBY
       command = @connection.create_command("SELECT * FROM users")
       @mock_logger = mock('MockLogger', :level => 0)
       DataObjects::Sqlite3.should_receive(:logger).and_return(@mock_logger)
       @mock_logger.should_receive(:debug).with(/\([\d.]+\) SELECT \* FROM users/)
-      command.execute_reader
+      command.execute_reader.close
     end
 
     it "shouldn't log reader queries when the level isn't Debug (0)" do
@@ -30,12 +27,13 @@ describe DataObjects::Sqlite3::Command do
       @mock_logger = mock('MockLogger', :level => 1)
       DataObjects::Sqlite3.should_receive(:logger).and_return(@mock_logger)
       @mock_logger.should_not_receive(:debug)
-      command.execute_reader
+      command.execute_reader.close
     end
   end
 
   describe "Executing a Non-Query" do
     it "should log non-query statements when the level is Debug (0)" do
+      pending "SQLiteJDBC does not implement java.sql.Statement#toString" if JRUBY
       command = @connection.create_command("INSERT INTO users (name) VALUES (?)")
       @mock_logger = mock('MockLogger', :level => 0)
       DataObjects::Sqlite3.should_receive(:logger).and_return(@mock_logger)

data/spec/integration/quoting_spec.rb

@@ -1,23 +1,23 @@
 require 'pathname'
 require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
-describe DataObjects::Sqlite3::Command do
+unless JRUBY
 
-  before(:each) do
-    if JRUBY                                    # NOTE the sqlite not sqlite3
-      @connection = DataObjects::Connection.new("jdbc:sqlite:test.db")
-    else
+  describe DataObjects::Sqlite3::Command do
+
+    before(:each) do
       @connection = DataObjects::Connection.new("sqlite3://#{File.expand_path(File.dirname(__FILE__))}/test.db")
+      @command = @connection.create_command("INSERT INTO users (name) VALUES (?)")
+    end
+
+    it "should properly quote a string" do
+      @command.quote_string("O'Hare").should == "'O''Hare'"
+      @command.quote_string("Willy O'Hare & Johnny O'Toole").should == "'Willy O''Hare & Johnny O''Toole'"
+      @command.quote_string("Billy\\Bob").should == "'Billy\\Bob'"
+      @command.quote_string("The\\Backslasher\\Rises\\Again").should == "'The\\Backslasher\\Rises\\Again'"
+      @command.quote_string("Scott \"The Rage\" Bauer").should == "'Scott \"The Rage\" Bauer'"
     end
-    @command = @connection.create_command("INSERT INTO users (name) VALUES (?)")
-  end
 
-  it "should properly quote a string" do
-    @command.quote_string("O'Hare").should == "'O''Hare'"
-    @command.quote_string("Willy O'Hare & Johnny O'Toole").should == "'Willy O''Hare & Johnny O''Toole'"
-    @command.quote_string("Billy\\Bob").should == "'Billy\\Bob'"
-    @command.quote_string("The\\Backslasher\\Rises\\Again").should == "'The\\Backslasher\\Rises\\Again'"
-    @command.quote_string("Scott \"The Rage\" Bauer").should == "'Scott \"The Rage\" Bauer'"
   end
 
 end

data/spec/spec_helper.rb

@@ -23,7 +23,7 @@ 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, 0)
+DataObjects::Sqlite3.logger = DataObjects::Logger.new(log_path, :debug)
 
 at_exit { DataObjects.logger.flush }
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: do_sqlite3
 version: !ruby/object:Gem::Version 
-  version: 0.9.10.1
+  version: 0.9.11
 platform: ruby
 authors: 
-- Bernerd Schaefer
+- Dirkjan Bussink
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-01-05 00:00:00 +01:00
+date: 2009-01-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.10.1
+        version: 0.9.11
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -34,7 +34,7 @@ dependencies:
     version: 
 description: A DataObject.rb driver for Sqlite3
 email: 
-- bj.schaefer@gmail.com
+- d.bussink@gmail.com
 executables: []
 
 extensions: 
@@ -50,7 +50,6 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
-- TODO
 - buildfile
 - ext-java/src/main/java/DoSqlite3ExtService.java
 - ext-java/src/main/java/do_sqlite3/Sqlite3DriverDefinition.java

data/TODO

@@ -1,4 +0,0 @@
-TODO
-====
-
-  * Add JDBC-based version of this driver.