amalgalite 0.7.5 → 0.7.6

data/lib/amalgalite/statement.rb

@@ -35,6 +35,14 @@ module Amalgalite
       @blobs_to_write  = []
       @rowid_index     = nil
       @result_meta     = nil
+      @open            = true
+    end
+
+    ##
+    # is the statement open for business
+    #
+    def open?
+      @open
     end
 
     ##
@@ -288,8 +296,10 @@ module Amalgalite
         row = nil
         write_blobs
       else
-        raise Amalgalite::SQLite3::Error, 
-              "SQLITE ERROR #{rc} (#{Amalgalite::SQLite3::Constants::ResultCode.name_from_value( rc )}) : #{@db.api.last_error_message}"
+        self.close # must close so that the error message is guaranteed to be pushed into the database handler
+                   # and we can can call last_error_message on it
+        msg = "SQLITE ERROR #{rc} (#{Amalgalite::SQLite3::Constants::ResultCode.name_from_value( rc )}) : #{@db.api.last_error_message}"
+        raise Amalgalite::SQLite3::Error, msg
       end
       return row
     end
@@ -396,7 +406,10 @@ module Amalgalite
     # has been closed.
     #
     def close
-      @stmt_api.close
+      if open?
+        @stmt_api.close
+        @open = false
+      end
     end
   end
 end

data/lib/amalgalite/version.rb

@@ -9,7 +9,7 @@ module Amalgalite
 
     MAJOR   = 0
     MINOR   = 7
-    BUILD   = 5
+    BUILD   = 6
 
     #
     # return the Version as an array of MAJOR, MINOR, BUILD

data/spec/aggregate_spec.rb

@@ -1,7 +1,8 @@
 require 'rubygems'
 require 'spec'
 
-$: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
+require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) )
+
 require 'amalgalite'
 require 'amalgalite/database'
 

data/spec/busy_handler.rb

@@ -1,7 +1,8 @@
 require 'rubygems'
 require 'spec'
 
-$: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
+require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper.rb' ) )
+
 require 'amalgalite'
 require 'amalgalite/database'
 

data/spec/database_spec.rb

@@ -240,6 +240,36 @@ describe Amalgalite::Database do
     end
   end
 
+  it "commits if an exception happens during a transaction block but is rescued within the block" do
+    @iso_db.transaction do |db|
+      begin
+        r = db.execute("SELECT count(1) as cnt FROM country");
+        r.first['cnt'].should eql(242)
+        db.execute("DELETE FROM country")
+        db.in_transaction?.should eql(true)
+        raise "testing rollback"
+      rescue => e
+        e.message.should == "testing rollback"
+      end
+      $!.should == nil
+    end
+    @iso_db.in_transaction?.should eql(false)
+    @iso_db.first_value_from("select count(1) as cnt from country").should eql(0)
+  end
+
+  it "does not reraise an exception that exits before the transaction starts" do
+    class MyExceptionTest < RuntimeError; end
+    db = Amalgalite::Database.new( ":memory:" )
+
+    lambda {
+      begin
+        raise MyExceptionTest, "James pointed this out"
+      rescue MyExceptionTest
+        db.transaction("EXCLUSIVE") { }
+      end
+    }.should_not raise_error( MyExceptionTest )
+  end
+
   describe "#define_function" do
    it "does not allow mixing of arbitrary and mandatory arguments to an SQL function" do
       class FunctionTest2 < ::Amalgalite::Function

data/spec/progress_handler_spec.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'spec'
+require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) )
 
-$: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
 require 'amalgalite'
 require 'amalgalite/database'
 class PH < ::Amalgalite::ProgressHandler
@@ -82,6 +82,8 @@ describe "Progress Handlers" do
     qt.join
     ph.call_count.should eql(25)
     qt[:exception].should be_instance_of( ::Amalgalite::SQLite3::Error )
+    @iso_db.api.last_error_code.should == 9
+    @iso_db.api.last_error_message.should  =~ /interrupted/
     qt[:exception].message.should =~ /interrupted/
   end
 

data/spec/spec_helper.rb

@@ -2,6 +2,8 @@ require 'rubygems'
 require 'spec'
 
 $: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
+$: << File.expand_path(File.join(File.dirname(__FILE__),"..","ext"))
+
 require 'amalgalite'
 
 class SpecInfo

data/spec/sqlite3/version_spec.rb

@@ -5,10 +5,10 @@ describe "Amalgalite::SQLite3::Version" do
   it "should have the sqlite3 version" do
     Amalgalite::SQLite3::VERSION.should =~ /\d\.\d\.\d/
     Amalgalite::SQLite3::Version.to_s.should =~ /\d\.\d\.\d/
-    Amalgalite::SQLite3::Version.to_i.should eql(3006010)
+    Amalgalite::SQLite3::Version.to_i.should eql(3006011)
     Amalgalite::SQLite3::Version::MAJOR.should eql(3)
     Amalgalite::SQLite3::Version::MINOR.should eql(6)
-    Amalgalite::SQLite3::Version::RELEASE.should eql(10)
+    Amalgalite::SQLite3::Version::RELEASE.should eql(11)
     Amalgalite::SQLite3::Version.to_a.should have(3).items
   end
 end

data/spec/statement_spec.rb

@@ -1,7 +1,8 @@
 require 'rubygems'
 require 'spec'
 
-$: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
+require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) )
+
 require 'amalgalite'
 
 describe Amalgalite::Statement do

data/tasks/config.rb

@@ -62,7 +62,7 @@ Configuration.for('test') {
   mode      "spec"
   files     Configuration.for("packaging").files.test
   options   %w[ --format progress --color ]
-  ruby_opts %w[ -w ]
+  ruby_opts %w[  ]
 }
 
 #-----------------------------------------------------------------------
@@ -72,7 +72,7 @@ Configuration.for('rcov') {
   output_dir  "coverage"
   libs        %w[ lib ]
   rcov_opts   %w[ --html ]
-  ruby_opts   %w[ -w ]
+  ruby_opts   %w[  ]
   test_files  Configuration.for('packaging').files.test
 }
 #

data/tasks/rspec.rake

@@ -18,7 +18,7 @@ if spec_config = Configuration.for_if_exist?("test") then
                           Amalgalite::Paths.root_dir ]
         r.spec_files  = spec_config.files 
         r.spec_opts   = spec_config.options
-        r.warning     = true
+        #r.warning     = true
 
         if rcov_config = Configuration.for_if_exist?('rcov') then
           r.rcov      = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amalgalite
 version: !ruby/object:Gem::Version 
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors: 
 - Jeremy Hinegardner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-12 00:00:00 -07:00
+date: 2009-03-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency