amalgalite 1.1.2-x86-mingw32 → 1.4.0-x86-mingw32

data/lib/amalgalite/schema.rb

@@ -15,31 +15,52 @@ module Amalgalite
   #
   class Schema
 
+    # The internal database that this schema is for. Most of the time this will
+    # be 'main' for the main database. For the temp tables, this will be 'temp'
+    # and for any attached databsae, this is the name of attached database.
     attr_reader :catalog
-    attr_reader :schema 
+
+    # The schema_version at the time this schema was taken.
     attr_reader :schema_version
-    attr_writer :dirty
+
+    # The Amalagalite::Database this schema is associated with.
     attr_reader :db
 
     #
     # Create a new instance of Schema
     #
-    def initialize( db, catalog = 'main', schema = 'sqlite')
-      @db = db
-      @catalog = catalog
-      @schema = schema
+    def initialize( db, catalog = 'main', master_table = 'sqlite_master' )
+      @db             = db
+      @catalog        = catalog
       @schema_version = nil
-      @tables = {}
-      @views  = {}
+      @tables         = {}
+      @views          = {}
+      @master_table   = master_table
+
+      if @master_table == 'sqlite_master' then
+        @temp_schema = ::Amalgalite::Schema.new( db, 'temp', 'sqlite_temp_master')
+      else
+        @temp_schema = nil
+      end
       load_schema!
     end
 
-    def dirty?() 
-      return (@schema_version != self.current_version)
+    def catalog_master_table
+      "#{catalog}.#{@master_table}"
+    end
+
+    def temporary?
+      catalog == "temp"
+    end
+
+    def dirty?()
+      return true  if (@schema_version != self.current_version)
+      return false unless @temp_schema
+      return @temp_schema.dirty?
     end
 
     def current_version
-      @db.first_value_from("PRAGMA schema_version")
+      @db.first_value_from("PRAGMA #{catalog}.schema_version")
     end
 
     #
@@ -47,15 +68,24 @@ module Amalgalite
     def load_schema!
       load_tables
       load_views
+      if @temp_schema then
+        @temp_schema.load_schema!
+      end
       @schema_version = self.current_version
       nil
     end
 
     ##
-    # return the tables, reloading if dirty
+    # return the tables, reloading if dirty.
+    # If there is a temp table and a normal table with the same name, then the
+    # temp table is the one that is returned in the hash.
     def tables
       load_schema! if dirty?
-      return @tables
+      t = @tables
+      if @temp_schema then
+        t = @tables.merge( @temp_schema.tables )
+      end
+      return t
     end
 
     ##
@@ -63,7 +93,7 @@ module Amalgalite
     #
     def load_tables
       @tables = {}
-      @db.execute("SELECT tbl_name FROM sqlite_master WHERE type = 'table' AND name != 'sqlite_sequence'") do |table_info|
+      @db.execute("SELECT tbl_name FROM #{catalog_master_table} WHERE type = 'table' AND name != 'sqlite_sequence'") do |table_info|
         table = load_table( table_info['tbl_name'] )
         table.indexes = load_indexes( table )
         @tables[table.name] = table
@@ -74,36 +104,26 @@ module Amalgalite
     ##
     # Load a single table
     def load_table( table_name )
-      rows = @db.execute("SELECT tbl_name, sql FROM sqlite_master WHERE type = 'table' AND tbl_name = ?", table_name)
+      rows = @db.execute("SELECT tbl_name, sql FROM #{catalog_master_table} WHERE type = 'table' AND tbl_name = ?", table_name)
       table_info = rows.first
       table = nil
-      if table_info then 
+      if table_info then
         table = Amalgalite::Table.new( table_info['tbl_name'], table_info['sql'] )
-        table.columns = load_columns( table )
         table.schema = self
+        table.columns = load_columns( table )
         table.indexes = load_indexes( table )
