amalgalite 1.1.2 → 1.3.0

data/lib/amalgalite/sqlite3/version.rb

@@ -36,7 +36,6 @@ module Amalgalite
     # Version of SQLite that ships with Amalgalite
     VERSION = Version.to_s.freeze
   end
-  Version.freeze
 end
 
 unless Amalgalite::SQLite3::Version.compiled_matches_runtime? then

data/lib/amalgalite/statement.rb

@@ -103,9 +103,10 @@ module Amalgalite
         end
       ensure
         s = $!
-        begin 
+        begin
           reset_for_next_execute!
-        rescue => e
+        rescue
+          # rescuing nothing on purpose
         end
         raise s if s != s_before
       end
@@ -343,9 +344,10 @@ module Amalgalite
           column_meta.schema = ::Amalgalite::Column.new( db_name, tbl_name, col_name, idx )
           column_meta.schema.declared_data_type = @stmt_api.column_declared_type( idx )
 
-          # only check for rowid if we have a table name and it is not the
-          # sqlite_master table.  We could get recursion in those cases.
-          if not using_rowid_column? and tbl_name and tbl_name != 'sqlite_master' and is_column_rowid?( tbl_name, col_name ) then
+          # only check for rowid if we have a table name and it is not one of the
+          # sqlite_master tables.  We could get recursion in those cases.
+          if not using_rowid_column? and tbl_name and
+             not %w[ sqlite_master sqlite_temp_master].include?( tbl_name ) and is_column_rowid?( tbl_name, col_name ) then
             @rowid_index = idx
           end
 

data/lib/amalgalite/table.rb

@@ -5,7 +5,7 @@
 require 'set'
 module Amalgalite
   #
-  # a class representing the meta information about an SQLite table 
+  # a class representing the meta information about an SQLite table
   #
   class Table
     # the schema object the table is associated with
@@ -25,19 +25,20 @@ module Amalgalite
     # in this table.  keys are the column names
     attr_accessor :columns
 
-    def initialize( name, sql = nil ) 
-      @name    = name
-      @sql     = sql
-      @indexes = {}
-      @columns = {}
+    def initialize( name, sql = nil )
+      @name        = name
+      @sql         = sql
+      @indexes     = {}
+      @columns     = {}
+      @schema      = nil
+      @primary_key = nil
     end
 
     # Is the table a temporary table or not
     def temporary?
-      !sql
+      schema.temporary?
     end
 
-
     # the Columns in original definition order
     def columns_in_order
       @columns.values.sort_by { |c| c.order }

data/lib/amalgalite/type_maps/default_map.rb

@@ -3,7 +3,6 @@
 # All rights reserved.  See LICENSE and/or COPYING for details.
 #++
 
-require 'amalgalite/type_map'
 require 'time'
 require 'date'
 

data/lib/amalgalite/type_maps/storage_map.rb

@@ -3,8 +3,6 @@
 # All rights reserved.  See LICENSE and/or COPYING for details.
 #++
 
-require 'amalgalite/type_map'
-
 module Amalgalite::TypeMaps
   ##
   # An Amalagliate TypeMap that has a one-to-one conversion between SQLite types

data/lib/amalgalite/type_maps/text_map.rb

@@ -3,7 +3,6 @@
 # All rights reserved.  See LICENSE and/or COPYING for details.
 #++
 #
-require 'amalgalite/type_map'
 
 module Amalgalite::TypeMaps
   ##

data/lib/amalgalite/version.rb

@@ -1,37 +1,8 @@
 #--
 # Copyright (c) 2008 Jeremy Hinegardner
-# All rights reserved.  See LICENSE and/or COPYING for licensingn details
+# All rights reserved.  See LICENSE and/or COPYING for licensing details
 #++
 
 module Amalgalite
-  # Version information for Amagalite
-  module Version
-
-    MAJOR   = 1
-    MINOR   = 1
-    BUILD   = 2
-
-    #
-    # return the Version as an array of MAJOR, MINOR, BUILD
-    #
-    def self.to_a 
-      [MAJOR, MINOR, BUILD]
-    end
-
-    # return the Version as a dotted String MAJOR.MINOR.BUILD
-    def self.to_s
-      to_a.join(".")
-    end
-
-    # return the Vesion as a hash 
-    def self.to_hash
-      { :major => MAJOR, :minor => MINOR, :build => BUILD }
-    end
-
-    # Version string constant
-    STRING = Version.to_s.freeze
-  end
-
-  # Version string constant
-  VERSION = Version.to_s.freeze
-end 
+  VERSION = "1.3.0"
+end

