amalgalite 0.15.0-x86-mingw32 → 1.0.0-x86-mingw32

data/ext/amalgalite/sqlite3.h

@@ -107,9 +107,9 @@ extern "C" {
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.7.3"
-#define SQLITE_VERSION_NUMBER 3007003
-#define SQLITE_SOURCE_ID      "2010-10-08 02:34:02 2677848087c9c090efb17c1893e77d6136a9111d"
+#define SQLITE_VERSION        "3.7.4"
+#define SQLITE_VERSION_NUMBER 3007004
+#define SQLITE_SOURCE_ID      "2010-12-07 20:14:09 a586a4deeb25330037a49df295b36aaf624d0f45"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
@@ -542,6 +542,18 @@ SQLITE_API int sqlite3_exec(
 ** equal SQLITE_SYNC_NORMAL, that means to use normal fsync() semantics.
 ** If the lower four bits equal SQLITE_SYNC_FULL, that means
 ** to use Mac OS X style fullsync instead of fsync().
+**
+** Do not confuse the SQLITE_SYNC_NORMAL and SQLITE_SYNC_FULL flags
+** with the [PRAGMA synchronous]=NORMAL and [PRAGMA synchronous]=FULL
+** settings.  The [synchronous pragma] determines when calls to the
+** xSync VFS method occur and applies uniformly across all platforms.
+** The SQLITE_SYNC_NORMAL and SQLITE_SYNC_FULL flags determine how
+** energetic or rigorous or forceful the sync operations are and
+** only make a difference on Mac OSX for the default SQLite code.
+** (Third-party VFS implementations might also make the distinction
+** between SQLITE_SYNC_NORMAL and SQLITE_SYNC_FULL, but among the
+** operating systems natively supported by SQLite, only Mac OSX
+** cares about the difference.)
 */
 #define SQLITE_SYNC_NORMAL        0x00002
 #define SQLITE_SYNC_FULL          0x00003
@@ -710,6 +722,8 @@ struct sqlite3_io_methods {
 #define SQLITE_LAST_ERRNO             4
 #define SQLITE_FCNTL_SIZE_HINT        5
 #define SQLITE_FCNTL_CHUNK_SIZE       6
+#define SQLITE_FCNTL_FILE_POINTER     7
+
 
 /*
 ** CAPI3REF: Mutex Handle
@@ -2633,6 +2647,20 @@ SQLITE_API int sqlite3_prepare16_v2(
 */
 SQLITE_API const char *sqlite3_sql(sqlite3_stmt *pStmt);
 
+/*
+** CAPI3REF: Determine If An SQL Statement Writes The Database
+**
+** ^The sqlite3_stmt_readonly(X) interface returns true (non-zero) if
+** the [prepared statement] X is [SELECT] statement and false (zero) if
+** X is an [INSERT], [UPDATE], [DELETE], CREATE, DROP, [ANALYZE],
+** [ALTER], or [REINDEX] statement.
+** If X is a NULL pointer or any other kind of statement, including but
+** not limited to [ATTACH], [DETACH], [COMMIT], [ROLLBACK], [RELEASE],
+** [SAVEPOINT], [PRAGMA], or [VACUUM] the result of sqlite3_stmt_readonly(X) is
+** undefined.
+*/
+SQLITE_API int sqlite3_stmt_readonly(sqlite3_stmt *pStmt);
+
 /*
 ** CAPI3REF: Dynamically Typed Value Object
 ** KEYWORDS: {protected sqlite3_value} {unprotected sqlite3_value}
@@ -2732,7 +2760,10 @@ typedef struct sqlite3_context sqlite3_context;
 **
 ** ^The fifth argument to sqlite3_bind_blob(), sqlite3_bind_text(), and
 ** sqlite3_bind_text16() is a destructor used to dispose of the BLOB or
-** string after SQLite has finished with it. ^If the fifth argument is
+** string after SQLite has finished with it.  ^The destructor is called
+** to dispose of the BLOB or string even if the call to sqlite3_bind_blob(),
+** sqlite3_bind_text(), or sqlite3_bind_text16() fails.  
+** ^If the fifth argument is
 ** the special value [SQLITE_STATIC], then SQLite assumes that the
 ** information is in static, unmanaged space and does not need to be freed.
 ** ^If the fifth argument has the value [SQLITE_TRANSIENT], then
@@ -3372,12 +3403,15 @@ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt);
 ** SQL function or aggregate, pass NULL poiners for all three function
 ** callbacks.
 **
-** ^If the tenth parameter to sqlite3_create_function_v2() is not NULL,
-** then it is invoked when the function is deleted, either by being
-** overloaded or when the database connection closes.
-** ^When the destructure callback of the tenth parameter is invoked, it
-** is passed a single argument which is a copy of the pointer which was
-** the fifth parameter to sqlite3_create_function_v2().
+** ^(If the tenth parameter to sqlite3_create_function_v2() is not NULL,
+** then it is destructor for the application data pointer. 
+** The destructor is invoked when the function is deleted, either by being
+** overloaded or when the database connection closes.)^
+** ^The destructor is also invoked if the call to
+** sqlite3_create_function_v2() fails.
+** ^When the destructor callback of the tenth parameter is invoked, it
+** is passed a single argument which is a copy of the application data 
+** pointer which was the fifth parameter to sqlite3_create_function_v2().
 **
 ** ^It is permitted to register multiple implementations of the same
 ** functions with the same name but with either differing numbers of
@@ -3841,6 +3875,15 @@ SQLITE_API void sqlite3_result_zeroblob(sqlite3_context*, int n);
 ** calls to the collation creation functions or when the
 ** [database connection] is closed using [sqlite3_close()].
 **
+** ^The xDestroy callback is <u>not</u> called if the 
+** sqlite3_create_collation_v2() function fails.  Applications that invoke
+** sqlite3_create_collation_v2() with a non-NULL xDestroy argument should 
+** check the return code and dispose of the application data pointer
+** themselves rather than expecting SQLite to deal with it for them.
+** This is different from every other SQLite interface.  The inconsistency 
+** is unfortunate but cannot be changed without breaking backwards 
+** compatibility.
+**
 ** See also:  [sqlite3_collation_needed()] and [sqlite3_collation_needed16()].
 */
 SQLITE_API int sqlite3_create_collation(
@@ -4595,7 +4638,9 @@ struct sqlite3_index_info {
 ** ^The sqlite3_create_module_v2() interface has a fifth parameter which
 ** is a pointer to a destructor for the pClientData.  ^SQLite will
 ** invoke the destructor function (if it is not NULL) when SQLite
-** no longer needs the pClientData pointer.  ^The sqlite3_create_module()
+** no longer needs the pClientData pointer.  ^The destructor will also
+** be invoked if the call to sqlite3_create_module_v2() fails.
+** ^The sqlite3_create_module()
 ** interface is equivalent to sqlite3_create_module_v2() with a NULL
 ** destructor.
 */
@@ -4778,6 +4823,30 @@ SQLITE_API int sqlite3_blob_open(
   sqlite3_blob **ppBlob
 );
 
+/*
+** CAPI3REF: Move a BLOB Handle to a New Row
+**
+** ^This function is used to move an existing blob handle so that it points
+** to a different row of the same database table. ^The new row is identified
+** by the rowid value passed as the second argument. Only the row can be
+** changed. ^The database, table and column on which the blob handle is open
+** remain the same. Moving an existing blob handle to a new row can be
+** faster than closing the existing handle and opening a new one.
+**
+** ^(The new row must meet the same criteria as for [sqlite3_blob_open()] -
+** it must exist and there must be either a blob or text value stored in
+** the nominated column.)^ ^If the new row is not present in the table, or if
+** it does not contain a blob or text value, or if another error occurs, an
+** SQLite error code is returned and the blob handle is considered aborted.
+** ^All subsequent calls to [sqlite3_blob_read()], [sqlite3_blob_write()] or
+** [sqlite3_blob_reopen()] on an aborted blob handle immediately return
+** SQLITE_ABORT. ^Calling [sqlite3_blob_bytes()] on an aborted blob handle
+** always returns zero.
+**
+** ^This function sets the database handle error code and message.
+*/
+SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_blob_reopen(sqlite3_blob *, sqlite3_int64);
+
 /*
 ** CAPI3REF: Close A BLOB Handle
 **
@@ -5185,7 +5254,7 @@ SQLITE_API sqlite3_mutex *sqlite3_db_mutex(sqlite3*);
 ** ^The [sqlite3_file_control()] interface makes a direct call to the
 ** xFileControl method for the [sqlite3_io_methods] object associated
 ** with a particular database identified by the second argument. ^The
-** name of the database "main" for the main database or "temp" for the
+** name of the database is "main" for the main database or "temp" for the
 ** TEMP database, or the name that appears after the AS keyword for
 ** databases that are added using the [ATTACH] SQL command.
 ** ^A NULL pointer can be used in place of "main" to refer to the
@@ -5195,6 +5264,12 @@ SQLITE_API sqlite3_mutex *sqlite3_db_mutex(sqlite3*);
 ** the xFileControl method.  ^The return value of the xFileControl
 ** method becomes the return value of this routine.
 **
+** ^The SQLITE_FCNTL_FILE_POINTER value for the op parameter causes
+** a pointer to the underlying [sqlite3_file] object to be written into
+** the space pointed to by the 4th parameter.  ^The SQLITE_FCNTL_FILE_POINTER
+** case is a short-circuit path which does not actually invoke the
+** underlying sqlite3_io_methods.xFileControl method.
+**
 ** ^If the second parameter (zDbName) does not match the name of any
 ** open database file, then SQLITE_ERROR is returned.  ^This error
 ** code is not remembered and will not be recalled by [sqlite3_errcode()]

data/ext/amalgalite/sqlite3ext.h

@@ -191,6 +191,27 @@ struct sqlite3_api_routines {
   sqlite3_stmt *(*next_stmt)(sqlite3*,sqlite3_stmt*);
   const char *(*sql)(sqlite3_stmt*);
   int (*status)(int,int*,int*,int);
+  int (*backup_finish)(sqlite3_backup*);
+  sqlite3_backup *(*backup_init)(sqlite3*,const char*,sqlite3*,const char*);
+  int (*backup_pagecount)(sqlite3_backup*);
+  int (*backup_remaining)(sqlite3_backup*);
+  int (*backup_step)(sqlite3_backup*,int);
+  const char *(*compileoption_get)(int);
+  int (*compileoption_used)(const char*);
+  int (*create_function_v2)(sqlite3*,const char*,int,int,void*,void (*xFunc)(sqlite3_context*,int,sqlite3_value**),void (*xStep)(sqlite3_context*,int,sqlite3_value**),void (*xFinal)(sqlite3_context*),void(*xDestroy)(void*));
+  int (*db_config)(sqlite3*,int,...);
+  sqlite3_mutex *(*db_mutex)(sqlite3*);
+  int (*db_status)(sqlite3*,int,int*,int*,int);
+  int (*extended_errcode)(sqlite3*);
+  void (*log)(int,const char*,...);
+  sqlite3_int64 (*soft_heap_limit64)(sqlite3_int64);
+  const char *(*sourceid)(void);
+  int (*stmt_status)(sqlite3_stmt*,int,int);
+  int (*strnicmp)(const char*,const char*,int);
+  int (*unlock_notify)(sqlite3*,void(*)(void**,int),void*);
+  int (*wal_autocheckpoint)(sqlite3*,int);
+  int (*wal_checkpoint)(sqlite3*,const char*);
+  void *(*wal_hook)(sqlite3*,int(*)(void*,sqlite3*,const char*,int),void*);
 };
 
 /*
@@ -370,6 +391,27 @@ struct sqlite3_api_routines {
 #define sqlite3_next_stmt              sqlite3_api->next_stmt
 #define sqlite3_sql                    sqlite3_api->sql
 #define sqlite3_status                 sqlite3_api->status
+#define sqlite3_backup_finish          sqlite3_api->backup_finish
+#define sqlite3_backup_init            sqlite3_api->backup_init
+#define sqlite3_backup_pagecount       sqlite3_api->backup_pagecount
+#define sqlite3_backup_remaining       sqlite3_api->backup_remaining
+#define sqlite3_backup_step            sqlite3_api->backup_step
+#define sqlite3_compileoption_get      sqlite3_api->compileoption_get
+#define sqlite3_compileoption_used     sqlite3_api->compileoption_used
+#define sqlite3_create_function_v2     sqlite3_api->create_function_v2
+#define sqlite3_db_config              sqlite3_api->db_config
+#define sqlite3_db_mutex               sqlite3_api->db_mutex
+#define sqlite3_db_status              sqlite3_api->db_status
+#define sqlite3_extended_errcode       sqlite3_api->extended_errcode
+#define sqlite3_log                    sqlite3_api->log
+#define sqlite3_soft_heap_limit64      sqlite3_api->soft_heap_limit64
+#define sqlite3_sourceid               sqlite3_api->sourceid
+#define sqlite3_stmt_status            sqlite3_api->stmt_status
+#define sqlite3_strnicmp               sqlite3_api->strnicmp
+#define sqlite3_unlock_notify          sqlite3_api->unlock_notify
+#define sqlite3_wal_autocheckpoint     sqlite3_api->wal_autocheckpoint
+#define sqlite3_wal_checkpoint         sqlite3_api->wal_checkpoint
+#define sqlite3_wal_hook               sqlite3_api->wal_hook
 #endif /* SQLITE_CORE */
 
 #define SQLITE_EXTENSION_INIT1     const sqlite3_api_routines *sqlite3_api = 0;

data/gemspec.rb

@@ -5,7 +5,7 @@ require 'tasks/config'
 Amalgalite::GEM_SPEC = Gem::Specification.new do |spec|
   proj = Configuration.for('project')
   spec.name         = proj.name
-  spec.version      = Amalgalite::VERSION
+  spec.version      = Amalgalite::Version.to_s
   
   spec.author       = proj.author
   spec.email        = proj.email
@@ -20,15 +20,15 @@ Amalgalite::GEM_SPEC = Gem::Specification.new do |spec|
   spec.executables  = pkg.files.bin.collect { |b| File.basename(b) }
 
   # add dependencies here
-  spec.add_dependency("arrayfields", "~> 4.7.0")
-  spec.add_dependency("fastercsv", "~> 1.5.3")
+  spec.add_dependency("arrayfields", "~> 4.7.4")
+  spec.add_dependency("fastercsv", "~> 1.5.4")
   
-  spec.add_development_dependency("rake", "~> 0.8.4")
-  spec.add_development_dependency("configuration", "~> 0.0.5")
-  spec.add_development_dependency("rspec", "~> 1.2.2")
-  spec.add_development_dependency("rake-compiler", "~> 0.5.0")
-  spec.add_development_dependency('archive-tar-minitar', "~> 0.5.2")
-  spec.add_development_dependency('rcov', "~> 0.8.1.2.0")
+  spec.add_development_dependency("rake", "~> 0.8.7")
+  spec.add_development_dependency("configuration", "~> 1.2.0")
+  spec.add_development_dependency("rspec", "~> 2.4.0")
+  spec.add_development_dependency("rake-compiler", "~> 0.7.5")
+  spec.add_development_dependency('zip', "~> 2.0.2")
+  spec.add_development_dependency('rcov', "~> 0.9.9")
 
   if ext_conf = Configuration.for_if_exist?("extension") then
     spec.extensions <<  ext_conf.configs

data/lib/amalgalite/csv_table_importer.rb

@@ -1,4 +1,9 @@
-require 'fastercsv'
+if RUBY_VERSION >= "1.9"
+  require 'csv'
+else
+  require 'fastercsv'
+  ::CSV = ::FasterCSV
+end
 module Amalgalite
   ##
   # A class to deal with importing CSV data into a single table in the
@@ -17,7 +22,7 @@ module Amalgalite
     def run
       @database.transaction do |db|
         db.prepare( insert_sql ) do |stmt|
-          ::FasterCSV.foreach( @csv_path, @options ) do |row|
+          ::CSV.foreach( @csv_path, @options ) do |row|
             stmt.execute( row )
           end
         end

data/lib/amalgalite/database.rb

@@ -956,7 +956,7 @@ module Amalgalite
     #
     # import_csv_to_table() takes 2 required arguments, and a hash of options.  The 
     # first argument is the path to a CSV, the second is the table in which
-    # to load the data.  The options has is a subset of those used by FasterCSV
+    # to load the data.  The options has is a subset of those used by CSV
     #
     # * :col_sep - the string placed between each field.  Default is ","
     # * :row_sep - the String appended to the end of each row.  Default is :auto

data/lib/amalgalite/paths.rb

@@ -61,6 +61,16 @@ module Amalgalite
       self.sub_path("ext", *args)
     end
 
+    # returns:: [String] The full expanded path of the +spec+ directory below
+    #           _root_dir_.  All parameters passed in are joined onto the
+    #           result. Trailing File::SEPARATOR is guaranteed if
+    #           _*args_ are *not* present.
+    #
+    def self.spec_path(*args)
+      self.sub_path("spec", *args)
+    end
+
+
     def self.sub_path(sub,*args)
       sp = ::File.join(root_dir, sub) + File::SEPARATOR
       sp = ::File.join(sp, *args) if args

data/lib/amalgalite/sqlite3/constants.rb

@@ -14,7 +14,7 @@ module Amalgalite::SQLite3
           @const_map_from_value = {}
           constants.each do |const_name|
             c_int = const_get( const_name )
-            @const_map_from_value[c_int] = const_name
+            @const_map_from_value[c_int] = const_name.to_s
           end
         end
         return @const_map_from_value[ value ]
@@ -29,7 +29,7 @@ module Amalgalite::SQLite3
           @const_map_from_name = {}
           constants.each do |const_name|
             c_int = const_get( const_name )
-            @const_map_from_name[ const_name ] = c_int
+            @const_map_from_name[ const_name.to_s ] = c_int
           end
         end
         return @const_map_from_name[ name.upcase ]
@@ -41,16 +41,16 @@ module Amalgalite::SQLite3
     # DataType defines the namespace for all possible SQLite data types.
     # 
     module DataType
+      extend Helpers
     end
-    DataType.freeze
 
     ##
     # Open defines the namespace for all possible flags to the Database.open
     # method
     #
     module Open
+      extend Helpers
     end
-    Open.freeze
 
     ##
     # Status defines the namespace for all the possible status flags for
@@ -60,7 +60,6 @@ module Amalgalite::SQLite3
       extend Helpers
     end
 
-
     ##
     # DBStatus defines the namespace for all the possible status codes for the
     # Amalgalite::SQlite3::Database::Status objects.
@@ -76,5 +75,21 @@ module Amalgalite::SQLite3
     module ResultCode
       extend Helpers
     end # end ResultCode
+
+    ##
+    # Config defines the namespace for all possible parameter for the
+    # sqlite config API.
+    #
+    module Config
+      extend Helpers
+    end
+
+    ##
+    # StatementStatus defines the namespace for all the possible status codes
+    # for the SQLite prepared statements
+    #
+    module StatementStatus
+      extend Helpers
+    end
   end
 end

data/lib/amalgalite/version.rb

@@ -7,8 +7,8 @@ module Amalgalite
   # Version information for Amagalite
   module Version
 
-    MAJOR   = 0
-    MINOR   = 15
+    MAJOR   = 1
+    MINOR   = 0
     BUILD   = 0
 
     #

data/spec/database_spec.rb

@@ -1,5 +1,3 @@
-require 'rubygems'
-require 'spec'
 require File.expand_path( File.join( File.dirname(__FILE__), 'spec_helper'))
 
 $: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))

data/spec/default_map_spec.rb

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'spec'
-
 $: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
 require 'amalgalite/type_maps/default_map'
 

data/spec/requires_spec.rb

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'spec'
-
 $: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
 #require 'amalgalite/requires'
 

data/spec/rtree_spec.rb

@@ -1,7 +1,5 @@
 require File.expand_path( File.join( File.dirname(__FILE__), 'spec_helper'))
-
-$: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
-
+#
 # Example from http://sqlite.org/rtree.html
 #
 describe "SQLite3 R*Tree extension" do

data/spec/schema_spec.rb

@@ -1,8 +1,5 @@
-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'
 require 'amalgalite/schema'
 

data/spec/spec_helper.rb

@@ -1,15 +1,17 @@
 require 'rubygems'
-require 'spec'
+require 'rspec'
 
-$: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
+require 'amalgalite/paths'
+$:.unshift Amalgalite::Paths.root_dir
 
 require 'amalgalite'
-require File.expand_path( File.join( File.dirname(__FILE__), "iso_3166_database.rb" )  )
+require Amalgalite::Paths.spec_path( "iso_3166_database.rb" )
 
 class SpecInfo
   class << self
     def test_db
-      @test_db ||=  File.expand_path(File.join(File.dirname(__FILE__), "data", "test.db"))
+      @test_db ||= Amalgalite::Paths.spec_path("data", "test.db")
     end
 
     def make_master_iso_db
@@ -22,7 +24,7 @@ class SpecInfo
   end
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.before(:all) do 
     SpecInfo.make_master_iso_db
   end