amalgalite 1.4.0-x86-mingw32 → 1.4.1-x86-mingw32

data/ext/amalgalite/c/sqlite3ext.h

@@ -267,6 +267,11 @@ struct sqlite3_api_routines {
   void (*result_text64)(sqlite3_context*,const char*,sqlite3_uint64,
                          void(*)(void*), unsigned char);
   int (*strglob)(const char*,const char*);
+  /* Version 3.8.11 and later */
+  sqlite3_value *(*value_dup)(const sqlite3_value*);
+  void (*value_free)(sqlite3_value*);
+  int (*result_zeroblob64)(sqlite3_context*,sqlite3_uint64);
+  int (*bind_zeroblob64)(sqlite3_stmt*, int, sqlite3_uint64);
 };
 
 /*
@@ -497,6 +502,11 @@ struct sqlite3_api_routines {
 #define sqlite3_result_blob64          sqlite3_api->result_blob64
 #define sqlite3_result_text64          sqlite3_api->result_text64
 #define sqlite3_strglob                sqlite3_api->strglob
+/* Version 3.8.11 and later */
+#define sqlite3_value_dup              sqlite3_api->value_dup
+#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 */
 
 #ifndef SQLITE_CORE

data/lib/amalgalite/database.rb

@@ -682,9 +682,9 @@ module Amalgalite
 
     ##
     # call-seq:
-    #   db.function( "name", MyDBFunction.new )
-    #   db.function( "my_func", callable )
-    #   db.function( "my_func" ) do |x,y|
+    #   db.define_function( "name", MyDBFunction.new )
+    #   db.define_function( "my_func", callable )
+    #   db.define_function( "my_func" ) do |x,y|
     #     .... 
     #     return result
     #   end
@@ -692,13 +692,13 @@ module Amalgalite
     # register a callback to be exposed as an SQL function.  There are multiple
     # ways to register this function:
     #
-    # 1. db.function( "name" ) { |a| ... }
-    #    * pass +function+ a _name_ and a block.  
-    #    * The SQL function _name_ taking _arity_ parameters will be registered, 
+    # 1. db.define_function( "name" ) { |a| ... }
+    #    * pass +define_function+ a _name_ and a block.
+    #    * The SQL function _name_ taking _arity_ parameters will be registered,
     #      where _arity_ is the _arity_ of the block.
     #    * The return value of the block is the return value of the registred
     #      SQL function
-    # 2. db.function( "name", callable )
+    # 2. db.define_function( "name", callable )
     #    * pass +function+ a _name_ and something that <tt>responds_to?( :to_proc )</tt>
     #    * The SQL function _name_ is registered taking _arity_ parameters is
     #      registered where _arity_ is the _arity_ of +callable.to_proc.call+
@@ -750,7 +750,7 @@ module Amalgalite
       end
 
       to_remove.each do |db_func|
-        @api.remove_function( db_func.name, db_func)
+        @api.remove_function( db_func.name, db_func )
         @functions.delete( db_func.signature )
       end
     end
@@ -770,7 +770,7 @@ module Amalgalite
       db_aggregate = klass
       a = klass.new
       raise AggregateError, "Use only mandatory or arbitrary parameters in an SQL Aggregate, not both" if a.arity < -1
-      raise AggregateError, "Aggregate implementation name '#{a.name}' does not match defined name '#{name}'"if a.name != name
+      raise AggregateError, "Aggregate implementation name '#{a.name}' does not match defined name '#{name}'" if a.name != name
       @api.define_aggregate( name, a.arity, klass )
       @aggregates[a.signature] = db_aggregate
       nil

data/lib/amalgalite/version.rb

@@ -4,5 +4,5 @@
 #++
 
 module Amalgalite
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

data/spec/aggregate_spec.rb

@@ -131,16 +131,20 @@ describe "Aggregate SQL Functions" do
 
   it "handles an error being thrown during initialization in the C extension" do
     class AggregateTest7 < AggregateTest1
-      @@instance_count = 0
+      def self.called?
+        if @called then
+          raise "Initialization error!"
+        else
+          @called = true
+        end
+      end
+
       def initialize
+        super
         @name = "atest7"
         @count = 0
         @arity = -1
-        if @@instance_count > 0 then
-          raise "Initialization error!"
-        else
-          @@instance_count += 1
-        end
+        self.class.called?
       end
     end
     @iso_db.define_aggregate( "atest7", AggregateTest7 )

data/spec/database_spec.rb