data/spec/aggregate_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) )
+require 'spec_helper'
 
 class AggregateTest1 < ::Amalgalite::Aggregate
   def initialize

data/spec/amalgalite_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__),"spec_helper.rb"))
+require 'spec_helper'
 
 describe Amalgalite do
 end

data/spec/blob_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path( File.join( File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
 
 describe Amalgalite::Blob do
 

data/spec/boolean_spec.rb

@@ -1,4 +1,5 @@
-$: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
+require 'spec_helper'
+
 require 'amalgalite'
 require 'amalgalite/boolean'
 

data/spec/busy_handler.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper.rb' ) )
+require 'spec_helper'
 
 class BusyHandlerTest < Amalgalite::BusyHandler
   attr_accessor :call_count

data/spec/database_spec.rb

@@ -1,6 +1,6 @@
-require File.expand_path( File.join( File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
 
-$: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
+require 'thread'
 require 'amalgalite'
 require 'amalgalite/taps/io'
 require 'amalgalite/taps/console'
@@ -222,7 +222,7 @@ describe Amalgalite::Database do
         db.in_transaction?.should eql(true)
         raise "testing rollback"
       end
-    rescue => e
+    rescue
       @iso_db.in_transaction?.should eql(false)
       @iso_db.execute("SELECT count(1) as cnt FROM country").first['cnt'].should eql(242)
     end
@@ -260,23 +260,23 @@ describe Amalgalite::Database do
 
   describe "#define_function" do
    it "does not allow mixing of arbitrary and mandatory arguments to an SQL function" do
-      class FunctionTest2 < ::Amalgalite::Function
+      class DBFunctionTest2 < ::Amalgalite::Function
         def initialize
           super( 'ftest2', -2 )
         end
         def call( a, *args ); end
       end
-      lambda { @iso_db.define_function("ftest2", FunctionTest2.new ) }.should raise_error( ::Amalgalite::Database::FunctionError )
+      lambda { @iso_db.define_function("ftest2", DBFunctionTest2.new ) }.should raise_error( ::Amalgalite::Database::FunctionError )
     end
 
     it "does not allow outrageous arity" do
-      class FunctionTest3 < ::Amalgalite::Function
+      class DBFunctionTest3 < ::Amalgalite::Function
         def initialize
           super( 'ftest3', 128 )
         end
         def call( *args) ; end
       end
-      lambda { @iso_db.define_function("ftest3", FunctionTest3.new ) }.should raise_error( ::Amalgalite::SQLite3::Error )
+      lambda { @iso_db.define_function("ftest3", DBFunctionTest3.new ) }.should raise_error( ::Amalgalite::SQLite3::Error )
     end
 
  end
@@ -364,7 +364,7 @@ describe Amalgalite::Database do
     end
 
     rudeness = Thread.new( @iso_db ) do |db|
-      sent = control_queue.deq
+      control_queue.deq
       count = 0
       loop do
         @iso_db.interrupt!
@@ -410,13 +410,12 @@ describe Amalgalite::Database do
   end
 
   it "rolls back a savepoint" do
-    all_sub = @iso_db.execute("SELECT count(*) as cnt from subcountry").first['cnt']
     us_sub  = @iso_db.execute("SELECT count(*) as cnt from subcountry where country = 'US'").first['cnt']
     lambda {
       @iso_db.savepoint( "t1" ) do |s|
         s.execute("DELETE FROM subcountry where country = 'US'")
         as = @iso_db.execute("SELECT count(*) as cnt from subcountry where country = 'US'").first['cnt']
-        as.should == 0
+        as.should be == 0
         raise "sample error"
       end
     }.should raise_error( StandardError, /sample error/ )
@@ -494,7 +493,7 @@ describe Amalgalite::Database do
     @iso_db.replicate_to( fdb )
     @iso_db.close
 
-    File.exist?( SpecInfo.test_db ).should == true
+    File.exist?( SpecInfo.test_db ).should be == true
     fdb.execute("SELECT count(*) as cnt from subcountry").first['cnt'].should == all_sub
   end
 
@@ -502,4 +501,10 @@ describe Amalgalite::Database do
     lambda { @iso_db.replicate_to( false ) }.should raise_error( ArgumentError, /must be a String or a Database/ )
   end
 
+  it "imports batch statements" do
+    db = Amalgalite::Database.new(":memory:")
+    db.import("CREATE TABLE things(stuff TEXT); INSERT INTO things (stuff) VALUES (\"foobar\");").should be_true
+    db.first_value_from("SELECT stuff FROM things").should == "foobar"
+  end
+
 end

data/spec/default_map_spec.rb

@@ -1,4 +1,4 @@
-$: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
+require 'spec_helper'
 require 'amalgalite/type_maps/default_map'
 
 describe Amalgalite::TypeMaps::DefaultMap do

data/spec/function_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__),"spec_helper.rb"))
+require 'spec_helper'
 
 describe "Scalar SQL Functions" do
 

data/spec/integeration_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__),"spec_helper.rb"))
+require 'spec_helper'
+
 require 'date'
 require 'time'
 

