amalgalite 1.6.3-x64-mingw32 → 1.8.0-x64-mingw32

data/ext/amalgalite/c/sqlite3ext.h

@@ -319,6 +319,46 @@ struct sqlite3_api_routines {
                             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 */
+  const char *(*create_filename)(const char*,const char*,const char*,
+                           int,const char**);
+  void (*free_filename)(const char*);
+  sqlite3_file *(*database_file_object)(const char*);
+  /* Version 3.34.0 and later */
+  int (*txn_state)(sqlite3*,const char*);
+  /* Version 3.36.1 and later */
+  sqlite3_int64 (*changes64)(sqlite3*);
+  sqlite3_int64 (*total_changes64)(sqlite3*);
+  /* Version 3.37.0 and later */
+  int (*autovacuum_pages)(sqlite3*,
+     unsigned int(*)(void*,const char*,unsigned int,unsigned int,unsigned int),
+     void*, void(*)(void*));
+  /* Version 3.38.0 and later */
+  int (*error_offset)(sqlite3*);
+  int (*vtab_rhs_value)(sqlite3_index_info*,int,sqlite3_value**);
+  int (*vtab_distinct)(sqlite3_index_info*);
+  int (*vtab_in)(sqlite3_index_info*,int,int);
+  int (*vtab_in_first)(sqlite3_value*,sqlite3_value**);
+  int (*vtab_in_next)(sqlite3_value*,sqlite3_value**);
+  /* Version 3.39.0 and later */
+  int (*deserialize)(sqlite3*,const char*,unsigned char*,
+                     sqlite3_int64,sqlite3_int64,unsigned);
+  unsigned char *(*serialize)(sqlite3*,const char *,sqlite3_int64*,
+                              unsigned int);
+  const char *(*db_name)(sqlite3*,int);
+  /* Version 3.40.0 and later */
+  int (*value_encoding)(sqlite3_value*);
 };
 
 /*
@@ -608,6 +648,43 @@ typedef int (*sqlite3_loadext_entry)(
 #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
+/* Version 3.36.1 and later */
+#define sqlite3_changes64              sqlite3_api->changes64
+#define sqlite3_total_changes64        sqlite3_api->total_changes64
+/* Version 3.37.0 and later */
+#define sqlite3_autovacuum_pages       sqlite3_api->autovacuum_pages
+/* Version 3.38.0 and later */
+#define sqlite3_error_offset           sqlite3_api->error_offset
+#define sqlite3_vtab_rhs_value         sqlite3_api->vtab_rhs_value
+#define sqlite3_vtab_distinct          sqlite3_api->vtab_distinct
+#define sqlite3_vtab_in                sqlite3_api->vtab_in
+#define sqlite3_vtab_in_first          sqlite3_api->vtab_in_first
+#define sqlite3_vtab_in_next           sqlite3_api->vtab_in_next
+/* Version 3.39.0 and later */
+#ifndef SQLITE_OMIT_DESERIALIZE
+#define sqlite3_deserialize            sqlite3_api->deserialize
+#define sqlite3_serialize              sqlite3_api->serialize
+#endif
+#define sqlite3_db_name                sqlite3_api->db_name
+/* Version 3.40.0 and later */
+#define sqlite3_value_encoding         sqlite3_api->value_encoding
 #endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
 
 #if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)

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

@@ -15,14 +15,15 @@ module Amalgalite
       @database   = database
       @table_name = table_name
       @table      = @database.schema.tables[@table_name]
-      @options    = options
+      @options    = options.dup
+      @encoding   = options.delete("encoding") || "UTF-8"
       validate
     end
 
     def run
       @database.transaction do |db|
         db.prepare( insert_sql ) do |stmt|
