amalgalite 0.5.1 → 0.6.0

data/spec/function_spec.rb

@@ -0,0 +1,86 @@
+require 'rubygems'
+require 'spec'
+
+$: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
+require 'amalgalite'
+require 'amalgalite/database'
+
+describe "Scalar SQL Functions" do
+
+  before(:each) do
+    @schema = IO.read( SpecInfo.test_schema_file )
+    @iso_db_file = SpecInfo.make_iso_db
+    @iso_db = Amalgalite::Database.new( SpecInfo.make_iso_db )
+  end
+
+  after(:each) do
+    File.unlink SpecInfo.test_db if File.exist?( SpecInfo.test_db )
+    @iso_db.close
+    File.unlink @iso_db_file if File.exist?( @iso_db_file )
+  end
+
+  it "can define a custom SQL function as a block with 0 params" do
+    @iso_db.define_function("foo") do 
+        "foo"
+    end
+    r = @iso_db.execute("SELECT foo() AS f");
+    r.first['f'].should == "foo"
+  end
+
+  it "has a signature" do
+    ::Amalgalite::Function.new( "testing_name", 42 ).signature.should == "testing_name/42"
+  end
+
+  it "can define a custom SQL function as a lambda with 2 param" do
+    @iso_db.define_function("foo2", lambda{ |x,y| "foo2 -> #{x} #{y}" } )
+    r = @iso_db.execute("SELECT foo2( 'bar', 'baz' ) as f")
+    r.first['f'].should == "foo2 -> bar baz"
+  end
+
+  it "can define a custom SQL function as a class with N params" do
+    class FunctionTest1 < ::Amalgalite::Function
+      def initialize
+        super('ftest', -1)
+      end
+      def call( *args )
+          "#{args.length} args #{args.join(', ')}"
+      end
+    end
+
+    @iso_db.define_function("ftest1", FunctionTest1.new )
+    r = @iso_db.execute("SELECT ftest1(1,2,3,'baz') as f")
+    r.first['f'].should == "4 args 1, 2, 3, baz"
+  end
+
+  [ [   1,   lambda { true  } ],
+    [   0,   lambda { false } ],
+    [   nil, lambda { nil   } ],
+    [ "foo", lambda { "foo" } ],
+    [ 42,    lambda { 42 }    ],
+    [ 42.2 , lambda { 42.2 }  ], ].each do |expected, func|
+    it "returns the appropriate class #{expected.class} " do
+      @iso_db.define_function("ctest", func )
+      r = @iso_db.execute( "SELECT ctest() AS c" )
+      r.first['c'].should == expected
+    end
+  end
+
+  it "raises an error if the function returns a complex Ruby object" do
+    l = lambda { Hash.new }
+    @iso_db.define_function("htest", l)
+    begin
+      @iso_db.execute( "SELECT htest() AS h" ) 
+    rescue => e
+      e.should be_instance_of( ::Amalgalite::SQLite3::Error )
+      e.message.should =~ /Unable to convert ruby object to an SQL function result/
+    end
+  end
+
+  it "an error raised during the sql function is handled correctly" do
+    @iso_db.define_function( "etest" ) do 
+      raise "error from within an sql function"
+    end
+    lambda { @iso_db.execute( "SELECT etest() AS e" ) }.should raise_error( ::Amalgalite::SQLite3::Error, /error from within an sql function/ )
+  end
+end
+

data/spec/progress_handler_spec.rb

@@ -0,0 +1,103 @@
+require 'rubygems'
+require 'spec'
+
+$: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
+require 'amalgalite'
+require 'amalgalite/database'
+class PH < ::Amalgalite::ProgressHandler
+  attr_reader :call_count
+  def initialize( max = nil )
+    @call_count = 0
+    @max = max
+  end
+
+  def call
+    @call_count += 1
+    if @max && ( @call_count >= @max ) then
+      return false
+    end
+    return true
+  end
+end
+
+def query_thread( db )
+  Thread.new( db ) do |db|
+    begin
+      db.execute("select count(id) from country")
+    rescue => e
+      had_error = e
+      Thread.current[:exception] = e
+    end
+  end
+end
+
+describe "Progress Handlers" do
+  before(:each) do
+    @db_name = SpecInfo.make_iso_db
+    @iso_db = Amalgalite::Database.new( @db_name )
+  end
+
+  after(:each) do
+    @iso_db.close
+    File.unlink @db_name if File.exist?( @db_name )
+  end
+
+  it "raises NotImplemented if #call is not overwritten" do
+    bh = ::Amalgalite::ProgressHandler.new
+    lambda { bh.call }.should raise_error( ::NotImplementedError, /The progress handler call\(\) method must be implemented/ )
+  end
+
+  it "can be registered as block" do
+    call_count = 0
+    @iso_db.progress_handler( 50 ) do ||
+      call_count += 1
+    true
+    end
+    qt = query_thread( @iso_db )
+    qt.join
+    call_count.should > 10
+  end
+
+  it "can be registered as lambda" do
+    call_count = 0
+    callable = lambda { || call_count += 1; true }
+    @iso_db.progress_handler( 42, callable ) 
+    qt = query_thread( @iso_db )
+    qt.join
+    call_count.should > 10
+  end
+
+  it "can be registered as a class" do
+    ph = PH.new 
+    @iso_db.progress_handler( 5, ph )
+    qt = query_thread( @iso_db )
+    qt.join
+    ph.call_count.should > 100
+  end
+
+  it "behaves like #interrupt! if returning a false value" do
+    ph = PH.new( 25 )
+    @iso_db.progress_handler( 5, ph )
+    qt = query_thread( @iso_db )
+    qt.join
+    ph.call_count.should == 25
+    qt[:exception].should be_instance_of( ::Amalgalite::SQLite3::Error )
+    qt[:exception].message.should =~ /interrupted/
+  end
+
+  it "cannot register a block with the wrong arity" do
+    lambda do 
+      @iso_db.define_progress_handler { |x,y| puts "What!" }
+    end.should raise_error( ::Amalgalite::Database::ProgressHandlerError, /A progress handler expects 0 arguments, not 2/)
+  end
+
+  it "can remove a progress handler" do
+    ph = PH.new 
+    @iso_db.progress_handler( 5, ph )
+    @iso_db.remove_progress_handler
+    qt = query_thread( @iso_db )
+    qt.join
+    ph.call_count.should == 0
+    qt[:exception].should be_nil
+  end
+end