data/spec/packer_spec.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.join(File.dirname(__FILE__),"spec_helper.rb"))
+require 'spec_helper'
+
 require 'amalgalite/packer'
-require 'gemspec'
 
 describe "Amalgalite::Packer" do
   before( :each ) do
@@ -51,8 +51,8 @@ describe "Amalgalite::Packer" do
 
   it "has all the lib files in the amalgalite gem" do
     ro = Amalgalite::Packer.amalgalite_require_order
-    glist = Amalgalite::GEM_SPEC.files.select { |l| l.index("lib/amalgalite") == 0 }
-    glist.map! { |l| l.sub("lib/","") }
+    glist = IO.readlines("Manifest.txt").select { |l| l.index("lib/amalgalite") == 0 }
+    glist.map! { |l| l.strip.sub("lib/","") }
     (glist - ro).each do |l|
       l.should_not =~ /amalgalite/
     end

data/spec/paths_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__),"spec_helper.rb"))
+require 'spec_helper'
 
 describe Amalgalite::Paths do
   before(:each) do

data/spec/progress_handler_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) )
+require 'spec_helper'
 
 class PH < ::Amalgalite::ProgressHandler
   attr_reader :call_count
@@ -16,12 +16,11 @@ class PH < ::Amalgalite::ProgressHandler
   end
 end
 
-def query_thread( db )
-  Thread.new( db ) do |db|
+def query_thread( database )
+  Thread.new( database ) do |db|
     begin
       db.execute("select count(id) from country")
     rescue => e
-      had_error = e
       Thread.current[:exception] = e
     end
   end
@@ -69,7 +68,7 @@ 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_code.should be == 9
     @iso_db.api.last_error_message.should  =~ /interrupted/
     qt[:exception].message.should =~ /interrupted/
   end

data/spec/requires_spec.rb

@@ -1,5 +1,5 @@
-$: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
-#require 'amalgalite/requires'
+require 'spec_helper'
+require 'amalgalite/requires'
 
 #describe Amalgalite::Requires do
 #  it "#require_order has all files in 'lib' and no more" do
@@ -18,3 +18,37 @@ $: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
 #end
 
 
+describe Amalgalite::Requires do
+  it "can import to an in-memory database" do
+    sql = <<-SQL
+CREATE TABLE rubylibs (
+      id                   INTEGER PRIMARY KEY AUTOINCREMENT,
+      filename   TEXT UNIQUE,
+      compressed BOOLEAN,
+      contents   BLOB
+      );
+INSERT INTO "rubylibs" VALUES(1, "application", "false", 'A=1');
+SQL
+    r = Amalgalite::Requires.new(:dbfile_name => ":memory:")
+    r.import(sql)
+    r.file_contents( "application" ).should == "A=1"
+  end
+
+
+  it "gives equal instances for file databases" do
+    a = Amalgalite::Requires.new( :dbfile_name => SpecInfo.test_db )
+    b = Amalgalite::Requires.new( :dbfile_name => SpecInfo.test_db )    
+
+    a.db_connection.should equal( b.db_connection )
+  end
+
+
+  it "gives separate instances for in-memory databases" do
+    a = Amalgalite::Requires.new( :dbfile_name => ":memory:" )
+    b = Amalgalite::Requires.new( :dbfile_name => ":memory:" )
+
+    a.db_connection.should_not equal(b.db_connection)
+  end
+
+  
+end

