do_sqlite3 0.9.9-x86-mswin32-60 → 0.9.11-x86-mswin32-60

data/ext/{extconf.rb → do_sqlite3_ext/extconf.rb}

@@ -30,12 +30,11 @@ $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
 # create_makefile(extension_name)
 if have_header( "sqlite3.h" ) && have_library( "sqlite3", "sqlite3_open" )
+  have_func("sqlite3_prepare_v2")
   create_makefile(extension_name)
 end

data/lib/do_sqlite3.rb

@@ -1,4 +1,3 @@
-
 # 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.
@@ -9,5 +8,31 @@ 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
+end
+
 require 'do_sqlite3_ext'
-require 'do_sqlite3/transaction'
+require File.expand_path(File.join(File.dirname(__FILE__), 'do_sqlite3', 'version'))
+require File.expand_path(File.join(File.dirname(__FILE__), '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
+        end
+      end
+    end
+  end
+
+end

data/lib/do_sqlite3/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Sqlite3
-    VERSION = "0.9.9"
+    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
@@ -18,19 +28,27 @@ describe "DataObjects::Sqlite3::Result" do
     @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('near "INSER": syntax error')
+    lambda { command.execute_non_query }.should raise_error(Sqlite3Error, /near "INSER": syntax error/)
 
     command = @connection.create_command("INSERT INTO table_which_doesnt_exist (id) VALUES (1)")
-    lambda { command.execute_non_query }.should raise_error("no such table: table_which_doesnt_exist")
+    lambda { command.execute_non_query }.should raise_error(Sqlite3Error, /no such table: table_which_doesnt_exist/)
 
     command = @connection.create_command("SELECT * FROM table_which_doesnt_exist")
-    lambda { command.execute_reader }.should raise_error("no such table: table_which_doesnt_exist")
+    lambda { command.execute_reader }.should raise_error(Sqlite3Error, /no such table: table_which_doesnt_exist/)
   end
 
   it "should return the affected rows and insert_id" do
@@ -48,19 +66,19 @@ describe "DataObjects::Sqlite3::Result" do
     command = @connection.create_command("SELECT * FROM users")
     reader = command.execute_reader
 
-    lambda { reader.values }.should raise_error
+    lambda { reader.values }.should raise_error(Sqlite3Error, /Reader is not initialized/)
 
     while ( reader.next! )
       lambda { reader.values }.should_not raise_error
       reader.values.should be_a_kind_of(Array)
     end
 
-    lambda { reader.values }.should raise_error
+    lambda { reader.values }.should raise_error(Sqlite3Error, /Reader is not initialized/)
 
     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!
@@ -69,7 +87,7 @@ describe "DataObjects::Sqlite3::Result" do
 
     reader.next!
 
-    lambda { reader.values }.should raise_error
+    lambda { reader.values }.should raise_error(Sqlite3Error, /Reader is not initialized/)
 
     reader.close
   end
@@ -103,12 +121,10 @@ describe "DataObjects::Sqlite3::Result" do
   end
 
   it "should raise an error when you pass too many or too few types for the expected result set" do
-    lambda { select("SELECT name, id FROM users", [String, Integer, String]) }.should raise_error(Sqlite3Error)
+    lambda { select("SELECT name, id FROM users", [String, Integer, String]) }.should raise_error(Sqlite3Error, /Field-count mismatch. Expected 3 fields, but the query yielded 2/)
   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|
@@ -174,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|
@@ -183,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,7 +4,7 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 describe DataObjects::Sqlite3::Command do
 
   before(:each) do
-    @connection = DataObjects::Connection.new("sqlite3://#{File.expand_path(File.dirname(__FILE__))}/test.db")
+      @connection = DataObjects::Connection.new("sqlite3://#{File.expand_path(File.dirname(__FILE__))}/test.db")
   end
 
   after(:each) do
@@ -14,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("SELECT * FROM users")
-      command.execute_reader
+      @mock_logger.should_receive(:debug).with(/\([\d.]+\) SELECT \* FROM users/)
+      command.execute_reader.close
     end
 
     it "shouldn't log reader queries when the level isn't Debug (0)" do
@@ -26,16 +27,17 @@ 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)
-      @mock_logger.should_receive(:debug).with("INSERT INTO users (name) VALUES ('Blah')")
+      @mock_logger.should_receive(:debug).with(/\([\d.]+\) INSERT INTO users \(name\) VALUES \('Blah'\)/)
       command.execute_non_query('Blah')
     end
 

data/spec/integration/quoting_spec.rb

@@ -1,19 +1,23 @@
 require 'pathname'
 require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
-describe DataObjects::Sqlite3::Command do
+unless JRUBY
 
-  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
+  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
 
-  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

@@ -1,4 +1,5 @@
 $TESTING=true
+JRUBY = RUBY_PLATFORM =~ /java/
 
 require 'rubygems'
 require 'spec'
@@ -10,6 +11,11 @@ require 'pathname'
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'data_objects', 'lib'))
 require 'data_objects'
 
+if JRUBY
+  $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'do_jdbc', 'lib'))
+  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 'do_sqlite3'
@@ -17,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.9
+  version: 0.9.11
 platform: x86-mswin32-60
 authors: 
-- Bernerd Schaefer
+- Dirkjan Bussink
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-11-27 00:00:00 -08: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.9
+        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,9 +50,11 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
-- TODO
-- ext/do_sqlite3_ext.c
-- ext/extconf.rb
+- buildfile
+- ext-java/src/main/java/DoSqlite3ExtService.java
+- ext-java/src/main/java/do_sqlite3/Sqlite3DriverDefinition.java
+- ext/do_sqlite3_ext/do_sqlite3_ext.c
+- ext/do_sqlite3_ext/extconf.rb
 - lib/do_sqlite3.rb
 - lib/do_sqlite3/transaction.rb
 - lib/do_sqlite3/version.rb
@@ -65,10 +67,7 @@ files:
 - lib/do_sqlite3_ext.so
 has_rdoc: false
 homepage: http://rubyforge.org/projects/dorb
-post_install_message: |
-  Now download http://www.sqlite.org/sqlitedll-3_6_6_2.zip
-  And place the dll somewhere in your PATH, for example C:\ruby\bin
-
+post_install_message: 
 rdoc_options: 
 - --main
 - README.txt