data/spec/spec_helper.rb

@@ -20,6 +20,7 @@ class SpecInfo
       FileUtils.cp @iso_db, @new_is_db
       return @new_is_db
     end
+
   end
 end
 

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 == 3006006
+    Amalgalite::SQLite3::Version.to_i.should == 3006007
     Amalgalite::SQLite3::Version::MAJOR.should == 3
     Amalgalite::SQLite3::Version::MINOR.should == 6
-    Amalgalite::SQLite3::Version::RELEASE.should == 6
+    Amalgalite::SQLite3::Version::RELEASE.should == 7
     Amalgalite::SQLite3::Version.to_a.should have(3).items
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amalgalite
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors: 
 - Jeremy Hinegardner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-30 00:00:00 -07:00
+date: 2009-01-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 4.5.0
     version: 
-description: Amalgalite embeds the SQLite database engine in a ruby extension.  There is no need to install SQLite separately.    Look in the examples/ directory to see  * general usage * blob io * schema information  Also Scroll through Amalgalite::Database for a quick example, and a general overview of the API.
+description: Amalgalite embeds the SQLite database engine in a ruby extension.  There is no need to install SQLite separately.    Look in the examples/ directory to see  * general usage * blob io * schema information * custom functions * custom aggregates * requiring ruby code from a database  Also Scroll through Amalgalite::Database for a quick example, and a general overview of the API.
 email: jeremy@hinegardner.org
 executables: 
 - amalgalite-pack
@@ -42,18 +42,23 @@ extra_rdoc_files:
 - README
 - HISTORY
 - LICENSE
+- lib/amalgalite/aggregate.rb
 - lib/amalgalite/blob.rb
 - lib/amalgalite/boolean.rb
+- lib/amalgalite/busy_timeout.rb
 - lib/amalgalite/column.rb
 - lib/amalgalite/core_ext/kernel/require.rb
 - lib/amalgalite/database.rb
+- lib/amalgalite/function.rb
 - lib/amalgalite/index.rb
 - lib/amalgalite/packer.rb
 - lib/amalgalite/paths.rb
 - lib/amalgalite/profile_tap.rb
+- lib/amalgalite/progress_handler.rb
 - lib/amalgalite/requires.rb
 - lib/amalgalite/schema.rb
 - lib/amalgalite/sqlite3/constants.rb
+- lib/amalgalite/sqlite3/database/function.rb
 - lib/amalgalite/sqlite3/database/status.rb
 - lib/amalgalite/sqlite3/status.rb
 - lib/amalgalite/sqlite3/version.rb
@@ -86,6 +91,7 @@ files:
 - ext/amalgalite3_requires_bootstrap.c
 - ext/amalgalite3_statement.c
 - ext/sqlite3.c
+- ext/test_error.c
 - ext/amalgalite3.h
 - ext/sqlite3.h
 - ext/sqlite3_options.h
@@ -95,22 +101,30 @@ files:
 - examples/a.rb
 - examples/blob.rb
 - examples/bootstrap.rb
+- examples/define_aggregate.rb
+- examples/define_function.rb
 - examples/gem-db.rb
+- examples/gems.db
 - examples/require_me.rb
 - examples/requires.rb
 - examples/schema-info.rb
+- lib/amalgalite/aggregate.rb
 - lib/amalgalite/blob.rb
 - lib/amalgalite/boolean.rb
+- lib/amalgalite/busy_timeout.rb
 - lib/amalgalite/column.rb
 - lib/amalgalite/core_ext/kernel/require.rb
 - lib/amalgalite/database.rb
+- lib/amalgalite/function.rb
 - lib/amalgalite/index.rb
 - lib/amalgalite/packer.rb
 - lib/amalgalite/paths.rb
 - lib/amalgalite/profile_tap.rb
+- lib/amalgalite/progress_handler.rb
 - lib/amalgalite/requires.rb
 - lib/amalgalite/schema.rb
 - lib/amalgalite/sqlite3/constants.rb
+- lib/amalgalite/sqlite3/database/function.rb
 - lib/amalgalite/sqlite3/database/status.rb
 - lib/amalgalite/sqlite3/status.rb
 - lib/amalgalite/sqlite3/version.rb
@@ -128,14 +142,18 @@ files:
 - lib/amalgalite/version.rb
 - lib/amalgalite/view.rb
 - lib/amalgalite.rb
+- spec/aggregate_spec.rb
 - spec/amalgalite_spec.rb
 - spec/blob_spec.rb
 - spec/boolean_spec.rb
+- spec/busy_handler.rb
 - spec/database_spec.rb
 - spec/default_map_spec.rb
+- spec/function_spec.rb
 - spec/integeration_spec.rb
 - spec/packer_spec.rb
 - spec/paths_spec.rb
+- spec/progress_handler_spec.rb
 - spec/requires_spec.rb
 - spec/schema_spec.rb
 - spec/spec_helper.rb