data/spec/rtree_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path( File.join( File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
+
 #
 # Example from http://sqlite.org/rtree.html
 #
@@ -37,9 +38,9 @@ describe "SQLite3 R*Tree extension" do
 
   it "queries normally" do
     r = @db.execute "SELECT * FROM demo_index WHERE id=1;"
-    r.size.should == 1
+    r.size.should be == 1
     row = r.first
-    row['id'].should == 1
+    row['id'].should be == 1
   end
 
   it "does a 'contained within' query" do
@@ -49,8 +50,8 @@ describe "SQLite3 R*Tree extension" do
        AND minY>=30.00  AND maxY<=30.44;
     sql
 
-    r.size.should == 1
-    r.first['id'].should == 1
+    r.size.should be == 1
+    r.first['id'].should be == 1
   end
 
   it "does an 'overlapping' query" do

data/spec/schema_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path( File.join( File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
 
 require 'amalgalite'
 require 'amalgalite/schema'
@@ -15,7 +15,7 @@ describe Amalgalite::Schema do
     s = @iso_db.schema
     sql = "CREATE VIEW v1 AS SELECT c.name, c.two_letter, s.name, s.subdivision FROM country AS c JOIN subcountry AS s ON c.two_letter = s.country"
     @iso_db.execute( sql )
-    s.dirty?.should == true
+    s.dirty?.should be == true
     @iso_db.schema.load_views
     @iso_db.schema.views.size.should eql(1)
     @iso_db.schema.views["v1"].sql.should eql(sql)
@@ -25,9 +25,9 @@ describe Amalgalite::Schema do
     s = @iso_db.schema
     sql = "CREATE TABLE t1( d1 default 't' )"
     @iso_db.execute( sql )
-    s.dirty?.should == true
+    s.dirty?.should be == true
     tt = @iso_db.schema.tables['t1']
-    tt.columns['d1'].default_value.should == "t"
+    tt.columns['d1'].default_value.should be == "t"
   end
 
   it "loads the tables and columns" do
@@ -56,23 +56,22 @@ describe Amalgalite::Schema do
     s = @iso_db.schema
     sql = "CREATE TABLE u( id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL , other text )"
     @iso_db.execute( sql )
-    s.dirty?.should == true
+    s.dirty?.should be == true
     ut = @iso_db.schema.tables['u']
     ut.primary_key.should == [ ut.columns['id'] ]
   end
 
   it "knows the primary key of a temporary table" do
     @iso_db.execute "CREATE TEMPORARY TABLE tt( a, b INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, c )"
-    tt = @iso_db.schema.load_table( 'tt' )
+    tt = @iso_db.schema.tables[ 'tt' ]
     tt.primary_key.should == [ tt.columns['b'] ]
-
   end
 
   it "knows what the primary key of a table is when it is a multiple column primary key" do
     sql = "CREATE TABLE m ( id1, id2, PRIMARY KEY (id2, id1) )"
     s = @iso_db.schema
     @iso_db.execute( sql )
-    s.dirty?.should == true
+    s.dirty?.should be == true
     mt = @iso_db.schema.tables['m']
     mt.primary_key.should == [ mt.columns['id2'], mt.columns['id1'] ]
   end
@@ -93,31 +92,40 @@ describe Amalgalite::Schema do
 
   it "knows the schema is dirty when a table is created" do
     s = @iso_db.schema
-    c = s.tables['country']
-    s.dirty?.should == false
+    s.tables['country']
+    s.dirty?.should be == false
     @iso_db.execute( "create table x1( a, b )" )
-    s.dirty?.should == true
+    s.dirty?.should be == true
   end
 
   it "knows the schema is dirty when a table is dropped" do
     s = @iso_db.schema
-    c = s.tables['country']
+    s.tables['country']
     @iso_db.execute( "create table x1( a, b )" )
-    s.dirty?.should == true
+    s.dirty?.should be == true
 
     @iso_db.schema.load_schema!
     s = @iso_db.schema
 
-    s.dirty?.should == false
+    s.dirty?.should be == false
     @iso_db.execute("drop table x1")
-    s.dirty?.should == true
+    s.dirty?.should be == true
   end
 
+  it "knows if a temporary table exists" do
+    @iso_db.execute "CREATE TEMPORARY TABLE tt(a,b,c)"
+    @iso_db.schema.tables.keys.include?('tt').should be == true
+    @iso_db.schema.tables['tt'].temporary?.should be == true
+  end
 
-  it "can load the schema of a temporary table" do
-    @iso_db.execute "CREATE TEMPORARY TABLE tt( a, b, c )"
-    @iso_db.schema.tables['tt'].should be_nil
-    @iso_db.schema.load_table('tt').should_not be_nil
-    @iso_db.schema.tables['tt'].should be_temporary
+  it "sees that temporary tables shadow real tables" do
+    @iso_db.execute "CREATE TABLE tt(x)"
+    @iso_db.schema.tables['tt'].temporary?.should be == false
+    @iso_db.execute "CREATE TEMP TABLE tt(a,b,c)"
+    @iso_db.schema.tables['tt'].temporary?.should be == true
+    @iso_db.execute "DROP TABLE tt"
+    @iso_db.schema.tables['tt'].temporary?.should be == false
+    @iso_db.schema.tables['tt'].columns.size.should be == 1
   end
+
 end