amalgalite 1.4.1-x86-mingw32 → 1.7.0-x86-mingw32

data/ext/amalgalite/c/sqlite3ext.h

@@ -15,12 +15,10 @@
 ** as extensions by SQLite should #include this file instead of 
 ** sqlite3.h.
 */
-#ifndef _SQLITE3EXT_H_
-#define _SQLITE3EXT_H_
+#ifndef SQLITE3EXT_H
+#define SQLITE3EXT_H
 #include "sqlite3.h"
 
-typedef struct sqlite3_api_routines sqlite3_api_routines;
-
 /*
 ** The following structure holds pointers to all of the SQLite API
 ** routines.
@@ -136,7 +134,7 @@ struct sqlite3_api_routines {
   int  (*set_authorizer)(sqlite3*,int(*)(void*,int,const char*,const char*,
                          const char*,const char*),void*);
   void  (*set_auxdata)(sqlite3_context*,int,void*,void (*)(void*));
-  char * (*snprintf)(int,char*,const char*,...);
+  char * (*xsnprintf)(int,char*,const char*,...);
   int  (*step)(sqlite3_stmt*);
   int  (*table_column_metadata)(sqlite3*,const char*,const char*,const char*,
                                 char const**,char const**,int*,int*,int*);
@@ -248,7 +246,7 @@ struct sqlite3_api_routines {
   int (*uri_boolean)(const char*,const char*,int);
   sqlite3_int64 (*uri_int64)(const char*,const char*,sqlite3_int64);
   const char *(*uri_parameter)(const char*,const char*);
-  char *(*vsnprintf)(int,char*,const char*,va_list);
+  char *(*xvsnprintf)(int,char*,const char*,va_list);
   int (*wal_checkpoint_v2)(sqlite3*,const char*,int,int*,int*);
   /* Version 3.8.7 and later */
   int (*auto_extension)(void(*)(void));
@@ -272,8 +270,85 @@ struct sqlite3_api_routines {
   void (*value_free)(sqlite3_value*);
   int (*result_zeroblob64)(sqlite3_context*,sqlite3_uint64);
   int (*bind_zeroblob64)(sqlite3_stmt*, int, sqlite3_uint64);
+  /* Version 3.9.0 and later */
+  unsigned int (*value_subtype)(sqlite3_value*);
+  void (*result_subtype)(sqlite3_context*,unsigned int);
+  /* Version 3.10.0 and later */
+  int (*status64)(int,sqlite3_int64*,sqlite3_int64*,int);
+  int (*strlike)(const char*,const char*,unsigned int);
+  int (*db_cacheflush)(sqlite3*);
+  /* Version 3.12.0 and later */
+  int (*system_errno)(sqlite3*);
+  /* Version 3.14.0 and later */
+  int (*trace_v2)(sqlite3*,unsigned,int(*)(unsigned,void*,void*,void*),void*);
+  char *(*expanded_sql)(sqlite3_stmt*);
+  /* Version 3.18.0 and later */
+  void (*set_last_insert_rowid)(sqlite3*,sqlite3_int64);
+  /* Version 3.20.0 and later */
+  int (*prepare_v3)(sqlite3*,const char*,int,unsigned int,
+                    sqlite3_stmt**,const char**);
+  int (*prepare16_v3)(sqlite3*,const void*,int,unsigned int,
+                      sqlite3_stmt**,const void**);
+  int (*bind_pointer)(sqlite3_stmt*,int,void*,const char*,void(*)(void*));
+  void (*result_pointer)(sqlite3_context*,void*,const char*,void(*)(void*));
+  void *(*value_pointer)(sqlite3_value*,const char*);
+  int (*vtab_nochange)(sqlite3_context*);
+  int (*value_nochange)(sqlite3_value*);
+  const char *(*vtab_collation)(sqlite3_index_info*,int);
+  /* Version 3.24.0 and later */
+  int (*keyword_count)(void);
+  int (*keyword_name)(int,const char**,int*);
+  int (*keyword_check)(const char*,int);
+  sqlite3_str *(*str_new)(sqlite3*);
+  char *(*str_finish)(sqlite3_str*);
+  void (*str_appendf)(sqlite3_str*, const char *zFormat, ...);
+  void (*str_vappendf)(sqlite3_str*, const char *zFormat, va_list);
+  void (*str_append)(sqlite3_str*, const char *zIn, int N);
+  void (*str_appendall)(sqlite3_str*, const char *zIn);
+  void (*str_appendchar)(sqlite3_str*, int N, char C);
+  void (*str_reset)(sqlite3_str*);
+  int (*str_errcode)(sqlite3_str*);
+  int (*str_length)(sqlite3_str*);
+  char *(*str_value)(sqlite3_str*);
+  /* Version 3.25.0 and later */
+  int (*create_window_function)(sqlite3*,const char*,int,int,void*,
+                            void (*xStep)(sqlite3_context*,int,sqlite3_value**),
+                            void (*xFinal)(sqlite3_context*),
+                            void (*xValue)(sqlite3_context*),
+                            void (*xInv)(sqlite3_context*,int,sqlite3_value**),
+                            void(*xDestroy)(void*));
+  /* Version 3.26.0 and later */
+  const char *(*normalized_sql)(sqlite3_stmt*);
+  /* Version 3.28.0 and later */
+  int (*stmt_isexplain)(sqlite3_stmt*);
+  int (*value_frombind)(sqlite3_value*);
+  /* Version 3.30.0 and later */
+  int (*drop_modules)(sqlite3*,const char**);
+  /* Version 3.31.0 and later */
+  sqlite3_int64 (*hard_heap_limit64)(sqlite3_int64);
+  const char *(*uri_key)(const char*,int);
+  const char *(*filename_database)(const char*);
+  const char *(*filename_journal)(const char*);
+  const char *(*filename_wal)(const char*);
+  /* Version 3.32.0 and later */
+  char *(*create_filename)(const char*,const char*,const char*,
+                           int,const char**);
+  void (*free_filename)(char*);
+  sqlite3_file *(*database_file_object)(const char*);
+  /* Version 3.34.0 and later */
+  int (*txn_state)(sqlite3*,const char*);
 };
 