-        @tables[table.name] = table 
-      else
-        # might be a temporary table
-        table = Amalgalite::Table.new( table_name, nil )
-        cols = load_columns( table )
-        if cols.size > 0 then
-          table.columns = cols
-          table.schema = self
-          table.indexes = load_indexes( table )
-          @tables[table.name] = table
-        end
+        @tables[table.name] = table
       end
       return table
     end
 
-    ## 
+    ##
     # load all the indexes for a particular table
     #
     def load_indexes( table )
       indexes = {}
 
-      @db.prepare("SELECT name, sql FROM sqlite_master WHERE type ='index' and tbl_name = $name") do |idx_stmt|
+      @db.prepare("SELECT name, sql FROM #{catalog_master_table} WHERE type ='index' and tbl_name = $name") do |idx_stmt|
         idx_stmt.execute( "$name" => table.name) do |idx_info|
           indexes[idx_info['name']] = Amalgalite::Index.new( idx_info['name'], idx_info['sql'], table )
         end
@@ -134,8 +154,8 @@ module Amalgalite
     def load_columns( table )
       cols = {}
       idx = 0
-      @db.execute("PRAGMA table_info(#{@db.quote(table.name)})") do |row|
-        col = Amalgalite::Column.new( "main", table.name, row['name'], row['cid'])
+      @db.execute("PRAGMA #{catalog}.table_info(#{@db.quote(table.name)})") do |row|
+        col = Amalgalite::Column.new( catalog,  table.name, row['name'], row['cid'])
 
         col.default_value       = row['dflt_value']
 
@@ -154,7 +174,7 @@ module Amalgalite
 
         unless table.temporary? then
           # get more exact information
-          @db.api.table_column_metadata( "main", table.name, col.name ).each_pair do |key, value|
+          @db.api.table_column_metadata( catalog, table.name, col.name ).each_pair do |key, value|
             col.send("#{key}=", value)
           end
         end
@@ -168,16 +188,23 @@ module Amalgalite
     ##
     # return the views, reloading if dirty
     #
+    # If there is a temp view, and a regular view of the same name, then the
+    # temporary view is the one that is returned in the hash.
+    #
     def views
       reload_schema! if dirty?
-      return @views
+      v = @views
+      if @temp_schema then
+        v = @views.merge( @temp_schema.views )
+      end
+      return v
     end
 
     ##
     # load a single view
     #
     def load_view( name )
-      rows = @db.execute("SELECT name, sql FROM sqlite_master WHERE type = 'view' AND name = ?", name )
+      rows = @db.execute("SELECT name, sql FROM #{catalog_master_table} WHERE type = 'view' AND name = ?", name )
       view_info = rows.first
       view = Amalgalite::View.new( view_info['name'], view_info['sql'] )
       view.schema = self
@@ -188,7 +215,7 @@ module Amalgalite
     # load all the views for the database
     #
     def load_views
-      @db.execute("SELECT name, sql FROM sqlite_master WHERE type = 'view'") do |view_info|
+      @db.execute("SELECT name, sql FROM #{catalog_master_table} WHERE type = 'view'") do |view_info|
         view = load_view( view_info['name'] )
         @views[view.name] = view
       end

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.4.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'
@@ -59,7 +59,7 @@ describe Amalgalite::Database do
 
   it "closes normally" do
     db = Amalgalite::Database.new( SpecInfo.test_db )
-    lambda { db.close }.should_not raise_error( Amalgalite::SQLite3::Error )
+    expect { db.close }.not_to raise_error
   end
 
   it "returns the id of the last inserted row" do
@@ -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
@@ -255,28 +255,28 @@ describe Amalgalite::Database do
       rescue MyExceptionTest
         db.transaction("EXCLUSIVE") { }
       end
-    }.should_not raise_error( MyExceptionTest )
+    }.should_not raise_error
   end
 
   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_truthy
+    db.first_value_from("SELECT stuff FROM things").should == "foobar"
+  end
+
 end