@@ -291,8 +291,6 @@ describe Amalgalite::Database do
 
       r = @iso_db.execute( "select rtest1() AS r" )
       r.first['r'].should eql("rtest1 called")
-      #@iso_db.remove_function("rtest1", -1)
-      # the arity of rtest1 is different in 1.9 vs. 1.8 
       @iso_db.remove_function("rtest1")
 
       lambda { @iso_db.execute( "select rtest1() as r" )}.should raise_error( ::Amalgalite::SQLite3::Error, /no such function: rtest1/ )
@@ -344,13 +342,13 @@ describe Amalgalite::Database do
       c = 0
       loop do
         begin
-          db.execute("select count(*) from subcountry")
+          db.execute("select * from subcountry")
           executions += 1
           if not looping_sent then
             control_queue.enq :looping 
             looping_sent = true
           end
-          if c > 20000 then
+          if c > 20_000 then
             break
           end
           c += 1
@@ -369,7 +367,7 @@ describe Amalgalite::Database do
       loop do
         @iso_db.interrupt!
         break unless control_queue.empty?
-        if count > 20000 then
+        if count > 20_000 then
           break
         end
         count += 1

data/spec/sqlite3/version_spec.rb

@@ -7,16 +7,16 @@ 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(3008007)
-    Amalgalite::SQLite3::Version.runtime_version_number.should eql(3008007)
+    Amalgalite::SQLite3::Version.to_i.should eql(3008011)
+    Amalgalite::SQLite3::Version.runtime_version_number.should eql(3008011)
 
     Amalgalite::SQLite3::Version::MAJOR.should eql(3)
     Amalgalite::SQLite3::Version::MINOR.should eql(8)
-    Amalgalite::SQLite3::Version::RELEASE.should eql(7)
+    Amalgalite::SQLite3::Version::RELEASE.should eql(11)
     expect(Amalgalite::SQLite3::Version.to_a.size).to eql(3)
 
-    Amalgalite::SQLite3::Version.compiled_version.should be == "3.8.7.4"
-    Amalgalite::SQLite3::Version.compiled_version_number.should be == 3008007
+    Amalgalite::SQLite3::Version.compiled_version.should be == "3.8.11.1"
+    Amalgalite::SQLite3::Version.compiled_version_number.should be == 3008011
     Amalgalite::SQLite3::Version.compiled_matches_runtime?.should be == true
   end
 end

data/tasks/default.rake

@@ -44,7 +44,7 @@ begin
   end
 
   require 'rspec/core/rake_task'
-  RSpec::Core::RakeTask.new( :spec ) do |t|
+  RSpec::Core::RakeTask.new( :test ) do |t|
     t.ruby_opts    = %w[ -w ]
     t.rspec_opts   = %w[ --color --format documentation ]
   end

metadata

@@ -1,129 +1,128 @@
 --- !ruby/object:Gem::Specification
 name: amalgalite
 version: !ruby/object:Gem::Version
-  version: 1.4.0
-  prerelease: 
+  version: 1.4.1
 platform: x86-mingw32
 authors:
 - Jeremy Hinegardner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arrayfields
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler-dock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: zip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: ! 'Amalgalite embeds the SQLite database engine in a ruby extension.  There
+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
@@ -176,6 +175,11 @@ files:
 - ext/amalgalite/c/sqlite3_options.h
 - ext/amalgalite/c/sqlite3ext.h
 - lib/amalgalite.rb
+- lib/amalgalite/1.8/amalgalite.so
+- lib/amalgalite/1.9/amalgalite.so
+- lib/amalgalite/2.0/amalgalite.so
+- lib/amalgalite/2.1/amalgalite.so
+- lib/amalgalite/2.2/amalgalite.so
 - lib/amalgalite/aggregate.rb
 - lib/amalgalite/blob.rb
 - lib/amalgalite/boolean.rb
@@ -247,37 +251,33 @@ files:
 - tasks/default.rake
 - tasks/extension.rake
 - tasks/this.rb
-- lib/amalgalite/1.9/amalgalite.so
-- lib/amalgalite/2.0/amalgalite.so
-- lib/amalgalite/2.1/amalgalite.so
 homepage: http://github.com/copiousfreetime/amalgalite
 licenses:
 - BSD
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
-- --markup
+- "--markup"
 - tomdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Amalgalite embeds the SQLite database engine in a ruby extension.  There
   is no need to install SQLite separately.
 test_files: