amalgalite 0.2.4 → 0.4.0

data/ext/sqlite3ext.h

@@ -15,7 +15,7 @@
 ** as extensions by SQLite should #include this file instead of 
 ** sqlite3.h.
 **
-** @(#) $Id: sqlite3ext.h,v 1.21 2008/03/19 21:45:51 drh Exp $
+** @(#) $Id: sqlite3ext.h,v 1.24 2008/06/30 15:09:29 danielk1977 Exp $
 */
 #ifndef _SQLITE3EXT_H_
 #define _SQLITE3EXT_H_
@@ -78,7 +78,7 @@ struct sqlite3_api_routines {
   int  (*complete)(const char*sql);
   int  (*complete16)(const void*sql);
   int  (*create_collation)(sqlite3*,const char*,int,void*,int(*)(void*,int,const void*,int,const void*));
-  int  (*create_collation16)(sqlite3*,const char*,int,void*,int(*)(void*,int,const void*,int,const void*));
+  int  (*create_collation16)(sqlite3*,const void*,int,void*,int(*)(void*,int,const void*,int,const void*));
   int  (*create_function)(sqlite3*,const char*,int,int,void*,void (*xFunc)(sqlite3_context*,int,sqlite3_value**),void (*xStep)(sqlite3_context*,int,sqlite3_value**),void (*xFinal)(sqlite3_context*));
   int  (*create_function16)(sqlite3*,const void*,int,int,void*,void (*xFunc)(sqlite3_context*,int,sqlite3_value**),void (*xStep)(sqlite3_context*,int,sqlite3_value**),void (*xFinal)(sqlite3_context*));
   int (*create_module)(sqlite3*,const char*,const sqlite3_module*,void*);
@@ -188,6 +188,11 @@ struct sqlite3_api_routines {
   int (*test_control)(int, ...);
   void (*randomness)(int,void*);
   sqlite3 *(*context_db_handle)(sqlite3_context*);
+  int (*extended_result_codes)(sqlite3*,int);
+  int (*limit)(sqlite3*,int,int);
+  sqlite3_stmt *(*next_stmt)(sqlite3*,sqlite3_stmt*);
+  const char *(*sql)(sqlite3_stmt*);
+  int (*status)(int,int*,int*,int);
 };
 
 /*
@@ -354,9 +359,14 @@ struct sqlite3_api_routines {
 #define sqlite3_test_control           sqlite3_api->test_control
 #define sqlite3_randomness             sqlite3_api->randomness
 #define sqlite3_context_db_handle      sqlite3_api->context_db_handle
+#define sqlite3_extended_result_codes  sqlite3_api->extended_result_codes
+#define sqlite3_limit                  sqlite3_api->limit
+#define sqlite3_next_stmt              sqlite3_api->next_stmt
+#define sqlite3_sql                    sqlite3_api->sql
+#define sqlite3_status                 sqlite3_api->status
 #endif /* SQLITE_CORE */
 
-#define SQLITE_EXTENSION_INIT1     const sqlite3_api_routines *sqlite3_api;
+#define SQLITE_EXTENSION_INIT1     const sqlite3_api_routines *sqlite3_api = 0;
 #define SQLITE_EXTENSION_INIT2(v)  sqlite3_api = v;
 
 #endif /* _SQLITE3EXT_H_ */

data/gemspec.rb

@@ -28,7 +28,6 @@ Amalgalite::GEM_SPEC = Gem::Specification.new do |spec|
   if ext_conf = Configuration.for_if_exist?("extension") then
     spec.extensions <<  ext_conf.configs
     spec.extensions.flatten!
-    spec.require_paths << "ext"
   end
   
   if rdoc = Configuration.for_if_exist?('rdoc') then

data/lib/amalgalite.rb

@@ -3,27 +3,31 @@
 # All rights reserved.  See LICENSE and/or COPYING for details.
 #++
 
+# check if sqlite3 has already been required.  Amalgalite conflicts with system
+# level sqlite3 libraries.
+unless $LOADED_FEATURES.grep( /sqlite3/ ).empty? then
+  raise LoadError, "amalgalite conflicts with sqlite3-ruby, please choose one or the other."
+end
+
 module Amalgalite
   # 
   # Base class of all errors in Amalgalite
   #
   class Error < ::StandardError; end
 end
-%w[ blob 
-    boolean 
-    column 
-    database 
-    index 
-    paths 
-    profile_tap 
-    schema 
-    sqlite3 
-    statement 
-    table 
-    taps
-    trace_tap 
-    type_map 
-    version 
-    view].each do |lib|
-  require "amalgalite/#{lib}"
-end
+require 'amalgalite/blob'
+require 'amalgalite/boolean'
+require 'amalgalite/column'
+require 'amalgalite/database'
+require 'amalgalite/index'
+require 'amalgalite/paths'
+require 'amalgalite/profile_tap'
+require 'amalgalite/schema'
+require 'amalgalite/sqlite3'
+require 'amalgalite/statement'
+require 'amalgalite/table'
+require 'amalgalite/taps'
+require 'amalgalite/trace_tap'
+require 'amalgalite/type_map'
+require 'amalgalite/version'
+require 'amalgalite/view'

data/lib/amalgalite/core_ext/kernel/require.rb

@@ -1,5 +1,5 @@
 module Kernel
-  alias :original_require :require
+  alias :amalgalite_original_require :require
   #
   # hook into the system 'require' to allow for required text or blobs from an
   # amalgalite database.  
@@ -7,7 +7,7 @@ module Kernel
   def require( filename )
     found = Amalgalite::Requires.require( filename )
     unless found
-      found = original_require( filename )
+      found = amalgalite_original_require( filename )
     end
     return found
   end

data/lib/amalgalite/database.rb

@@ -467,14 +467,22 @@ module Amalgalite
     # issued upon leaving the block.
     #
     # If no block is passed in then you are on your own.
+    #
+    # Nested transactions are not supported by SQLite, but they are faked here.
+    # If you call transaction within a transaction, no new transaction is
+    # started, the current one is just continued.
     # 
     def transaction( mode = TransactionBehavior::DEFERRED )
       raise Amalgalite::Error, "Invalid transaction behavior mode #{mode}" unless TransactionBehavior.valid?( mode )
-      raise Amalgalite::Error, "Nested Transactions are not supported" if in_transaction?
-      execute( "BEGIN #{mode} TRANSACTION" )
+
+      # if already in a transaction, no need to start a new one.
+      if not in_transaction? then
+        execute( "BEGIN #{mode} TRANSACTION" )
+      end
+
       if block_given? then
         begin
-          yield self
+          return ( yield self )
         ensure
           if $! then
             rollback
@@ -483,22 +491,23 @@ module Amalgalite
             commit
           end
         end
+      else
+        return in_transaction?
       end
-      return in_transaction?
     end
 
     ##
     # Commit a transaction
     #
     def commit
-      execute( "COMMIT" )
+      execute( "COMMIT" ) if in_transaction?
     end
 
     ##
     # Rollback a transaction
     #
     def rollback
-      execute( "ROLLBACK" )
+      execute( "ROLLBACK" ) if in_transaction?
     end
   end
 end

data/lib/amalgalite/index.rb

@@ -17,10 +17,26 @@ module Amalgalite
     # the table the index is for
     attr_accessor :table
 
+    # the columns that make up this index, in index order
+    attr_accessor :columns
+
+    # sqlite sequence number of the index
+    attr_accessor :sequence_number
+
+    # is the index unique
+    attr_writer   :unique
+
     def initialize( name, sql, table ) 
-      @name  = name
-      @sql   = sql
-      @table = table
+      @name             = name
+      @sql              = sql
+      @table            = table
+      @columns          = []
+      @sequence_number  = nil
+      @unique           = nil
+    end
+
+    def unique?
+      return @unique
     end
   end
 end

data/lib/amalgalite/requires.rb

@@ -1,3 +1,5 @@
+require 'amalgalite'
+
 module Amalgalite
   #
   # Requires encapsulates requiring itesm from the database
@@ -22,6 +24,41 @@ module Amalgalite
       def require( filename )
         load_path.each { |lp| lp.require( filename ) }
       end
+
+      #
+      # return the files in their dependency order for use for packing into a
+      # database
+      #
+      def require_order
+        @require_roder ||= %w[
+          amalgalite.rb
+          amalgalite/blob.rb
+          amalgalite/boolean.rb
+          amalgalite/column.rb
+          amalgalite/statement.rb
+          amalgalite/trace_tap.rb
+          amalgalite/profile_tap.rb
+          amalgalite/type_map.rb
+          amalgalite/type_maps/storage_map.rb
+          amalgalite/type_maps/text_map.rb
+          amalgalite/type_maps/default_map.rb
+          amalgalite/database.rb
+          amalgalite/index.rb
+          amalgalite/paths.rb
+          amalgalite/table.rb
+          amalgalite/view.rb
+          amalgalite/schema.rb
+          amalgalite/version.rb
+          amalgalite/sqlite3/version.rb
+          amalgalite/sqlite3/constants.rb
+          amalgalite/sqlite3.rb
+          amalgalite/taps/io.rb
+          amalgalite/taps/console.rb
+          amalgalite/taps.rb
+          amalgalite/core_ext/kernel/require.rb
+          amalgalite/requires.rb
+       ]
+     end
     end
 
     attr_reader :dbfile_name

data/lib/amalgalite/schema.rb

@@ -48,18 +48,39 @@ module Amalgalite
         table = Amalgalite::Table.new( table_info['tbl_name'], table_info['sql'] )
         table.columns = load_columns( table )
         table.schema = self
+        table.indexes = load_indexes( table )
 
-        @db.prepare("SELECT name, sql FROM sqlite_master WHERE type ='index' and tbl_name = @name") do |idx_stmt|
-          idx_stmt.execute( "@name" => table.name) do |idx_info|
-            table.indexes << Amalgalite::Index.new( idx_info['name'], idx_info['sql'], table )
-          end
-        end
         @tables[table.name] = table
       end
 
       @tables
     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|
+        idx_stmt.execute( "$name" => table.name) do |idx_info|
+          indexes[idx_info['name']] = Amalgalite::Index.new( idx_info['name'], idx_info['sql'], table )
+        end
+      end
+
+      @db.execute("PRAGMA index_list( #{table.name} );") do |idx_list|
+        idx = indexes[idx_list['name']]
+        
+        idx.sequence_number = idx_list['seq']
+        idx.unique          = Boolean.to_bool( idx_list['unique'] )
+
+        @db.execute("PRAGMA index_info( #{idx.name} );") do |col_info|
+          idx.columns << table.columns[col_info['name']]
+        end
+      end
+      return indexes
+    end
+
     ##
     # load all the columns for a particular table
     #

data/lib/amalgalite/sqlite3.rb

@@ -2,3 +2,5 @@ require 'amalgalite3'
 require 'amalgalite/version'
 require 'amalgalite/sqlite3/version'
 require 'amalgalite/sqlite3/constants'
+require 'amalgalite/sqlite3/status'
+require 'amalgalite/sqlite3/database/status'

data/lib/amalgalite/sqlite3/constants.rb

@@ -9,6 +9,39 @@ module Amalgalite::SQLite3
   # module containing all constants used from the SQLite C extension
   #
   module Constants
+    module Helpers
+      #
+      # convert an integer value into the string representation of the associated
+      # constant. this is a helper method used by some of the other modules
+      #
+      def name_from_value( value )
+        unless @const_map_from_value
+          @const_map_from_value = {}
+          constants.each do |const_name|
+            c_int = const_get( const_name )
+            @const_map_from_value[c_int] = const_name
+          end
+        end
+        return @const_map_from_value[ value ]
+      end
+
+      #
+      # convert a string into the constant value.  This is helper method used by
+      # some of the other modules
+      #
+      def value_from_name( name )
+        unless @const_map_from_name
+          @const_map_from_name = {}
+          constants.each do |const_name|
+            c_int = const_get( const_name )
+            @const_map_from_name[ const_name ] = c_int
+          end
+        end
+        return @const_map_from_name[ name.upcase ]
+      end
+    end
+
+
     ##
     # DataType defines the namespace for all possible SQLite data types.
     # 
@@ -24,25 +57,29 @@ module Amalgalite::SQLite3
     end
     Open.freeze
 
+    ##
+    # Status defines the namespace for all the possible status flags for
+    # Amalgalite::SQLite3::Status objects
+    #
+    module Status
+      extend Helpers
+    end
+
+
+    ##
+    # DBStatus defines the namespace for all the possible status codes for the
+    # Amalgalite::SQlite3::Database::Status objects.
+    #
+    module DBStatus
+      extend Helpers
+    end
+
     ##
     # ResultCode defines the namespace for all possible result codes from an
     # SQLite API call.
     #
     module ResultCode
-      #
-      # convert an integer value into the string representation of the associated
-      # ResultCode constant.
-      #
-      def self.from_int( value )
-        unless @const_map_from_int
-          @const_map_from_int = {}
-          constants.each do |const_name|
-            c_int = const_get( const_name )
-            @const_map_from_int[c_int] = const_name
-          end
-        end
-        return @const_map_from_int[ value ]
-      end
+      extend Helpers
     end # end ResultCode
   end
 end

data/lib/amalgalite/sqlite3/database/status.rb

@@ -0,0 +1,69 @@
+require 'amalgalite3'
+require 'amalgalite/sqlite3/constants'
+module Amalgalite::SQLite3
+  class Database
+    # 
+    # A Stat represents a single Database Status code and its current highwater mark.
+    #
+    # Some stats may not have a current or a highwater value, in those cases
+    # the associated _has_current?_ or _has_highwater?_ method returns false and the
+    # _current_ or _highwater_ method also returns +nil+.
+    #
+    class Stat
+      attr_reader :name
+      attr_reader :code
+
+      def initialize( api_db, name )
+        @name      = name
+        @code      = ::Amalgalite::SQLite3::Constants::DBStatus.value_from_name( name )
+        @current   = nil
+        @highwater = nil
+        @api_db    = api_db 
+      end
+
+      def current
+        update!
+        return @current
+      end
+
+      def highwater
+        update!
+        return @highwater
+      end
+
+      #
+      # reset the given stat's highwater mark.  This will also populate the
+      # _@current_ and _@highwater_ instance variables
+      #
+      def reset!
+        update!( true )
+      end
+    end
+
+    #
+    # Top level Status object holding all the Stat objects indicating the DBStatus
+    # of the SQLite3 C library.
+    #
+    class DBStatus
+      ::Amalgalite::SQLite3::Constants::DBStatus.constants.each do |const_name|
+        method_name = const_name.downcase
+        module_eval( <<-code, __FILE__, __LINE__ )
+        def #{method_name}
+          @#{method_name} ||=  Amalgalite::SQLite3::Database::Stat.new( self.api_db, '#{method_name}' )   
+        end
+      code
+      end
+
+      attr_reader :api_db
+
+      def initialize( api_db )
+        @api_db = api_db
+      end
+    end
+
+    # return the DBstatus object for the sqlite database
+    def status
+      @status ||= DBStatus.new( self )
+    end
+  end
+end