-          ::CSV.foreach( @csv_path, @options ) do |row|
+          ::CSV.foreach( @csv_path, "r:#{@encoding}", **@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/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/version.rb

@@ -4,5 +4,5 @@
 #++
 
 module Amalgalite
-  VERSION = "1.6.3"
+  VERSION = "1.8.0"
 end

data/spec/aggregate_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 class AggregateTest1 < ::Amalgalite::Aggregate
   def initialize
+    super
     @name = 'atest1'
     @arity = -1
     @count = 0
@@ -96,6 +97,7 @@ describe "Aggregate SQL Functions" do
   it "handles an error being thrown during the step function" do
     class AggregateTest5 < AggregateTest1
       def initialize
+        super
         @name = "atest5"
         @arity = -1
         @count = 0
@@ -117,6 +119,7 @@ describe "Aggregate SQL Functions" do
   it "handles an error being thrown during the finalize function" do
     class AggregateTest6 < AggregateTest1
       def initialize
+        super
         @name = "atest6"
         @count = 0
         @arity = -1
@@ -131,6 +134,7 @@ describe "Aggregate SQL Functions" do
 
   it "handles an error being thrown during initialization in the C extension" do
     class AggregateTest7 < AggregateTest1
+      @called = false
       def self.called?
         if @called then
           raise "Initialization error!"

data/spec/database_spec.rb

@@ -119,9 +119,13 @@ describe Amalgalite::Database do
     sql = "CREATE TABLE trace_test( x, y, z)"
     s = db.trace_tap = ::Amalgalite::Taps::StringIO.new
     db.execute( sql )
-    db.trace_tap.string.should eql("registered as trace tap\n#{sql}\n")
+    escaped_sql= Regexp.quote(sql)
+    db.trace_tap.string.should match(/registered as trace tap/)
+    db.trace_tap.string.should match(/#{escaped_sql}/)
+    s.trace_count.should eql(2)
     db.trace_tap = nil
-    s.string.should eql("registered as trace tap\n#{sql}\nunregistered as trace tap\n")
+    s.trace_count.should eql(3)
+    s.string.should match(/unregistered as trace tap/)
   end
 
   it "raises an exception if the wrong type of object is used for tracing" do
@@ -129,18 +133,13 @@ describe Amalgalite::Database do
     lambda { db.trace_tap = Object.new }.should raise_error(Amalgalite::Error)
   end
 
-  it "raises an exception if the wrong type of object is used for profile" do
-    db = Amalgalite::Database.new( SpecInfo.test_db )
-    lambda { db.profile_tap = Object.new }.should raise_error(Amalgalite::Error)
-  end
-
   it "profiles the execution of code" do
     db = Amalgalite::Database.new( SpecInfo.test_db )
-    s = db.profile_tap = ::Amalgalite::Taps::StringIO.new
+    s = db.trace_tap = ::Amalgalite::Taps::StringIO.new
     db.execute_batch( @schema )
-    db.profile_tap.samplers.size.should eql(6)
-    db.profile_tap = nil
-    s.string.should =~ /unregistered as profile tap/m
+    db.trace_tap.samplers.size.should eql(5)
+    db.trace_tap = nil
+    s.string.should =~ /unregistered as trace tap/
   end
 
   it "#execute yields each row when called with a block" do
@@ -167,13 +166,11 @@ describe Amalgalite::Database do
 
   it "can clear all registered taps" do
     db = Amalgalite::Database.new( SpecInfo.test_db )
-    s = db.profile_tap = ::Amalgalite::Taps::StringIO.new
-    db.trace_tap = s
+    s = db.trace_tap = ::Amalgalite::Taps::StringIO.new
     db.execute_batch( @schema )
-    db.profile_tap.samplers.size.should eql(6)
+    db.trace_tap.samplers.size.should eql(5)
     db.clear_taps!
     s.string.should =~ /unregistered as trace tap/m
-    s.string.should =~ /unregistered as profile tap/m
   end
 
   it "allows nested transactions even if SQLite under the covers does not" do

data/spec/sqlite3/version_spec.rb

@@ -7,21 +7,21 @@ describe "Amalgalite::SQLite3::Version" do
     expect(Amalgalite::SQLite3::Version.to_s).to match( /\d+\.\d+\.\d+/ )
     expect(Amalgalite::SQLite3::Version.runtime_version).to match( /\d+\.\d+\.\d+/ )
 
-    Amalgalite::SQLite3::Version.to_i.should eql(3026000)
-    Amalgalite::SQLite3::Version.runtime_version_number.should eql(3026000)
+    Amalgalite::SQLite3::Version.to_i.should eql(3040001)
+    Amalgalite::SQLite3::Version.runtime_version_number.should eql(3040001)
 
     Amalgalite::SQLite3::Version::MAJOR.should eql(3)
-    Amalgalite::SQLite3::Version::MINOR.should eql(26)
-    Amalgalite::SQLite3::Version::RELEASE.should eql(0)
+    Amalgalite::SQLite3::Version::MINOR.should eql(40)
+    Amalgalite::SQLite3::Version::RELEASE.should eql(1)
     expect(Amalgalite::SQLite3::Version.to_a.size).to eql(3)
 
-    Amalgalite::SQLite3::Version.compiled_version.should be == "3.26.0"
-    Amalgalite::SQLite3::Version.compiled_version_number.should be == 3026000
+    Amalgalite::SQLite3::Version.compiled_version.should be == "3.40.1"
+    Amalgalite::SQLite3::Version.compiled_version_number.should be == 3040001
     Amalgalite::SQLite3::Version.compiled_matches_runtime?.should be == true
   end
 
   it "should have the sqlite3 source id" do
-    source_id = "2018-12-01 12:34:55 bf8c1b2b7a5960c282e543b9c293686dccff272512d08865f4600fb58238b4f9"
+    source_id = "2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24"
     Amalgalite::SQLite3::Version.compiled_source_id.should be == source_id
     Amalgalite::SQLite3::Version.runtime_source_id.should be == source_id
   end

data/tasks/custom.rake

@@ -63,7 +63,7 @@ namespace :util do
 
     require 'uri'
     require 'open-uri'
-    require 'zip'
+    require 'archive/zip'
 
     parts = version.split(".")
     next_version = [ parts.shift.to_s ]
@@ -79,22 +79,21 @@ namespace :util do
     file = "tmp/#{File.basename( url.path ) }"
     FileUtils.mkdir "tmp" unless File.directory?( "tmp" )
     File.open( file, "wb+") do |f|
-      open(url) do |input|
+      url.open do |input|
         f.write( input.read )
       end
     end
 
     puts "extracting..."
     upstream_files = %w[ sqlite3.h sqlite3.c sqlite3ext.h ]
-    Zip::ZipInputStream.open( file ) do |io|
-      loop do
-        entry = io.get_next_entry
-        break unless entry
-        bname = File.basename( entry.name )
+    Archive::Zip.open( file ) do |archive|
+      archive.each do |entry|
+        next unless entry.file?
+        bname = File.basename( entry.zip_path)
         if upstream_files.include?( bname ) then
           dest_file = File.join( "ext", "amalgalite", "c", bname )
           puts "updating #{dest_file}"
-          entry.extract( dest_file ) { true }
+          entry.extract(file_path: dest_file)
         end
       end
     end

data/tasks/default.rake

@@ -39,7 +39,11 @@ begin
   require 'rspec/core/rake_task'
   RSpec::Core::RakeTask.new( :test ) do |t|
     t.ruby_opts    = %w[ -w ]
-    t.rspec_opts   = %w[ --color --format documentation ]
+    t.rspec_opts   = %w[
+      --color
+      --format documentation
+      --format RspecJunitFormatter --out tmp/report.xml
+    ]
   end
   task :test_requirements
   task :test => :test_requirements
@@ -157,7 +161,7 @@ namespace :fixme do
   end
 
   desc "See if the fixme tools are outdated"
-  task :outdated => :release_check do
+  task :outdated do
     if fixme_up_to_date? then
       puts "Fixme files are up to date."
     else
@@ -168,7 +172,7 @@ namespace :fixme do
   end
 
   desc "Update outdated fixme files"
-  task :update => :release_check do
+  task :update do
     if fixme_up_to_date? then
       puts "Fixme files are already up to date."
     else
@@ -199,7 +203,7 @@ task :gemspec do
 end
 
 # .rbc files from ruby 2.0
-CLOBBER << FileList["**/*.rbc"]
+CLOBBER << "**/*.rbc"
 
 # The standard gem packaging task, everyone has it.
 require 'rubygems/package_task'
@@ -211,19 +215,19 @@ end
 # Release - the steps we go through to do a final release, this is pulled from
 #           a compbination of mojombo's rakegem, hoe and hoe-git
 #
-# 1) make sure we are on the master branch
+# 1) make sure we are on the main branch
 # 2) make sure there are no uncommitted items
 # 3) check the manifest and make sure all looks good
 # 4) build the gem
 # 5) do an empty commit to have the commit message of the version
 # 6) tag that commit as the version
-# 7) push master
+# 7) push main
 # 8) push the tag
 # 7) pus the gem
 #------------------------------------------------------------------------------
 task :release_check do
-  unless `git branch` =~ /^\* master$/
-    abort "You must be on the master branch to release!"
+  unless `git branch` =~ /^\* main/
+    abort "You must be on the main branch to release!"
   end
   unless `git status` =~ /^nothing to commit/m
     abort "Nope, sorry, you have unfinished business"
@@ -234,7 +238,7 @@ desc "Create tag v#{This.version}, build and push #{This.platform_gemspec.full_n
 task :release => [ :release_check, 'manifest:check', :gem ] do
   sh "git commit --allow-empty -a -m 'Release #{This.version}'"
   sh "git tag -a -m 'v#{This.version}' v#{This.version}"
-  sh "git push origin master"
+  sh "git push origin main"
   sh "git push origin v#{This.version}"
   sh "gem push pkg/#{This.platform_gemspec.full_name}.gem"
 end

data/tasks/extension.rake

@@ -6,27 +6,17 @@
 # in your top level rakefile
 begin
   require 'rake/extensiontask'
-  require 'rake/javaextensiontask'
+  Rake::ExtensionTask.new( This.name ) do |ext|
+    ext.ext_dir   = File.join( 'ext', This.name, "c" )
+    ext.lib_dir   = File.join( 'lib', This.name )
+    ext.gem_spec  = This.ruby_gemspec
 
-  if RUBY_PLATFORM == "java" then
-
-    Rake::JavaExtensionTask.new( This.name) do |ext|
-      ext.ext_dir  = File.join( 'ext', This.name, "java" )
-      ext.lib_dir  = File.join( 'lib', This.name )
-      ext.gem_spec = This.java_gemspec
-    end
-
-  else
-
-    Rake::ExtensionTask.new( This.name ) do |ext|
-      ext.ext_dir   = File.join( 'ext', This.name, "c" )
-      ext.lib_dir   = File.join( 'lib', This.name )
-      ext.gem_spec  = This.ruby_gemspec
-
-      ext.cross_compile  = true                         # enable cross compilation (requires cross compile toolchain)
-      ext.cross_platform = %w[x86-mingw32 x64-mingw32]  # forces the Windows platform instead of the default one
-                                                        # configure options only for cross compile
-    end
+    ext.cross_compile  = true  # enable cross compilation (requires cross compile toolchain)
+    ext.cross_platform = %w[
+      x86-mingw32
+      x64-mingw-ucrt
+      x64-mingw32
+    ]
   end
 
   task :test_requirements => :compile
@@ -34,5 +24,5 @@ rescue LoadError
   This.task_warning( 'extension' )
 end
 
-CLOBBER << FileList["lib/**/*.{jar,so,bundle}"]
-CLOBBER << FileList["lib/#{This.name}/{1,2}.*/"]
+CLOBBER << "lib/**/*.{jar,so,bundle}"
+CLOBBER << "lib/#{This.name}/{1,2,3}.*/"

data/tasks/this.rb

@@ -25,10 +25,10 @@ class ThisProject
   #
   # Yields self
   def initialize(&block)
-    @exclude_from_manifest = Regexp.union(/\.(git|DS_Store|ruby-version)/,
-                                          /^(doc|coverage|pkg|tmp|.semaphore|Gemfile(\.lock)?)/,
+    @exclude_from_manifest = Regexp.union(/\.(git|DS_Store|semaphore)/,
+                                          /^(doc|coverage|pkg|tmp|Gemfile(\.lock)?)/,
                                           /^[^\/]+\.gemspec/,
-                                          /\.(swp|jar|bundle|so|rvmrc|travis.yml|byebug_history)$/,
+                                          /\.(swp|jar|bundle|so|rvmrc|travis.yml|byebug_history|fossa.yml|ruby-version)$/,
                                           /~$/)
     @gemspecs              = Hash.new
     yield self if block_given?
@@ -135,7 +135,7 @@ class ThisProject
       spec.homepage    = homepage
 
       spec.summary     = summary
-      spec.description = description
+      spec.description = summary
       spec.license     = license
 
       spec.files       = manifest
@@ -185,7 +185,7 @@ class ThisProject
 
   # Internal: Return the summary text from the README
   def summary
-    description_section.first
+    description_section.first.gsub(/\s+/, ' ')
   end
 
   # Internal: Return the full description text from the README