amalgalite 1.7.0 → 1.9.0

data/ext/amalgalite/c/sqlite3ext.h

@@ -331,12 +331,36 @@ struct sqlite3_api_routines {
   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*,
+  const char *(*create_filename)(const char*,const char*,const char*,
                            int,const char**);
-  void (*free_filename)(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*);
+  /* Version 3.41.0 and later */
+  int (*is_interrupted)(sqlite3*);
 };
 
 /*
@@ -643,6 +667,28 @@ typedef int (*sqlite3_loadext_entry)(
 #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
+/* Version 3.41.0 and later */
+#define sqlite3_is_interrupted         sqlite3_api->is_interrupted
 #endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
 
 #if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)

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/sqlite3/version.rb

@@ -10,13 +10,13 @@ module Amalgalite
 
       # major version number of the SQLite C library
       MAJOR   = (to_i / 1_000_000).freeze
-      
+
       # minor version number of the SQLite C library
       MINOR   = ((to_i % 1_000_000) / 1_000).freeze
-      
+
       # release version number of the SQLite C library
       RELEASE = (to_i % 1_000).freeze
-   
+
       #
       # call-seq:
       #   Amalgalite::SQLite3::Version.to_a -> [ MAJOR, MINOR, RELEASE ]

data/lib/amalgalite/version.rb

@@ -4,5 +4,5 @@
 #++
 
 module Amalgalite
-  VERSION = "1.7.0"
+  VERSION = "1.9.0"
 end

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(3034000)
-    Amalgalite::SQLite3::Version.runtime_version_number.should eql(3034000)
+    Amalgalite::SQLite3::Version.to_i.should eql(3041002)
+    Amalgalite::SQLite3::Version.runtime_version_number.should eql(3041002)
 
     Amalgalite::SQLite3::Version::MAJOR.should eql(3)
-    Amalgalite::SQLite3::Version::MINOR.should eql(34)
-    Amalgalite::SQLite3::Version::RELEASE.should eql(0)
+    Amalgalite::SQLite3::Version::MINOR.should eql(41)
+    Amalgalite::SQLite3::Version::RELEASE.should eql(2)
     expect(Amalgalite::SQLite3::Version.to_a.size).to eql(3)
 
-    Amalgalite::SQLite3::Version.compiled_version.should be == "3.34.0"
-    Amalgalite::SQLite3::Version.compiled_version_number.should be == 3034000
+    Amalgalite::SQLite3::Version.compiled_version.should be == "3.41.2"
+    Amalgalite::SQLite3::Version.compiled_version_number.should be == 3041002
     Amalgalite::SQLite3::Version.compiled_matches_runtime?.should be == true
   end
 
   it "should have the sqlite3 source id" do
-    source_id = "2020-12-01 16:14:00 a26b6597e3ae272231b96f9982c3bcc17ddec2f2b6eb4df06a224b91089fed5b"
+    source_id = "2023-03-22 11:56:21 0d1fc92f94cb6b76bffe3ec34d69cffde2924203304e8ffc4155597af0c191da"
     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

@@ -37,9 +37,20 @@ task :develop => "develop:default"
 #------------------------------------------------------------------------------
 begin
   require 'rspec/core/rake_task'
+  junit_output = ENV.fetch('TEST_RESULTS_FILE', 'tmp/report.xml')
   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
+    ]
+
+    if junit_output = ENV['TEST_RESULTS_FILE'] then
+      t.rspec_opts << '--format'
+      t.rspec_opts << 'RspecJunitFormatter'
+      t.rspec_opts << '--out'
+      t.rspec_opts << junit_output
+    end
   end
   task :test_requirements
   task :test => :test_requirements
@@ -141,14 +152,20 @@ namespace :fixme do
   end
 
   def local_fixme_files
-    This.manifest.select { |p| p =~ %r|^tasks/| }
+    local_files = This.manifest.select { |p| p =~ %r|^tasks/| }
+    local_files << ".semaphore/semaphore.yml"
   end
 
   def outdated_fixme_files
     local_fixme_files.select do |local|
       upstream     = fixme_project_path( local )
-      upstream.exist? &&
-        ( Digest::SHA256.file( local ) != Digest::SHA256.file( upstream ) )
+      if upstream.exist? then
+        if File.exist?( local ) then
+          ( Digest::SHA256.file( local ) != Digest::SHA256.file( upstream ) )
+        else
+          true
+        end
+      end
     end
   end
 
@@ -157,7 +174,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 +185,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 +216,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 +228,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 +251,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,3}.*/"]
+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
@@ -146,7 +146,7 @@ class ThisProject
       spec.rdoc_options = [ "--main"  , 'README.md',
                             "--markup", "tomdoc" ]
 
-      spec.required_ruby_version = '>= 2.2.2'
+      spec.required_ruby_version = '>= 2.3.0'
     end
   end
 
@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amalgalite
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Jeremy Hinegardner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-13 00:00:00.000000000 Z
+date: 2023-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arrayfields
@@ -30,14 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,80 +72,72 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.5'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
-  name: zip
+  name: archive-zip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-description: 'Amalgalite embeds the SQLite database engine in a ruby extension. There
-  is no need to install SQLite separately. Look in the examples/ directory to see
-  * general usage * blob io * schema information * custom functions * custom aggregates
-  * requiring ruby code from a database * full text search Also Scroll through Amalgalite::Database
-  for a quick example, and a general overview of the API. Amalgalite adds in the following
-  additional non-default SQLite extensions: * (http://sqlite.org/rtree.html) * (http://sqlite.org/fts5.html)
-  - both fts3 and fts5 * (https://www.sqlite.org/geopoly.html) * (https://www.sqlite.org/json1.html)
-  Other extensions are add that might not be usable/visible by users of the gem. The
-  full list of extensions added is in (ext/amalgalite/c/extconf.rb). And those may
-  be cross referenced against the (https://www.sqlite.org/compile.html)'
+        version: '0.12'
+description: Amalgalite embeds the SQLite database engine as a ruby extension. There
+  is no need to install SQLite separately.
 email: jeremy@copiousfreetime.org
 executables:
 - amalgalite-pack
@@ -254,9 +260,9 @@ files:
 - tasks/this.rb
 homepage: http://github.com/copiousfreetime/amalgalite
 licenses:
-- BSD
+- BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -268,17 +274,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
-summary: Amalgalite embeds the SQLite database engine in a ruby extension. There is
+summary: Amalgalite embeds the SQLite database engine as a ruby extension. There is
   no need to install SQLite separately.
 test_files:
 - spec/aggregate_spec.rb