+/*
+** This is the function signature used for all extension entry points.  It
+** is also defined in the file "loadext.c".
+*/
+typedef int (*sqlite3_loadext_entry)(
+  sqlite3 *db,                       /* Handle to the database. */
+  char **pzErrMsg,                   /* Used to set error string on failure. */
+  const sqlite3_api_routines *pThunk /* Extension API function pointers. */
+);
+
 /*
 ** The following macros redefine the API routines so that they are
 ** redirected through the global sqlite3_api structure.
@@ -285,7 +360,7 @@ struct sqlite3_api_routines {
 ** the API.  So the redefinition macros are only valid if the
 ** SQLITE_CORE macros is undefined.
 */
-#ifndef SQLITE_CORE
+#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
 #define sqlite3_aggregate_context      sqlite3_api->aggregate_context
 #ifndef SQLITE_OMIT_DEPRECATED
 #define sqlite3_aggregate_count        sqlite3_api->aggregate_count
@@ -388,7 +463,7 @@ struct sqlite3_api_routines {
 #define sqlite3_rollback_hook          sqlite3_api->rollback_hook
 #define sqlite3_set_authorizer         sqlite3_api->set_authorizer
 #define sqlite3_set_auxdata            sqlite3_api->set_auxdata
-#define sqlite3_snprintf               sqlite3_api->snprintf
+#define sqlite3_snprintf               sqlite3_api->xsnprintf
 #define sqlite3_step                   sqlite3_api->step
 #define sqlite3_table_column_metadata  sqlite3_api->table_column_metadata
 #define sqlite3_thread_cleanup         sqlite3_api->thread_cleanup
@@ -412,6 +487,7 @@ struct sqlite3_api_routines {
 #define sqlite3_value_text16le         sqlite3_api->value_text16le
 #define sqlite3_value_type             sqlite3_api->value_type
 #define sqlite3_vmprintf               sqlite3_api->vmprintf
+#define sqlite3_vsnprintf              sqlite3_api->xvsnprintf
 #define sqlite3_overload_function      sqlite3_api->overload_function
 #define sqlite3_prepare_v2             sqlite3_api->prepare_v2
 #define sqlite3_prepare16_v2           sqlite3_api->prepare16_v2
@@ -487,7 +563,7 @@ struct sqlite3_api_routines {
 #define sqlite3_uri_boolean            sqlite3_api->uri_boolean
 #define sqlite3_uri_int64              sqlite3_api->uri_int64
 #define sqlite3_uri_parameter          sqlite3_api->uri_parameter
-#define sqlite3_uri_vsnprintf          sqlite3_api->vsnprintf
+#define sqlite3_uri_vsnprintf          sqlite3_api->xvsnprintf
 #define sqlite3_wal_checkpoint_v2      sqlite3_api->wal_checkpoint_v2
 /* Version 3.8.7 and later */
 #define sqlite3_auto_extension         sqlite3_api->auto_extension
@@ -507,9 +583,69 @@ struct sqlite3_api_routines {
 #define sqlite3_value_free             sqlite3_api->value_free
 #define sqlite3_result_zeroblob64      sqlite3_api->result_zeroblob64
 #define sqlite3_bind_zeroblob64        sqlite3_api->bind_zeroblob64
-#endif /* SQLITE_CORE */
+/* Version 3.9.0 and later */
+#define sqlite3_value_subtype          sqlite3_api->value_subtype
+#define sqlite3_result_subtype         sqlite3_api->result_subtype
+/* Version 3.10.0 and later */
+#define sqlite3_status64               sqlite3_api->status64
+#define sqlite3_strlike                sqlite3_api->strlike
+#define sqlite3_db_cacheflush          sqlite3_api->db_cacheflush
+/* Version 3.12.0 and later */
+#define sqlite3_system_errno           sqlite3_api->system_errno
+/* Version 3.14.0 and later */
+#define sqlite3_trace_v2               sqlite3_api->trace_v2
+#define sqlite3_expanded_sql           sqlite3_api->expanded_sql
+/* Version 3.18.0 and later */
+#define sqlite3_set_last_insert_rowid  sqlite3_api->set_last_insert_rowid
+/* Version 3.20.0 and later */
+#define sqlite3_prepare_v3             sqlite3_api->prepare_v3
+#define sqlite3_prepare16_v3           sqlite3_api->prepare16_v3
+#define sqlite3_bind_pointer           sqlite3_api->bind_pointer
+#define sqlite3_result_pointer         sqlite3_api->result_pointer
+#define sqlite3_value_pointer          sqlite3_api->value_pointer
+/* Version 3.22.0 and later */
+#define sqlite3_vtab_nochange          sqlite3_api->vtab_nochange
+#define sqlite3_value_nochange         sqlite3_api->value_nochange
+#define sqlite3_vtab_collation         sqlite3_api->vtab_collation
+/* Version 3.24.0 and later */
+#define sqlite3_keyword_count          sqlite3_api->keyword_count
+#define sqlite3_keyword_name           sqlite3_api->keyword_name
+#define sqlite3_keyword_check          sqlite3_api->keyword_check
+#define sqlite3_str_new                sqlite3_api->str_new
+#define sqlite3_str_finish             sqlite3_api->str_finish
+#define sqlite3_str_appendf            sqlite3_api->str_appendf
+#define sqlite3_str_vappendf           sqlite3_api->str_vappendf
+#define sqlite3_str_append             sqlite3_api->str_append
+#define sqlite3_str_appendall          sqlite3_api->str_appendall
+#define sqlite3_str_appendchar         sqlite3_api->str_appendchar
+#define sqlite3_str_reset              sqlite3_api->str_reset
+#define sqlite3_str_errcode            sqlite3_api->str_errcode
+#define sqlite3_str_length             sqlite3_api->str_length
+#define sqlite3_str_value              sqlite3_api->str_value
+/* Version 3.25.0 and later */
+#define sqlite3_create_window_function sqlite3_api->create_window_function
+/* Version 3.26.0 and later */
+#define sqlite3_normalized_sql         sqlite3_api->normalized_sql
+/* Version 3.28.0 and later */
+#define sqlite3_stmt_isexplain         sqlite3_api->stmt_isexplain
+#define sqlite3_value_frombind         sqlite3_api->value_frombind
+/* Version 3.30.0 and later */
+#define sqlite3_drop_modules           sqlite3_api->drop_modules
+/* Version 3.31.0 and later */
+#define sqlite3_hard_heap_limit64      sqlite3_api->hard_heap_limit64
+#define sqlite3_uri_key                sqlite3_api->uri_key
+#define sqlite3_filename_database      sqlite3_api->filename_database
+#define sqlite3_filename_journal       sqlite3_api->filename_journal
+#define sqlite3_filename_wal           sqlite3_api->filename_wal
+/* Version 3.32.0 and later */
+#define sqlite3_create_filename        sqlite3_api->create_filename
+#define sqlite3_free_filename          sqlite3_api->free_filename
+#define sqlite3_database_file_object   sqlite3_api->database_file_object
+/* Version 3.34.0 and later */
+#define sqlite3_txn_state              sqlite3_api->txn_state
+#endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
 
-#ifndef SQLITE_CORE
+#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
   /* This case when the file really is being compiled as a loadable 
   ** extension */
 # define SQLITE_EXTENSION_INIT1     const sqlite3_api_routines *sqlite3_api=0;
@@ -524,4 +660,4 @@ struct sqlite3_api_routines {
 # define SQLITE_EXTENSION_INIT3     /*no-op*/
 #endif
 
-#endif /* _SQLITE3EXT_H_ */
+#endif /* SQLITE3EXT_H */

data/lib/amalgalite/aggregate.rb

@@ -13,6 +13,7 @@ module Amalgalite
   # implementation you must:
   #
   # * implement _initalize_ with 0 arguments
+  # * call super() in your _initialize_ method
   # * set the @arity data member
   # * set the @name data member 
   # * implement _step_ with arity of +@arity+
@@ -25,6 +26,7 @@ module Amalgalite
   #     attr_accessor :words
   #
   #     def initialize
+  #       super
   #       @name = 'unique_word_count'
   #       @arity = 1
   #       @words = Hash.new { |h,k| h[k] = 0 }
@@ -50,6 +52,10 @@ module Amalgalite
     # The arity of the SQL function
     attr_accessor :arity
 
+    def initialize
+      @_exception = nil
+    end
+
     # finalize should return the final value of the aggregate function
     def finalize
       raise NotImplementedError, "Aggregate#finalize must be implemented"

data/lib/amalgalite/csv_table_importer.rb

@@ -22,7 +22,7 @@ module Amalgalite
     def run
       @database.transaction do |db|
         db.prepare( insert_sql ) do |stmt|
-          ::CSV.foreach( @csv_path, @options ) do |row|
+          ::CSV.foreach( @csv_path, **@options ) do |row|
             stmt.execute( row )
           end
         end

data/lib/amalgalite/database.rb

@@ -339,7 +339,6 @@ module Amalgalite
     #
     def clear_taps!
       self.trace_tap = nil
-      self.profile_tap = nil
     end
 
     ##
@@ -393,20 +392,19 @@ module Amalgalite
     #
     #   db.trace_tap = nil
     #
-    # This will unregistere the trace tap
+    # This will unregister the trace tap
     #
     #
     def trace_tap=( tap_obj )
 
       # unregister any previous trace tap
       #
-      unless @trace_tap.nil?
+      if !@trace_tap.nil? then
         @trace_tap.trace( 'unregistered as trace tap' )
         @trace_tap = nil
       end
       return @trace_tap if tap_obj.nil?
 
-
       # wrap the tap if we need to
       #
       if tap_obj.respond_to?( 'trace' ) then
@@ -424,55 +422,6 @@ module Amalgalite
       @trace_tap.trace( 'registered as trace tap' )
     end
 
-
-    ##
-    # call-seq:
-    #   db.profile_tap = obj 
-    #
-    # Register a profile tap.
-    #
-    # Registering a profile tap means that the +obj+ registered will have its
-    # +profile+ method called with an Integer and a String parameter every time
-    # a profile event happens.  The Integer is the number of nanoseconds it took
-    # for the String (SQL) to execute in wall-clock time.
-    #
-    # That is, every time a profile event happens in SQLite the following is
-    # invoked:
-    #
-    #   obj.profile( str, int ) 
-    #
-    # For instance:
-    #
-    #   db.profile_tap = Amalgalite::ProfileTap.new( logger, 'debug' )
-    # 
-    # This will register an instance of ProfileTap, which wraps an logger object.
-    # On each +profile+ event the ProfileTap#profile method will be called
-    # which in turn will call <tt>logger.debug<tt> with a formatted string containing
-    # the String and Integer from the profile event.
-    #
-    #   db.profile_tap = nil
-    #
-    # This will unregister the profile tap
-    #
-    #
-    def profile_tap=( tap_obj )
-
-      # unregister any previous profile tap
-      unless @profile_tap.nil?
-        @profile_tap.profile( 'unregistered as profile tap', 0.0 )
-        @profile_tap = nil
-      end
-      return @profile_tap if tap_obj.nil?
-
-      if tap_obj.respond_to?( 'profile' ) then
-        @profile_tap = tap_obj
-      else
-        raise Amalgalite::Error, "#{tap_obj.class.name} cannot be used to tap.  It has no 'profile' method"
-      end
-      @api.register_profile_tap( @profile_tap )
-      @profile_tap.profile( 'registered as profile tap', 0.0 )
-    end
-
     ##
     # call-seq:
     #   db.type_map = DefaultMap.new

data/lib/amalgalite/profile_tap.rb

@@ -120,8 +120,8 @@ module Amalgalite
     # time information.
     #
     def profile( msg, time )
-      unless sampler = @samplers[msg] 
-        msg = msg.gsub(/\s+/,' ')
+      msg = msg.gsub(/\s+/,' ')
+      unless sampler = @samplers[msg]
         sampler = @samplers[msg] = ProfileSampler.new( msg )
       end
       sampler.sample( time )

data/lib/amalgalite/statement.rb

@@ -347,7 +347,7 @@ module Amalgalite
           # 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
+             not %w[ sqlite_master sqlite_temp_master ].include?( tbl_name ) and is_column_rowid?( tbl_name, col_name ) then
             @rowid_index = idx
           end
 
@@ -363,7 +363,10 @@ module Amalgalite
     # is the column indicated by the Column a 'rowid' column
     #
     def is_column_rowid?( table_name, column_name )
-      column_schema  = @db.schema.tables[table_name].columns[column_name]
+      table_schema = @db.schema.tables[table_name]
+      return false unless table_schema
+
+      column_schema  = table_schema.columns[column_name]
       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

data/lib/amalgalite/taps/io.rb

@@ -9,7 +9,7 @@ require 'stringio'
 module Amalgalite
   module Taps
     #
-    # An IOTap is an easy way to send all top information to andy IO based
+    # An IOTap is an easy way to send all top information to any IO based
     # object.  Both profile and trace tap information can be captured
     # This means you can send the events to STDOUT with:
     #
@@ -20,14 +20,17 @@ module Amalgalite
 
       attr_reader :profile_tap
       attr_reader :io
+      attr_reader :trace_count
 
       def initialize( io )
         @io = io
         @profile_tap = ProfileTap.new( self, 'output_profile_event' )
+        @trace_count = 0
       end
 
       def trace( msg )
-        io.puts msg 
+        @trace_count += 1
+        io.puts msg
       end
 
       # need a profile method, it routes through the profile tap which calls back

data/lib/amalgalite/trace_tap.rb

@@ -19,7 +19,7 @@ module Amalgalite
     attr_reader :delegate_method
 
     def initialize( wrapped_obj, send_to = 'trace' )
-      unless wrapped_obj.respond_to?( send_to ) 
+      unless wrapped_obj.respond_to?( send_to )
         raise Amalgalite::Error, "#{wrapped_obj.class.name} does not respond to #{send_to.to_s} "
       end
 

data/lib/amalgalite/type_maps/default_map.rb

@@ -23,7 +23,7 @@ module Amalgalite::TypeMaps
           'time'      => %w[ timestamp time ],
           'float'     => %w[ double float real numeric decimal ],
           'integer'   => %w[ integer tinyint smallint int int2 int4 int8 bigint serial bigserial ],
-          'string'    => %w[ text char string varchar character ],
+          'string'    => %w[ text char string varchar character json ],
           'boolean'   => %w[ bool boolean ],
           'blob'      => %w[ binary blob ],
         }
@@ -65,7 +65,7 @@ module Amalgalite::TypeMaps
       case obj
       when Float
         ::Amalgalite::SQLite3::Constants::DataType::FLOAT
-      when Fixnum
+      when Integer
         ::Amalgalite::SQLite3::Constants::DataType::INTEGER
       when NilClass
         ::Amalgalite::SQLite3::Constants::DataType::NULL