amalgalite 1.5.0 → 1.6.0

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));
@@ -275,8 +273,37 @@ struct sqlite3_api_routines {
   /* 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*);
 };
 
+/*
+** 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.
@@ -391,7 +418,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
@@ -415,7 +442,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->vsnprintf
+#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
@@ -491,7 +518,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
@@ -514,6 +541,23 @@ struct sqlite3_api_routines {
 /* 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
 #endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
 
 #if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
@@ -531,4 +575,4 @@ struct sqlite3_api_routines {
 # define SQLITE_EXTENSION_INIT3     /*no-op*/
 #endif
 
-#endif /* _SQLITE3EXT_H_ */
+#endif /* SQLITE3EXT_H */

data/lib/amalgalite/type_maps/default_map.rb

@@ -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

data/lib/amalgalite/type_maps/storage_map.rb

@@ -17,7 +17,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

data/lib/amalgalite/version.rb

@@ -4,5 +4,5 @@
 #++
 
 module Amalgalite
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

data/spec/default_map_spec.rb

@@ -12,7 +12,7 @@ describe Amalgalite::TypeMaps::DefaultMap do
       @map.bind_type_of( 3.14 ).should == ::Amalgalite::SQLite3::Constants::DataType::FLOAT
     end
 
-    it "Fixnum is bound to DataType::INTGER" do
+    it "Integer is bound to DataType::INTGER" do
       @map.bind_type_of( 42 ).should == ::Amalgalite::SQLite3::Constants::DataType::INTEGER
     end
 

data/spec/integeration_spec.rb

@@ -25,7 +25,7 @@ describe "Integration specifications" do
       "datetime"  => { :value => DateTime.now, :klass => DateTime }, 
       "timestamp" => { :value => Time.now, :klass => Time   } ,
       "date"      => { :value => Date.today, :klass => Date },
-      "integer"   => { :value => 42, :klass => Fixnum } ,
+      "integer"   => { :value => 42, :klass => Integer },
       "double"    => { :value => 3.14, :klass => Float },
       "varchar"   => { :value => "foobarbaz", :klass => String },
       "boolean"   => { :value => true, :klass => TrueClass },
@@ -36,7 +36,7 @@ describe "Integration specifications" do
         db.execute "CREATE TABLE t( c #{sql_type} )"
         db.execute "insert into t (c) values ( ? )", ruby_info[:value]
         rows = db.execute "select * from t"
-        rows.first['c'].class.should eql(ruby_info[:klass])
+        rows.first['c'].should be_kind_of(ruby_info[:klass])
 
         if [ DateTime, Time ].include?( ruby_info[:klass] ) then
           rows.first['c'].strftime("%Y-%m-%d %H:%M:%S").should eql(ruby_info[:value].strftime("%Y-%m-%d %H:%M:%S"))

data/spec/sqlite3/version_spec.rb

@@ -3,20 +3,26 @@ require 'amalgalite/sqlite3/version'
 
 describe "Amalgalite::SQLite3::Version" do
   it "should have the sqlite3 version" do
-    expect(Amalgalite::SQLite3::VERSION).to match(/\d\.\d\.\d/)
-    expect(Amalgalite::SQLite3::Version.to_s).to match( /\d\.\d\.\d/ )
-    expect(Amalgalite::SQLite3::Version.runtime_version).to match( /\d\.\d\.\d/ )
+    expect(Amalgalite::SQLite3::VERSION).to match(/\d+\.\d+\.\d+/)
+    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(3009002)
-    Amalgalite::SQLite3::Version.runtime_version_number.should eql(3009002)
+    Amalgalite::SQLite3::Version.to_i.should eql(3021000)
+    Amalgalite::SQLite3::Version.runtime_version_number.should eql(3021000)
 
     Amalgalite::SQLite3::Version::MAJOR.should eql(3)
-    Amalgalite::SQLite3::Version::MINOR.should eql(9)
-    Amalgalite::SQLite3::Version::RELEASE.should eql(2)
+    Amalgalite::SQLite3::Version::MINOR.should eql(21)
+    Amalgalite::SQLite3::Version::RELEASE.should eql(0)
     expect(Amalgalite::SQLite3::Version.to_a.size).to eql(3)
 
-    Amalgalite::SQLite3::Version.compiled_version.should be == "3.9.2"
-    Amalgalite::SQLite3::Version.compiled_version_number.should be == 3009002
+    Amalgalite::SQLite3::Version.compiled_version.should be == "3.21.0"
+    Amalgalite::SQLite3::Version.compiled_version_number.should be == 3021000
     Amalgalite::SQLite3::Version.compiled_matches_runtime?.should be == true
   end
+
+  it "should have the sqlite3 source id" do
+    source_id = "2017-10-24 18:55:49 1a584e499906b5c87ec7d43d4abce641fdf017c42125b083109bc77c4de48827"
+    Amalgalite::SQLite3::Version.compiled_source_id.should be == source_id
+    Amalgalite::SQLite3::Version.runtime_source_id.should be == source_id
+  end
 end

data/spec/storage_map_spec.rb

@@ -12,7 +12,7 @@ describe Amalgalite::TypeMaps::StorageMap do
       @map.bind_type_of( 3.14 ).should == ::Amalgalite::SQLite3::Constants::DataType::FLOAT
     end
 
-    it "Fixnum is bound to DataType::INTGER" do
+    it "Integer is bound to DataType::INTGER" do
       @map.bind_type_of( 42 ).should == ::Amalgalite::SQLite3::Constants::DataType::INTEGER
     end
 

data/tasks/default.rake

@@ -24,25 +24,18 @@ namespace :develop do
     File.open( "Gemfile", "w+" ) do |f|
       f.puts "# DO NOT EDIT - This file is automatically generated"
       f.puts "# Make changes to Manifest.txt and/or Rakefile and regenerate"
-      f.puts 'source "https://rubygems.org/"'
+      f.puts 'source "https://rubygems.org"'
       f.puts 'gemspec'
     end
   end
 end
-desc "Boostrap development"
+desc "Bootstrap development"
 task :develop => "develop:default"
 
 #------------------------------------------------------------------------------
-# Minitest - standard TestTask
+# RSpec - standard TestTask
 #------------------------------------------------------------------------------
 begin
-  require 'rake/testtask'
-  Rake::TestTask.new( :test ) do |t|
-    t.ruby_opts    = %w[ -w -rubygems ]
-    t.libs         = %w[ lib spec test ]
-    t.pattern      = "{test,spec}/**/{test_*,*_spec}.rb"
-  end
-
   require 'rspec/core/rake_task'
   RSpec::Core::RakeTask.new( :test ) do |t|
     t.ruby_opts    = %w[ -w ]

data/tasks/extension.rake

@@ -23,9 +23,9 @@ begin
       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 = 'i386-mingw32'     # forces the Windows platform instead of the default one
-                                              # configure options only for cross compile
+      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
   end
 
@@ -35,4 +35,4 @@ rescue LoadError
 end
 
 CLOBBER << FileList["lib/**/*.{jar,so,bundle}"]
-CLOBBER << FileList["lib/#{This.name}/{1.8,1.9,2.0,2.1,2.2}/"]
+CLOBBER << FileList["lib/#{This.name}/{1,2}.*/"]

data/tasks/this.rb

@@ -194,7 +194,9 @@ class ThisProject
   end
 
   def license
-    "ISC"
+    license_file = project_path("LICENSE")
+    line = license_file.readlines.first
+    line.split(/\s+/).first
   end
 
   # Internal: The path to the gemspec file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amalgalite
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Jeremy Hinegardner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arrayfields
@@ -44,70 +44,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: zip
   requirement: !ruby/object:Gem::Requirement
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Amalgalite embeds the SQLite database engine in a ruby extension.  There