amalgalite 0.8.0 → 0.9.0

data/gemspec.rb

@@ -20,10 +20,11 @@ Amalgalite::GEM_SPEC = Gem::Specification.new do |spec|
   spec.executables  = pkg.files.bin.collect { |b| File.basename(b) }
 
   # add dependencies here
-  # spec.add_dependency("rake", ">= 0.8.1")
-  spec.add_dependency("configuration", ">= 0.0.5")
-  spec.add_dependency("arrayfields", ">= 4.7.0")
+  spec.add_dependency("arrayfields", "~> 4.7.0")
   
+  spec.add_development_dependency("rake", "~> 0.8.4")
+  spec.add_development_dependency("configuration", "~> 0.0.5")
+  spec.add_development_dependency("rspec", "~> 1.2.2")
 
   if ext_conf = Configuration.for_if_exist?("extension") then
     spec.extensions <<  ext_conf.configs

data/lib/amalgalite/database.rb

@@ -542,7 +542,7 @@ module Amalgalite
     #
     # True nexted transactions are available through the _savepoint_ method.
     #
-    def transaction( mode = TransactionBehavior::DEFERRED )
+    def transaction( mode = TransactionBehavior::DEFERRED, &block )
       raise Amalgalite::Error, "Invalid transaction behavior mode #{mode}" unless TransactionBehavior.valid?( mode )
 
       # if already in a transaction, no need to start a new one.
@@ -566,6 +566,17 @@ module Amalgalite
         return in_transaction?
       end
     end
+    alias :deferred_transaction :transaction
+
+    # helper for an immediate transaction
+    def immediate_transaction( &block )
+      transaction( TransactionBehavior::IMMEDIATE, &block )
+    end
+
+    # helper for an exclusive transaction
+    def exclusive_transaction( &block )
+      transaction( TransactionBehavior::EXCLUSIVE, &block )
+    end
 
     ##
     # call-seq: 
@@ -895,6 +906,38 @@ module Amalgalite
     def remove_progress_handler
       @api.progress_handler( nil, nil )
     end
+
+    ##
+    # call-seq:
+    #   db.replicate_to( ":memory:" ) -> new_db
+    #   db.replicate_to( "/some/location/my.db" ) -> new_db
+    #   db.replicate_to( Amalgalite::Database.new( "/my/backup.db" ) ) -> new_db
+    #
+    # replicate_to() takes a single argument, either a String or an
+    # Amalgalite::Database.  It returns the replicated database object.  If
+    # given a String, it will truncate that database if it already exists.
+    #
+    # Replicate the current database to another location, this can be used for a
+    # number of purposes:
+    #
+    # * load an sqlite database from disk into memory
+    # * snaphost an in memory db and save it to disk
+    # * backup on sqlite database to another location
+    # 
+    def replicate_to( location )
+      to_db = nil
+      case location 
+      when String
+        to_db = Amalgalite::Database.new( location )
+      when Amalgalite::Database
+        to_db = location
+      else
+        raise ArgumentError, "replicate_to( #{location} ) must be a String or a Database" 
+      end
+
+      @api.replicate_to( to_db.api )
+      return to_db
+    end
   end
 end
 

data/lib/amalgalite/profile_tap.rb

@@ -56,6 +56,7 @@ module Amalgalite
     #
     def stddev
       begin
+        return 0.0 if ( 1 == @n )
         Math.sqrt( (@sumsq - ( @sum * @sum / @n)) / (@n-1) )
       rescue Errno::EDOM
         return 0.0
@@ -82,7 +83,7 @@ module Amalgalite
     # return a string containing the sampler summary
     #
     def to_s
-      "[%s] => sum: %d, sumsq: %d, n: %d, mean: %0.6f, stddev: %0.6f, min: %d, max: %d" % to_a
+      "[%s] => sum: %d, sumsq: %d, n: %d, mean: %0.6f, stddev: %0.6f, min: %d, max: %d" % self.to_a
     end
 
   end

data/lib/amalgalite/taps/io.rb

@@ -41,8 +41,8 @@ module Amalgalite
       end
 
       def dump_profile
-        samplers.each do |s|
-          io.puts s.to_s
+        samplers.each_pair do |k,v|
+          io.puts v.to_s
         end
       end
 

data/lib/amalgalite/version.rb

@@ -8,7 +8,7 @@ module Amalgalite
   module Version
 
     MAJOR   = 0
-    MINOR   = 8
+    MINOR   = 9
     BUILD   = 0
 
     #

data/spec/database_spec.rb

@@ -199,9 +199,11 @@ describe Amalgalite::Database do
     r.should eql(42)
   end
 
