sqlite3 1.3.13 → 1.4.2

data/test/test_integration_aggregate.rb

@@ -0,0 +1,336 @@
+require 'helper'
+
+class TC_Integration_Aggregate < SQLite3::TestCase
+  def setup
+    @db = SQLite3::Database.new(":memory:")
+    @db.transaction do
+      @db.execute "create table foo ( a integer primary key, b text, c integer )"
+      @db.execute "insert into foo ( b, c ) values ( 'foo', 10 )"
+      @db.execute "insert into foo ( b, c ) values ( 'bar', 11 )"
+      @db.execute "insert into foo ( b, c ) values ( 'bar', 12 )"
+    end
+  end
+
+  def teardown
+    @db.close
+  end
+
+  def test_create_aggregate_without_block
+    step = proc do |ctx,a|
+      ctx[:sum] ||= 0
+      ctx[:sum] += a.to_i
+    end
+
+    final = proc { |ctx| ctx.result = ctx[:sum] }
+
+    @db.create_aggregate( "accumulate", 1, step, final )
+
+    value = @db.get_first_value( "select accumulate(a) from foo" )
+    assert_equal 6, value
+
+    # calling #get_first_value twice don't add up to the latest result
+    value = @db.get_first_value( "select accumulate(a) from foo" )
+    assert_equal 6, value
+  end
+
+  def test_create_aggregate_with_block
+    @db.create_aggregate( "accumulate", 1 ) do
+      step do |ctx,a|
+        ctx[:sum] ||= 0
+        ctx[:sum] += a.to_i
+      end
+
+      finalize { |ctx| ctx.result = ctx[:sum] }
+    end
+
+    value = @db.get_first_value( "select accumulate(a) from foo" )
+    assert_equal 6, value
+  end
+
+  def test_create_aggregate_with_group_by
+    @db.create_aggregate( "accumulate", 1 ) do
+      step do |ctx,a|
+        ctx[:sum] ||= 0
+        ctx[:sum] += a.to_i
+      end
+
+      finalize { |ctx| ctx.result = ctx[:sum] }
+    end
+
+    values = @db.execute( "select b, accumulate(c) from foo group by b order by b" )
+    assert_equal "bar", values[0][0]
+    assert_equal 23, values[0][1]
+    assert_equal "foo", values[1][0]
+    assert_equal 10, values[1][1]
+  end
+
+  def test_create_aggregate_with_the_same_function_twice_in_a_query
+    @db.create_aggregate( "accumulate", 1 ) do
+      step do |ctx,a|
+        ctx[:sum] ||= 0
+        ctx[:sum] += a.to_i
+      end
+
+      finalize { |ctx| ctx.result = ctx[:sum] }
+    end
+
+    values = @db.get_first_row( "select accumulate(a), accumulate(c) from foo" )
+    assert_equal 6, values[0]
+    assert_equal 33, values[1]
+  end
+
+  def test_create_aggregate_with_two_different_functions
+    @db.create_aggregate( "accumulate", 1 ) do
+      step do |ctx,a|
+        ctx[:sum] ||= 0
+        ctx[:sum] += a.to_i
+      end
+
+      finalize { |ctx| ctx.result = ctx[:sum] }
+    end
+
+    @db.create_aggregate( "multiply", 1 ) do
+      step do |ctx,a|
+        ctx[:sum] ||= 1
+        ctx[:sum] *= a.to_i
+      end
+
+      finalize { |ctx| ctx.result = ctx[:sum] }
+    end
+
+    GC.start
+    
+    values = @db.get_first_row( "select accumulate(a), multiply(c) from foo" )
+    assert_equal 6, values[0]
+    assert_equal 1320, values[1]
+
+    value = @db.get_first_value( "select accumulate(c) from foo")
+    assert_equal 33, value
+
+    value = @db.get_first_value( "select multiply(a) from foo")
+    assert_equal 6, value
+  end
+
+  def test_create_aggregate_overwrite_function
+    @db.create_aggregate( "accumulate", 1 ) do
+      step do |ctx,a|
+        ctx[:sum] ||= 0
+        ctx[:sum] += a.to_i
+      end
+
+      finalize { |ctx| ctx.result = ctx[:sum] }
+    end
+
+    value = @db.get_first_value( "select accumulate(c) from foo")
+    assert_equal 33, value
+
+    GC.start
+
+    @db.create_aggregate( "accumulate", 1 ) do
+      step do |ctx,a|
+        ctx[:sum] ||= 1
+        ctx[:sum] *= a.to_i
+      end
+
+      finalize { |ctx| ctx.result = ctx[:sum] }
+    end
+
+    value = @db.get_first_value( "select accumulate(c) from foo")
+    assert_equal 1320, value
+  end
+
+  def test_create_aggregate_overwrite_function_with_different_arity
+    @db.create_aggregate( "accumulate", -1 ) do
+      step do |ctx,*args|
+        ctx[:sum] ||= 0
+        args.each { |a| ctx[:sum] += a.to_i }
+      end
+
+      finalize { |ctx| ctx.result = ctx[:sum] }
+    end
+
+    @db.create_aggregate( "accumulate", 2 ) do
+      step do |ctx,a,b|
+        ctx[:sum] ||= 1
+        ctx[:sum] *= (a.to_i + b.to_i)
+      end
+
+      finalize { |ctx| ctx.result = ctx[:sum] }
+    end
+
+    GC.start
+
+    values = @db.get_first_row( "select accumulate(c), accumulate(a,c) from foo")
+    assert_equal 33, values[0]
+    assert_equal 2145, values[1]
+  end
+
+  def test_create_aggregate_with_invalid_arity
+    assert_raise ArgumentError do
+      @db.create_aggregate( "accumulate", 1000 ) do
+        step {|ctx,*args| }
+        finalize { |ctx| }
+      end
+    end
+  end
+
+  class CustomException < Exception
+  end
+
+  def test_create_aggregate_with_exception_in_step
+    @db.create_aggregate( "raiseexception", 1 ) do
+      step do |ctx,a|
+        raise CustomException.new( "bogus aggregate handler" )
+      end
+
+      finalize { |ctx| ctx.result = 42 }
+    end
+
+    assert_raise CustomException do
+      @db.get_first_value( "select raiseexception(a) from foo")
+    end
+  end
+
+  def test_create_aggregate_with_exception_in_finalize
+    @db.create_aggregate( "raiseexception", 1 ) do
+      step do |ctx,a|
+        raise CustomException.new( "bogus aggregate handler" )
+      end
+
+      finalize do |ctx|
+        raise CustomException.new( "bogus aggregate handler" )
+      end
+    end
+
+    assert_raise CustomException do
+      @db.get_first_value( "select raiseexception(a) from foo")
+    end
+  end
+
+  def test_create_aggregate_with_no_data
+    @db.create_aggregate( "accumulate", 1 ) do
+      step do |ctx,a|
+        ctx[:sum] ||= 0
+        ctx[:sum] += a.to_i
+      end
+
+      finalize { |ctx| ctx.result = ctx[:sum] || 0 }
+    end
+
+    value = @db.get_first_value(
+      "select accumulate(a) from foo where a = 100" )
+    assert_equal 0, value
+  end
+
+  class AggregateHandler
+    class << self
+      def arity; 1; end
+      def text_rep; SQLite3::Constants::TextRep::ANY; end
+      def name; "multiply"; end
+    end
+    def step(ctx, a)
+      ctx[:buffer] ||= 1
+      ctx[:buffer] *= a.to_i
+    end
+    def finalize(ctx); ctx.result = ctx[:buffer]; end
+  end
+
+  def test_aggregate_initialized_twice
+    initialized = 0
+    handler = Class.new(AggregateHandler) do
+      define_method(:initialize) do
+        initialized += 1
+        super()
+      end
+    end
+
+    @db.create_aggregate_handler handler
+    @db.get_first_value( "select multiply(a) from foo" )
+    @db.get_first_value( "select multiply(a) from foo" )
+    assert_equal 2, initialized
+  end
+
+  def test_create_aggregate_handler_call_with_wrong_arity
+    @db.create_aggregate_handler AggregateHandler
+
+    assert_raise(SQLite3::SQLException) do
+     @db.get_first_value( "select multiply(a,c) from foo" )
+   end
+  end
+
+  class RaiseExceptionStepAggregateHandler
+    class << self
+      def arity; 1; end
+      def text_rep; SQLite3::Constants::TextRep::ANY; end
+      def name; "raiseexception"; end
+    end
+    def step(ctx, a)
+      raise CustomException.new( "bogus aggregate handler" )
+    end
+    def finalize(ctx); ctx.result = nil; end
+  end
+
+  def test_create_aggregate_handler_with_exception_step
+    @db.create_aggregate_handler RaiseExceptionStepAggregateHandler
+    assert_raise CustomException do
+      @db.get_first_value( "select raiseexception(a) from foo")
+    end
+  end
+
+  class RaiseExceptionNewAggregateHandler
+    class << self
+      def name; "raiseexception"; end
+    end
+    def initialize
+      raise CustomException.new( "bogus aggregate handler" )
+    end
+    def step(ctx, a); end
+    def finalize(ctx); ctx.result = nil; end
+  end
+
+  def test_create_aggregate_handler_with_exception_new
+    @db.create_aggregate_handler RaiseExceptionNewAggregateHandler
+    assert_raise CustomException do
+      @db.get_first_value( "select raiseexception(a) from foo")
+    end
+  end
+
+  def test_create_aggregate_handler
+    @db.create_aggregate_handler AggregateHandler
+    value = @db.get_first_value( "select multiply(a) from foo" )
+    assert_equal 6, value
+  end
+
+  class AccumulateAggregator
+    def step(*args)
+      @sum ||= 0
+      args.each { |a| @sum += a.to_i }
+    end
+
+    def finalize
+      @sum
+    end
+  end
+
+  class AccumulateAggregator2
+    def step(a, b)
+      @sum ||= 1
+      @sum *= (a.to_i + b.to_i)
+    end
+
+    def finalize
+      @sum
+    end
+  end
+
+  def test_define_aggregator_with_two_different_arities
+    @db.define_aggregator( "accumulate", AccumulateAggregator.new )
+    @db.define_aggregator( "accumulate", AccumulateAggregator2.new )
+
+    GC.start
+
+    values = @db.get_first_row( "select accumulate(c), accumulate(a,c) from foo")
+    assert_equal 33, values[0]
+    assert_equal 2145, values[1]
+  end
+end

