amalgalite 0.6.0-x86-mswin32-60 → 0.7.0-x86-mswin32-60

data/ext/sqlite3.h

@@ -30,7 +30,7 @@
 ** the version number) and changes its name to "sqlite3.h" as
 ** part of the build process.
 **
-** @(#) $Id: sqlite.h.in,v 1.420 2008/12/16 13:46:30 drh Exp $
+** @(#) $Id: sqlite.h.in,v 1.421 2008/12/30 06:24:58 danielk1977 Exp $
 */
 #ifndef _SQLITE3_H_
 #define _SQLITE3_H_
@@ -107,8 +107,8 @@ extern "C" {
 **          with the value (X*1000000 + Y*1000 + Z) where X, Y, and Z
 **          are the major version, minor version, and release number.
 */
-#define SQLITE_VERSION         "3.6.7"
-#define SQLITE_VERSION_NUMBER  3006007
+#define SQLITE_VERSION         "3.6.10"
+#define SQLITE_VERSION_NUMBER  3006010
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100>
@@ -2397,7 +2397,7 @@ int sqlite3_set_authorizer(
 #define SQLITE_PRAGMA               19   /* Pragma Name     1st arg or NULL */
 #define SQLITE_READ                 20   /* Table Name      Column Name     */
 #define SQLITE_SELECT               21   /* NULL            NULL            */
-#define SQLITE_TRANSACTION          22   /* NULL            NULL            */
+#define SQLITE_TRANSACTION          22   /* Operation       NULL            */
 #define SQLITE_UPDATE               23   /* Table Name      Column Name     */
 #define SQLITE_ATTACH               24   /* Filename        NULL            */
 #define SQLITE_DETACH               25   /* Database Name   NULL            */
@@ -2407,6 +2407,7 @@ int sqlite3_set_authorizer(
 #define SQLITE_CREATE_VTABLE        29   /* Table Name      Module Name     */
 #define SQLITE_DROP_VTABLE          30   /* Table Name      Module Name     */
 #define SQLITE_FUNCTION             31   /* NULL            Function Name   */
+#define SQLITE_SAVEPOINT            32   /* Operation       Savepoint Name  */
 #define SQLITE_COPY                  0   /* No longer used */
 
 /*

data/lib/amalgalite/aggregate.rb

@@ -12,13 +12,13 @@ module Amalgalite
   # If you choose to use Aggregate as a parent class of your SQL scalar function
   # implementation you must:
   #
-  # * implement _initalize()_ with 0 arguments
+  # * implement _initalize_ with 0 arguments
   # * set the @arity data member
   # * set the @name data member 
   # * implement _step_ with arity of +@arity+
   # * implement _finalize_ with arity of 0
   #
-  # For instance to implement a _unique_word_count(X)_ aggregate function you could
+  # For instance to implement a <i>unique_word_count(X)</i> aggregate function you could
   # implement it as:
   #
   #   class UniqueWordCount < ::Amalgalite::Aggregate

data/lib/amalgalite/database.rb

@@ -492,10 +492,12 @@ module Amalgalite
     #
     # If no block is passed in then you are on your own.
     #
-    # Nested transactions are not supported by SQLite, but they are faked here.
+    # Nesting a transaaction via the _transaction_ method are no-ops.
     # If you call transaction within a transaction, no new transaction is
     # started, the current one is just continued.
-    # 
+    #
+    # True nexted transactions are available through the _savepoint_ method.
+    #
     def transaction( mode = TransactionBehavior::DEFERRED )
       raise Amalgalite::Error, "Invalid transaction behavior mode #{mode}" unless TransactionBehavior.valid?( mode )
 
@@ -520,18 +522,89 @@ module Amalgalite
       end
     end
 
+    ##
+    # call-seq: 
+    #   db.savepoint( 'mypoint' ) -> db
+    #   db.savepoint( 'mypoint' ) do |db_in_savepoint|
+    #     ...
+    #   end
+    #
+    # Much of the following documentation is para-phrased from 
+    # http://sqlite.org/lang_savepoint.html
+    #
+    # Savepoints are a method of creating transactions, similar to _transaction_
+    # except that they may be nested.
+    #
+    # * Every savepoint must have a name, +to_s+ is called on the method
+    #   argument
+    # * A savepoint does not need to be initialized inside a _transaction_.  If
+    #   it is not inside a _transaction_ it behaves exactly as if a DEFERRED
+    #   transaction had been started.
+    # * If a block is passed to _saveponit_ then when the block exists, it is
+    #   guaranteed that either a 'RELEASE' or 'ROLLBACK TO name' has been executed.
+    # * If any exception happens during the savepoint transaction, then a
+    #   'ROLLOBACK TO' is issued when the block closes.
+    # * If no exception happens during the transaction then a 'RELEASE name' is
+    #   issued upon leaving the block
+    #
+    # If no block is passed in then you are on your own.
+    #
+    def savepoint( name )
+      point_name = name.to_s.strip
+      raise Amalgalite::Error, "Invalid savepoint name '#{name}'" unless point_name and point_name.length > 1
+      execute( "SAVEPOINT #{point_name};")
+      if block_given? then
+        begin
+          return ( yield self )
+        ensure
+          if $! then
+            rollback_to( point_name )
+            raise $!
+          else
+            release( point_name )
+          end
+        end
+      else
+        return in_transaction?
+      end
+    end
+
+    ##
+    # call-seq:
+    #   db.release( 'mypoint' )
+    #
+    # Release a savepoint.  This is similar to a _commit_ but only for
+    # savepoints.  All savepoints up  the savepoint stack and include the name
+    # savepoint being released are 'committed' to the transaction.  There are
+    # several ways of thinking about release and they are all detailed in the
+    # sqlite documentation: http://sqlite.org/lang_savepoint.html
+    #
+    def release( point_name )
+      execute( "RELEASE SAVEPOINT #{point_name}" ) if in_transaction? 
+    end
+
+    ##
+    # call-seq:
+    #   db.rollback_to( point_name )
+    #
+    # Rollback to a savepoint.  The transaction is not cancelled, the
+    # transaction is restarted.
+    def rollback_to( point_name )
+      execute( "ROLLBACK TO SAVEPOINT #{point_name}" )
+    end
+
     ##
     # Commit a transaction
     #
     def commit
-      execute( "COMMIT" ) if in_transaction?
+      execute( "COMMIT TRANSACTION" ) if in_transaction?
     end
 
     ##
     # Rollback a transaction
     #
     def rollback
-      execute( "ROLLBACK" ) if in_transaction?
+      execute( "ROLLBACK TRANSACTION" ) if in_transaction?
     end
 
     ##

data/lib/amalgalite/statement.rb

@@ -350,8 +350,12 @@ module Amalgalite
     #
     def is_column_rowid?( table_name, column_name )
       column_schema  = @db.schema.tables[table_name].columns[column_name]
-      if column_schema.primary_key? and column_schema.declared_data_type and column_schema.declared_data_type.upcase == "INTEGER" then
-        return true
+      if column_schema then
+        if column_schema.primary_key? and column_schema.declared_data_type and column_schema.declared_data_type.upcase == "INTEGER" then
+          return true
+        end
+      else
+        return true if Statement.rowid_column_names.include?( column_name.upcase )
       end
       return false
     end

data/lib/amalgalite/version.rb

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

data/spec/aggregate_spec.rb

@@ -98,7 +98,7 @@ describe "Aggregate SQL Functions" do
   it "does not allow outrageous arity" do
     class AggregateTest3 < AggregateTest1
       def name() "atest3"; end
-      def arity() 101; end
+      def arity() 128; end
     end
     lambda { @iso_db.define_aggregate("atest3", AggregateTest3 ) }.should raise_error( ::Amalgalite::SQLite3::Error, /SQLITE_ERROR .* bad parameters/ )
   end

data/spec/database_spec.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'spec'
+require File.expand_path( File.join( File.dirname(__FILE__), 'spec_helper'))
 
 $: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
 require 'amalgalite'
@@ -248,7 +249,7 @@ describe Amalgalite::Database do
     it "does not allow outrageous arity" do
       class FunctionTest3 < ::Amalgalite::Function
         def initialize
-          super( 'ftest3', 101 )
+          super( 'ftest3', 128 )
         end
         def call( *args) ; end
       end
@@ -322,11 +323,62 @@ describe Amalgalite::Database do
         end
       end
     end
-    sleep 0.01
-    @iso_db.interrupt!
+
+    rudeness = Thread.new( @iso_db ) do |db|
+      sleep 0.05
+      @iso_db.interrupt!
+    end
+
+    rudeness.join
     other.join
+
     executions.should > 10
     had_error.should be_an_instance_of( ::Amalgalite::SQLite3::Error )
     had_error.message.should =~ / interrupted/
   end
+
+  it "savepoints are considered 'in_transaction'" do
+    @iso_db.savepoint( 'test1' ) do |db|
+      db.should be_in_transaction
+    end
+  end
+
+  it "releases a savepoint" do
+    us_sub = @iso_db.execute( "select count(1) as cnt from subcountry where country = 'US'" ).first['cnt']
+    us_sub.should == 57
+    other_sub = @iso_db.execute( "select count(1) as cnt from subcountry where country != 'US'" ).first['cnt']
+
+    @iso_db.transaction
+    @iso_db.savepoint( "t1" ) do |s|
+      s.execute("DELETE FROM subcountry where country = 'US'")
+    end
+
+    all_sub = @iso_db.execute("SELECT count(*) as cnt from subcountry").first['cnt']
+
+    all_sub.should == other_sub;
+    @iso_db.rollback
+    all_sub = @iso_db.execute("SELECT count(*) as cnt from subcountry").first['cnt']
+    all_sub.should == ( us_sub + other_sub )
+
+  end
+  it "rolls back a savepoint" do
+    all_sub = @iso_db.execute("SELECT count(*) as cnt from subcountry").first['cnt']
+    lambda {
+      @iso_db.savepoint( "t1" ) do |s|
+        s.execute("DELETE FROM subcountry where country = 'US'")
+        raise "sample error"
+      end
+    }.should raise_error( StandardError, /sample error/ )
+
+    @iso_db.execute("SELECT count(*) as cnt from subcountry").first['cnt'].should == all_sub
+  end
+
+  it "rolling back the outermost savepoint is still 'in_transaction'" do
+    @iso_db.savepoint( "t1" )
+    @iso_db.execute("DELETE FROM subcountry where country = 'US'")
+    @iso_db.rollback_to( "t1" )
+    @iso_db.should be_in_transaction
+    @iso_db.rollback
+    @iso_db.should_not be_in_transaction
+  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 == 3006007
+    Amalgalite::SQLite3::Version.to_i.should == 3006010
     Amalgalite::SQLite3::Version::MAJOR.should == 3
     Amalgalite::SQLite3::Version::MINOR.should == 6
-    Amalgalite::SQLite3::Version::RELEASE.should == 7
+    Amalgalite::SQLite3::Version::RELEASE.should == 10
     Amalgalite::SQLite3::Version.to_a.should have(3).items
   end
 end

data/spec/sqlite3_spec.rb

@@ -20,4 +20,16 @@ describe "Amalgalite::SQLite3" do
   it "can produce random data" do
     Amalgalite::SQLite3.randomness( 42 ).size.should == 42
   end
+
+  it "has nil for the default sqlite temporary directory" do
+    Amalgalite::SQLite3.temp_directory.should == nil
+  end
+
+  it "can set the temporary directory" do
+    Amalgalite::SQLite3.temp_directory.should == nil
+    Amalgalite::SQLite3.temp_directory = "/tmp/testing"
+    Amalgalite::SQLite3.temp_directory.should == "/tmp/testing"
+    Amalgalite::SQLite3.temp_directory = nil
+    Amalgalite::SQLite3.temp_directory.should == nil
+  end
 end

data/spec/statement_spec.rb

@@ -123,6 +123,32 @@ describe Amalgalite::Statement do
     stmt.close
   end
 
+  it "can select the rowid from the table" do
+    db = Amalgalite::Database.new( ":memory:" )
+    db.execute( "create table t1(c1,c2,c3)" )
+    db.execute("insert into t1(c1,c2,c3) values (1,2,'abc')")
+    rows = db.execute( "select rowid,* from t1")
+    rows.size.should == 1
+    rows.first['rowid'].should == 1
+    rows.first['c1'].should == 1 
+    rows.first['c3'].should == 'abc'
+  end
+
+  it "shows that the rowid column is rowid column" do
+    db = Amalgalite::Database.new( ":memory:" )
+    db.execute( "create table t1(c1,c2,c3)" )
+    db.execute("insert into t1(c1,c2,c3) values (1,2,'abc')")
+    db.prepare( "select oid,* from t1" ) do |stmt|
+      rows = stmt.execute
+      stmt.should be_using_rowid_column
+    end
+
+    db.prepare( "select * from t1" ) do  |stmt| 
+      stmt.execute
+      stmt.should_not be_using_rowid_column 
+    end
+  end
+
   it "has index based access to the result set" do
     @iso_db.prepare("SELECT * FROM country WHERE id = ? ORDER BY name ") do |stmt|
       all_rows = stmt.execute( 891 )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amalgalite
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.7.0
 platform: x86-mswin32-60
 authors: 
 - Jeremy Hinegardner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-10 00:00:00 -07:00
+date: 2009-01-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency