amalgalite 1.6.3 → 1.7.0

data/ext/amalgalite/c/sqlite3ext.h

@@ -319,6 +319,24 @@ 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 */
+  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*);
 };
 
 /*
@@ -608,6 +626,23 @@ 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
 #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

@@ -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/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.7.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(3034000)
+    Amalgalite::SQLite3::Version.runtime_version_number.should eql(3034000)
 
     Amalgalite::SQLite3::Version::MAJOR.should eql(3)
-    Amalgalite::SQLite3::Version::MINOR.should eql(26)
+    Amalgalite::SQLite3::Version::MINOR.should eql(34)
     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.26.0"
-    Amalgalite::SQLite3::Version.compiled_version_number.should be == 3026000
+    Amalgalite::SQLite3::Version.compiled_version.should be == "3.34.0"
+    Amalgalite::SQLite3::Version.compiled_version_number.should be == 3034000
     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 = "2020-12-01 16:14:00 a26b6597e3ae272231b96f9982c3bcc17ddec2f2b6eb4df06a224b91089fed5b"
     Amalgalite::SQLite3::Version.compiled_source_id.should be == source_id
     Amalgalite::SQLite3::Version.runtime_source_id.should be == source_id
   end

data/tasks/extension.rake

@@ -35,4 +35,4 @@ rescue LoadError
 end
 
 CLOBBER << FileList["lib/**/*.{jar,so,bundle}"]
-CLOBBER << FileList["lib/#{This.name}/{1,2}.*/"]
+CLOBBER << FileList["lib/#{This.name}/{1,2,3}.*/"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amalgalite
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.7.0
 platform: ruby
 authors:
 - Jeremy Hinegardner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-19 00:00:00.000000000 Z
+date: 2021-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arrayfields
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -275,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Amalgalite embeds the SQLite database engine in a ruby extension. There is