-  it "returns the result of the transaction when a block is yielded" do
-    db = Amalgalite::Database.new( SpecInfo.test_db )
-    (db.transaction { 42 }).should eql(42)
+  %w[ transaction deferred_transaction immediate_transaction exclusive_transaction ].each do |trans|
+    it "returns the result of the #{trans} when a block is yielded" do
+      db = Amalgalite::Database.new( SpecInfo.test_db )
+      (db.send( trans ){ 42 }).should eql(42)
+    end
   end
 
   it "#reload_schema!" do
@@ -295,15 +297,19 @@ describe Amalgalite::Database do
 
   describe "#remove_function" do
     it "unregisters a single function by name and arity" do
-      @iso_db.define_function( "rtest" ) do
-        "rtest called"
+      @iso_db.define_function( "rtest1" ) do
+        "rtest1 called"
       end
+
       @iso_db.functions.size.should eql(1 )
 
-      r = @iso_db.execute( "select rtest() AS r" )
-      r.first['r'].should eql("rtest called")
-      @iso_db.remove_function("rtest", -1)
-      lambda { @iso_db.execute( "select rtest() as r" )}.should raise_error( ::Amalgalite::SQLite3::Error, /no such function: rtest/ )
+      r = @iso_db.execute( "select rtest1() AS r" )
+      r.first['r'].should eql("rtest1 called")
+      #@iso_db.remove_function("rtest1", -1)
+      # the arity of rtest1 is different in 1.9 vs. 1.8 
+      @iso_db.remove_function("rtest1")
+
+      lambda { @iso_db.execute( "select rtest1() as r" )}.should raise_error( ::Amalgalite::SQLite3::Error, /no such function: rtest1/ )
       @iso_db.functions.size.should eql(0)
     end
 
@@ -345,7 +351,6 @@ describe Amalgalite::Database do
   end
 
   it "can interrupt another thread that is also running in this database" do
-    had_error = nil 
     executions = 0
     other = Thread.new( @iso_db ) do |db|
       loop do
@@ -353,7 +358,7 @@ describe Amalgalite::Database do
           db.execute("select count(id) from country")
           executions += 1
         rescue => e
-          had_error = e
+          Thread.current[:had_error] = e
           break
         end
       end
@@ -367,8 +372,8 @@ describe Amalgalite::Database do
     rudeness.join
 
     executions.should > 10
-    had_error.should be_an_instance_of( ::Amalgalite::SQLite3::Error )
-    had_error.message.should =~ / interrupted/
+    other[:had_error].should be_an_instance_of( ::Amalgalite::SQLite3::Error )
+    other[:had_error].message.should =~ / interrupted/
   end
 
   it "savepoints are considered 'in_transaction'" do
@@ -464,4 +469,26 @@ describe Amalgalite::Database do
     val.should eql(3995)
   end
 
+  it "replicates a database to memory" do
+    mem_db = @iso_db.replicate_to( ":memory:" )
+    @iso_db.close
+    val = mem_db.first_value_from("SELECT count(*) from subcountry" )
+    val.should eql(3995)
+  end
+
+  it "replicates a database to a database file" do
+    all_sub = @iso_db.execute("SELECT count(*) as cnt from subcountry").first['cnt']
+
+    fdb = Amalgalite::Database.new( SpecInfo.test_db )
+    @iso_db.replicate_to( fdb )
+    @iso_db.close
+
+    File.exist?( SpecInfo.test_db ).should == true
+    fdb.execute("SELECT count(*) as cnt from subcountry").first['cnt'].should == all_sub
+  end
+
+  it "raises an error if it is given an invalid location to replicate to" do
+    lambda { @iso_db.replicate_to( false ) }.should raise_error( ArgumentError, /must be a String or a Database/ )
+  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 eql(3006010)
+    Amalgalite::SQLite3::Version.to_i.should eql(3006012)
     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(12)
     Amalgalite::SQLite3::Version.to_a.should have(3).items
   end
 end

data/spec/sqlite3_spec.rb

@@ -9,12 +9,12 @@ describe "Amalgalite::SQLite3" do
 
   it "knows if an SQL statement is complete" do
     Amalgalite::SQLite3.complete?("SELECT * FROM sometable;").should eql(true)
-    Amalgalite::SQLite3.complete?("SELECT * FROM sometable;", :utf16 => true).should eql(true)
+    #Amalgalite::SQLite3.complete?("SELECT * FROM sometable;", :utf16 => true).should eql(true)
   end
   
   it "knows if an SQL statement is not complete" do
     Amalgalite::SQLite3.complete?("SELECT * FROM sometable ").should eql(false)
-    Amalgalite::SQLite3.complete?("SELECT * FROM sometable WHERE ", :utf16 => true).should eql(false)
+    #Amalgalite::SQLite3.complete?("SELECT * FROM sometable WHERE ", :utf16 => true).should eql(false)
   end
 
   it "can produce random data" do

data/spec/tap_spec.rb

@@ -32,7 +32,7 @@ describe Amalgalite::Taps::StringIO do
     s = ::Amalgalite::Taps::StringIO.new
     s.profile( 'test', 42 )
     s.dump_profile
-    s.string.should eql("42 : test\ntest[test] => sum: 42, sumsq: 1764, n: 1, mean: 42.000000, stddev: 0.000000, min: 42, max: 42\n")
+    s.string.should eql("42 : test\n[test] => sum: 42, sumsq: 1764, n: 1, mean: 42.000000, stddev: 0.000000, min: 42, max: 42\n")
   end
 
   it "has a stdout tap" do

data/tasks/config.rb

@@ -83,7 +83,7 @@ Configuration.for('rdoc') {
   files       Configuration.for('packaging').files.rdoc
   main_page   files.first
   title       Configuration.for('project').name
-  options     %w[ --line-numbers --inline-source -T darkfish ]
+  options     %w[ ]
   output_dir  "doc"
 }
 

data/tasks/extension.rake

@@ -31,7 +31,6 @@ if ext_config = Configuration.for_if_exist?('extension') then
         conf  = parts.last
         Dir.chdir(path.dirname) do |d| 
           ruby conf.to_s
-          #sh "rake default"
           sh "make"
         end
       end
@@ -53,6 +52,20 @@ if ext_config = Configuration.for_if_exist?('extension') then
       end
     end
 
+    desc "Build the extension for ruby1.9"
+    task :build19 => :clobber do
+      ext_config.configs.each do |extension|
+        path = Pathname.new( extension )
+        parts = path.split
+        conf = parts.last
+        Dir.chdir( path.dirname ) do |d|
+          sh "ruby1.9 -I. extconf.rb"
+          sh "make"
+        end
+ 
+      end
+    end
+
     task :clean do
       ext_config.configs.each do |extension|
         path  = Pathname.new(extension)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amalgalite
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Jeremy Hinegardner
@@ -9,28 +9,48 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-23 00:00:00 -06:00
+date: 2009-04-05 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: configuration
+  name: arrayfields
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 4.7.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.8.4
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: configuration
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 0.0.5
     version: 
 - !ruby/object:Gem::Dependency 
-  name: arrayfields
-  type: :runtime
+  name: rspec
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 4.7.0
+        version: 1.2.2
     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 * 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
@@ -91,7 +111,6 @@ 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
@@ -184,10 +203,6 @@ has_rdoc: true
 homepage: http://copiousfreetime.rubyforge.org/amalgalite/
 post_install_message: 
 rdoc_options: 
-- --line-numbers
-- --inline-source
-- -T
-- darkfish
 - --main
 - README
 require_paths: 

data/ext/test_error.c

@@ -1,62 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include "sqlite3.h"
-/**
- * gcc -o test_error test_error.c sqlite3.c
- * ./test_error
- */
-
-int test_progress_callback( void* data )
-{
-    fprintf(stderr, "Progress handler callback\n");
-    return 1;
-}
-
-
-void abort_if_error( sqlite3* db, char* msg, int rc ) 
-{
-    if ( SQLITE_OK != rc ) {
-        fprintf( stderr, "%s: [%d] -> %s\n", msg, sqlite3_errcode( db ), sqlite3_errmsg( db ) );
-        sqlite3_close( db );
-        exit( 1 );
-    }
-}
-
-int main( int argc, char **argv )
-{
-  sqlite3      *db;
-  sqlite3_stmt *stmt;
-  const char   *tail;
-  char         *errmsg;
-  int           rc;
-
-  printf("SQLite Version: %s\n", sqlite3_libversion() );
-
-  rc = sqlite3_open_v2( ":memory:", &db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL );
-  abort_if_error( db, "Failure opening database", rc );
-
-  rc = sqlite3_exec( db, "CREATE TABLE t1( c1, c2 );", NULL, NULL, NULL );
-  abort_if_error( db, "Failure creating table t1", rc );
-
-  sqlite3_progress_handler( db, 5, test_progress_callback, (void*) NULL );
-
-  rc = sqlite3_prepare_v2( db, "SELECT * FROM t1", -1, &stmt, &tail );
-  abort_if_error( db, "Failure preparing statement", rc );
-
-  rc = sqlite3_step( stmt );
-  if ( SQLITE_ROW != rc ) {
-    printf( "Return code from sqlite3_step      : %d\n", rc );
-    printf( "Before finalizing error code is    : %d\n", sqlite3_errcode( db )); 
-    printf( "Before finalizing error message is : %s\n", sqlite3_errmsg( db ));
-  }
-
-  rc = sqlite3_finalize( stmt );
-  if ( SQLITE_OK != rc ) {
-      printf( "Return value from sqlite3_finalize : %d\n", rc );
-      printf( "After finalizing errcode is        : %d\n", sqlite3_errcode( db ));
-      printf( "After finalizing error message is  : %s\n", sqlite3_errmsg( db ));
-  }
-  sqlite3_close( db );
-  return 0;
-
-}