data/test/test_integration_resultset.rb

@@ -105,23 +105,6 @@ class TC_ResultSet < SQLite3::TestCase
     assert_equal hash[1], "foo"
   end
 
-  def test_tainted_results_as_hash
-    @db.results_as_hash = true
-    @result.reset( 1 )
-    row = @result.next
-    row.each do |_, v|
-      assert(v.tainted?) if String === v
-    end
-  end
-
-  def test_tainted_row_values
-    @result.reset( 1 )
-    row = @result.next
-    row.each do |v|
-      assert(v.tainted?) if String === v
-    end
-  end
-
   def test_each
     called = 0
     @result.reset( 1, 2 )

data/test/test_statement.rb

@@ -119,7 +119,15 @@ module SQLite3
       assert_equal [nil], result
     end
 
-    def test_bind_blobs
+    def test_bind_blob
+      @db.execute('create table foo(text BLOB)')
+      stmt = SQLite3::Statement.new(@db, 'insert into foo(text) values (?)')
+      stmt.bind_param(1, SQLite3::Blob.new('hello'))
+      stmt.execute
+      row = @db.execute('select * from foo')
+
+      assert_equal ['hello'], row.first
+      assert_equal row.first.types, ['BLOB']
     end
 
     def test_bind_64
@@ -190,11 +198,6 @@ module SQLite3
       assert_equal ['foo'], r
     end
 
-    def test_tainted
-      r = @stmt.step
-      assert r.first.tainted?
-    end
-
     def test_step_twice
       assert_not_nil @stmt.step
       assert !@stmt.done?
@@ -216,7 +219,7 @@ module SQLite3
 
     def test_column_name
       assert_equal "'foo'", @stmt.column_name(0)
-      assert_equal nil, @stmt.column_name(10)
+      assert_nil @stmt.column_name(10)
     end
 
     def test_bind_parameter_count
@@ -243,7 +246,7 @@ module SQLite3
       assert stmt.execute('employee-2')
     end
 
-    def test_clear_bindings
+    def test_clear_bindings!
       stmt = @db.prepare('select ?, ?')
       stmt.bind_param 1, "foo"
       stmt.bind_param 2, "bar"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlite3
 version: !ruby/object:Gem::Version
-  version: 1.3.13
+  version: 1.4.2
 platform: ruby
 authors:
 - Jamis Buck
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2019-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -18,72 +18,72 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.13'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: rake-compiler-dock
+  name: mini_portile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
-  name: mini_portile
+  name: hoe-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: hoe-bundler
+  name: hoe-gemspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -96,20 +96,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.20'
 description: |-
   This module allows Ruby programs to interface with the SQLite3
   database engine (http://www.sqlite.org).  You must have the
@@ -128,12 +148,15 @@ extra_rdoc_files:
 - CHANGELOG.rdoc
 - Manifest.txt
 - README.rdoc
+- ext/sqlite3/aggregator.c
 - ext/sqlite3/backup.c
 - ext/sqlite3/database.c
 - ext/sqlite3/exception.c
 - ext/sqlite3/sqlite3.c
 - ext/sqlite3/statement.c
 files:
+- ".gemtest"
+- ".travis.yml"
 - API_CHANGES.rdoc
 - CHANGELOG.rdoc
 - ChangeLog.cvs
@@ -142,6 +165,9 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
+- appveyor.yml
+- ext/sqlite3/aggregator.c
+- ext/sqlite3/aggregator.h
 - ext/sqlite3/backup.c
 - ext/sqlite3/backup.h
 - ext/sqlite3/database.c
@@ -165,19 +191,22 @@ files:
 - lib/sqlite3/translator.rb
 - lib/sqlite3/value.rb
 - lib/sqlite3/version.rb
+- rakelib/faq.rake
+- rakelib/gem.rake
+- rakelib/native.rake
+- rakelib/vendor_sqlite3.rake
 - setup.rb
-- tasks/faq.rake
-- tasks/gem.rake
-- tasks/native.rake
-- tasks/vendor_sqlite3.rake
 - test/helper.rb
 - test/test_backup.rb
 - test/test_collation.rb
 - test/test_database.rb
+- test/test_database_flags.rb
 - test/test_database_readonly.rb
+- test/test_database_readwrite.rb
 - test/test_deprecated.rb
 - test/test_encoding.rb
 - test/test_integration.rb
+- test/test_integration_aggregate.rb
 - test/test_integration_open_close.rb
 - test/test_integration_pending.rb
 - test/test_integration_resultset.rb
@@ -188,8 +217,9 @@ files:
 - test/test_statement_execute.rb
 homepage: https://github.com/sparklemotion/sqlite3-ruby
 licenses:
-- BSD-3
-metadata: {}
+- BSD-3-Clause
+metadata:
+  msys2_mingw_dependencies: sqlite3
 post_install_message: 
 rdoc_options:
 - "--main"
@@ -207,8 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: This module allows Ruby programs to interface with the SQLite3 database engine