sqlite3 1.6.2-arm64-darwin → 1.6.4-arm64-darwin

data/test/test_deprecated.rb

@@ -2,8 +2,6 @@ require 'helper'
 
 module SQLite3
   class TestDeprecated < SQLite3::TestCase
-    attr_reader :db
-
     def setup
       super
       @warn_before = $-w
@@ -15,10 +13,13 @@ module SQLite3
     def teardown
       super
       $-w = @warn_before
+      @db.close
     end
 
     def test_query_with_many_bind_params_not_nil
-      assert_equal [[1, 2]], db.query('select ?, ?', 1, 2).to_a
+      rs = @db.query('select ?, ?', 1, 2)
+      assert_equal [[1, 2]], rs.to_a
+      rs.close
     end
 
     def test_execute_with_many_bind_params_not_nil
@@ -26,11 +27,15 @@ module SQLite3
     end
 
     def test_query_with_many_bind_params
-      assert_equal [[nil, 1]], @db.query("select ?, ?", nil, 1).to_a
+      rs = @db.query("select ?, ?", nil, 1)
+      assert_equal [[nil, 1]], rs.to_a
+      rs.close
     end
 
     def test_query_with_nil_bind_params
-      assert_equal [['foo']], @db.query("select 'foo'", nil).to_a
+      rs = @db.query("select 'foo'", nil)
+      assert_equal [['foo']], rs.to_a
+      rs.close
     end
 
     def test_execute_with_many_bind_params

data/test/test_encoding.rb

@@ -11,6 +11,10 @@ module SQLite3
       @db.execute(@create);
     end
 
+    def teardown
+      @db.close
+    end
+
     def test_select_encoding_on_utf_16
       str = "foo"
       utf16 = ([1].pack("I") == [1].pack("N")) ? "UTF-16BE" : "UTF-16LE"
@@ -24,6 +28,7 @@ module SQLite3
         assert_equal 1, stmt.to_a.length
         stmt.reset!
       end
+      stmt.close
     end
 
     def test_insert_encoding
@@ -39,6 +44,7 @@ module SQLite3
         stmt.to_a
         stmt.reset!
       end
+      stmt.close
 
       db.execute('select data from ex').flatten.each do |s|
         assert_equal str, s
@@ -55,6 +61,7 @@ module SQLite3
       stmt = @db.prepare('insert into ex(data) values (?)')
       stmt.bind_param 1, str
       stmt.step
+      stmt.close
 
       Encoding.default_internal = 'EUC-JP'
       string = @db.execute('select data from ex').first.first
@@ -73,6 +80,7 @@ module SQLite3
       stmt = @db.prepare('insert into foo(data) values (?)')
       stmt.bind_param(1, SQLite3::Blob.new(str))
       stmt.step
+      stmt.close
 
       string = @db.execute('select data from foo').first.first
       assert_equal Encoding.find('ASCII-8BIT'), string.encoding
@@ -85,6 +93,7 @@ module SQLite3
       stmt = @db.prepare('insert into foo(data) values (?)')
       stmt.bind_param(1, str.dup.force_encoding("ASCII-8BIT"))
       stmt.step
+      stmt.close
 
       string = @db.execute('select data from foo').first.first
       assert_equal Encoding.find('ASCII-8BIT'), string.encoding
@@ -97,6 +106,7 @@ module SQLite3
       stmt = @db.prepare('insert into foo(data) values (?)')
       stmt.bind_param(1, SQLite3::Blob.new(str))
       stmt.step
+      stmt.close
 
       string = @db.execute('select data from foo').first.first
       assert_equal Encoding.find('ASCII-8BIT'), string.encoding

data/test/test_integration_statement.rb

@@ -77,10 +77,10 @@ class TC_Statement < SQLite3::TestCase
   def test_bind_param_with_various_types
     @db.transaction do
       @db.execute "create table all_types ( a integer primary key, b float, c string, d integer )"
-      @db.execute "insert into all_types ( b, c, d ) values ( 1.4, 'hello', 68719476735 )"
+      @db.execute "insert into all_types ( b, c, d ) values ( 1.5, 'hello', 68719476735 )"
     end
 
-    assert_equal 1, @db.execute( "select * from all_types where b = ?", 1.4 ).length
+    assert_equal 1, @db.execute( "select * from all_types where b = ?", 1.5 ).length
     assert_equal 1, @db.execute( "select * from all_types where c = ?", 'hello').length
     assert_equal 1, @db.execute( "select * from all_types where d = ?", 68719476735).length
   end

data/test/test_result_set.rb

@@ -2,29 +2,38 @@ require 'helper'
 
 module SQLite3
   class TestResultSet < SQLite3::TestCase
+    def setup
+      @db = SQLite3::Database.new ':memory:'
+      super
+    end
+
+    def teardown
+      super
+      @db.close
+    end
+
     def test_each_hash
-      db = SQLite3::Database.new ':memory:'
-      db.execute "create table foo ( a integer primary key, b text )"
+      @db.execute "create table foo ( a integer primary key, b text )"
       list = ('a'..'z').to_a
       list.each do |t|
-        db.execute "insert into foo (b) values (\"#{t}\")"
+        @db.execute "insert into foo (b) values (\"#{t}\")"
       end
 
-      rs = db.prepare('select * from foo').execute
+      rs = @db.prepare('select * from foo').execute
       rs.each_hash do |hash|
         assert_equal list[hash['a'] - 1], hash['b']
       end
+      rs.close
     end
 
     def test_next_hash
-      db = SQLite3::Database.new ':memory:'
-      db.execute "create table foo ( a integer primary key, b text )"
+      @db.execute "create table foo ( a integer primary key, b text )"
       list = ('a'..'z').to_a
       list.each do |t|
-        db.execute "insert into foo (b) values (\"#{t}\")"
+        @db.execute "insert into foo (b) values (\"#{t}\")"
       end
 
-      rs = db.prepare('select * from foo').execute
+      rs = @db.prepare('select * from foo').execute
       rows = []
       while row = rs.next_hash
         rows << row
@@ -32,6 +41,7 @@ module SQLite3
       rows.each do |hash|
         assert_equal list[hash['a'] - 1], hash['b']
       end
+      rs.close
     end
   end
 end

data/test/test_statement.rb

@@ -7,6 +7,11 @@ module SQLite3
       @stmt = SQLite3::Statement.new(@db, "select 'foo'")
     end
 
+    def teardown
+      @stmt.close if !@stmt.closed?
+      @db.close
+    end
+
     def test_double_close_does_not_segv
       @db.execute 'CREATE TABLE "things" ("number" float NOT NULL)'
 
@@ -35,6 +40,8 @@ module SQLite3
       # Older versions of SQLite return:
       #   column *column_name* is not unique
       assert_match(/(column(s)? .* (is|are) not unique|UNIQUE constraint failed: .*)/, exception.message)
+
+      stmt.close
     end
 
     ###
@@ -46,6 +53,7 @@ module SQLite3
       if stmt.respond_to?(:database_name)
         assert_equal 'main', stmt.database_name(0)
       end
+      stmt.close
     end
 
     def test_prepare_blob
@@ -77,6 +85,7 @@ module SQLite3
     def test_new_with_remainder
       stmt = SQLite3::Statement.new(@db, "select 'foo';bar")
       assert_equal 'bar', stmt.remainder
+      stmt.close
     end
 
     def test_empty_remainder
@@ -101,6 +110,7 @@ module SQLite3
       result = nil
       stmt.each { |x| result = x }
       assert_equal ['hello'], result
+      stmt.close
     end
 
     def test_bind_param_int
@@ -109,6 +119,7 @@ module SQLite3
       result = nil
       stmt.each { |x| result = x }
       assert_equal [10], result
+      stmt.close
     end
 
     def test_bind_nil
@@ -117,6 +128,7 @@ module SQLite3
       result = nil
       stmt.each { |x| result = x }
       assert_equal [nil], result
+      stmt.close
     end
 
     def test_bind_blob
@@ -125,6 +137,7 @@ module SQLite3
       stmt.bind_param(1, SQLite3::Blob.new('hello'))
       stmt.execute
       row = @db.execute('select * from foo')
+      stmt.close
 
       assert_equal ['hello'], row.first
       assert_equal ['blob'], row.first.types
@@ -136,6 +149,7 @@ module SQLite3
       result = nil
       stmt.each { |x| result = x }
       assert_equal [2 ** 31], result
+      stmt.close
     end
 
     def test_bind_double
@@ -144,6 +158,7 @@ module SQLite3
       result = nil
       stmt.each { |x| result = x }
       assert_equal [2.2], result
+      stmt.close
     end
 
     def test_named_bind
@@ -152,6 +167,7 @@ module SQLite3
       result = nil
       stmt.each { |x| result = x }
       assert_equal ['hello'], result
+      stmt.close
     end
 
     def test_named_bind_no_colon
@@ -160,6 +176,7 @@ module SQLite3
       result = nil
       stmt.each { |x| result = x }
       assert_equal ['hello'], result
+      stmt.close
     end
 
     def test_named_bind_symbol
@@ -168,6 +185,7 @@ module SQLite3
       result = nil
       stmt.each { |x| result = x }
       assert_equal ['hello'], result
+      stmt.close
     end
 
     def test_named_bind_not_found
@@ -175,6 +193,7 @@ module SQLite3
       assert_raises(SQLite3::Exception) do
         stmt.bind_param('bar', 'hello')
       end
+      stmt.close
     end
 
     def test_each
@@ -225,16 +244,19 @@ module SQLite3
     def test_bind_parameter_count
       stmt = SQLite3::Statement.new(@db, "select ?, ?, ?")
       assert_equal 3, stmt.bind_parameter_count
+      stmt.close
     end
 
     def test_execute_with_varargs
       stmt = @db.prepare('select ?, ?')
       assert_equal [[nil, nil]], stmt.execute(nil, nil).to_a
+      stmt.close
     end
 
     def test_execute_with_hash
       stmt = @db.prepare('select :n, :h')
       assert_equal [[10, nil]], stmt.execute('n' => 10, 'h' => nil).to_a
+      stmt.close
     end
 
     def test_with_error
@@ -244,6 +266,7 @@ module SQLite3
       stmt.execute('employee-1') rescue SQLite3::ConstraintException
       stmt.reset!
       assert stmt.execute('employee-2')
+      stmt.close
     end
 
     def test_clear_bindings!
@@ -258,6 +281,8 @@ module SQLite3
       while x = stmt.step
         assert_equal [nil, nil], x
       end
+
+      stmt.close
     end
   end
 end

data/test/test_statement_execute.rb

@@ -8,6 +8,10 @@ module SQLite3
         "CREATE TABLE items (id integer PRIMARY KEY, number integer)")
     end
 
+    def teardown
+      @db.close
+    end
+
     def test_execute_insert
       ps = @db.prepare("INSERT INTO items (number) VALUES (:n)")
       ps.execute('n'=>10)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlite3
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.4
 platform: arm64-darwin
 authors:
 - Jamis Buck
@@ -10,84 +10,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-27 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.15'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.15'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: rake-compiler-dock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.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: psych
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+date: 2023-08-26 00:00:00.000000000 Z
+dependencies: []
 description: |-
   This module allows Ruby programs to interface with the SQLite3
   database engine (http://www.sqlite.org).  You must have the
@@ -113,7 +37,9 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - ChangeLog.cvs
+- FAQ.md
 - Gemfile
+- INSTALLATION.md
 - LICENSE
 - LICENSE-DEPENDENCIES
 - README.md
@@ -131,9 +57,6 @@ files:
 - ext/sqlite3/sqlite3_ruby.h
 - ext/sqlite3/statement.c
 - ext/sqlite3/statement.h
-- faq/faq.md
-- faq/faq.rb
-- faq/faq.yml
 - lib/sqlite3.rb
 - lib/sqlite3/2.7/sqlite3_native.bundle
 - lib/sqlite3/3.0/sqlite3_native.bundle

data/faq/faq.rb

@@ -1,145 +0,0 @@
-require 'yaml'
-require 'redcloth'
-
-def process_faq_list( faqs )
-  puts "<ul>"
-  faqs.each do |faq|
-    process_faq_list_item faq
-  end
-  puts "</ul>"
-end
-
-def process_faq_list_item( faq )
-  question = faq.keys.first
-  answer = faq.values.first
-
-  print "<li>"
-
-  question_text = RedCloth.new(question).to_html.gsub( %r{</?p>},"" )
-  if answer.is_a?( Array )
-    puts question_text
-    process_faq_list answer
-  else
-    print "<a href='##{question.object_id}'>#{question_text}</a>"
-  end
-
-  puts "</li>"
-end
-
-def process_faq_descriptions( faqs, path=nil )
-  faqs.each do |faq|
-    process_faq_description faq, path
-  end
-end
-
-def process_faq_description( faq, path )
-  question = faq.keys.first
-  path = ( path ? path + " " : "" ) + question
-  answer = faq.values.first
-
-  if answer.is_a?( Array )
-    process_faq_descriptions( answer, path )
-  else
-    title = RedCloth.new( path ).to_html.gsub( %r{</?p>}, "" )
-    answer = RedCloth.new( answer || "" )
-
-    puts "<a name='#{question.object_id}'></a>"
-    puts "<div class='faq-title'>#{title}</div>"
-    puts "<div class='faq-answer'>#{add_api_links(answer.to_html)}</div>"
-  end
-end
-
-API_OBJECTS = [ "Database", "Statement", "ResultSet",
-  "ParsedStatement", "Pragmas", "Translator" ].inject( "(" ) { |acc,name|
-    acc << "|" if acc.length > 1
-    acc << name
-    acc
-  } + ")"
-
-def add_api_links( text )
-  text.gsub( /#{API_OBJECTS}(#(\w+))?/ ) do
-    disp_obj = obj = $1
-
-    case obj
-      when "Pragmas"; disp_obj = "Database"
-    end
-
-    method = $3
-    s = "<a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/#{obj}.html'>#{disp_obj}"
-    s << "##{method}" if method
-    s << "</a>"
-    s
-  end
-end
-
-faqs = YAML.load( File.read( "faq.yml" ) )
-
-puts <<-EOF
-<html>
-  <head>
-    <title>SQLite3/Ruby FAQ</title>
-    <style type="text/css">
-      a, a:visited, a:active {
-        color: #00F;
-        text-decoration: none;
-      }
-
-      a:hover {
-        text-decoration: underline;
-      }
-
-      .faq-list {
-        color: #000;
-        font-family: vera-sans, verdana, arial, sans-serif;
-      }
-
-      .faq-title {
-        background: #007;
-        color: #FFF;
-        font-family: vera-sans, verdana, arial, sans-serif;
-        padding-left: 1em;
-        padding-top: 0.5em;
-        padding-bottom: 0.5em;
-        font-weight: bold;
-        font-size: large;
-        border: 1px solid #000;
-      }
-
-      .faq-answer {
-        margin-left: 1em;
-        color: #000;
-        font-family: vera-sans, verdana, arial, sans-serif;
-      }
-
-      .faq-answer pre {
-        margin-left: 1em;
-        color: #000;
-        background: #FFE;
-        font-size: normal;
-        border: 1px dotted #CCC;
-        padding: 1em;
-      }
-
-      h1 {
-        background: #005;
-        color: #FFF;
-        font-family: vera-sans, verdana, arial, sans-serif;
-        padding-left: 1em;
-        padding-top: 1em;
-        padding-bottom: 1em;
-        font-weight: bold;
-        font-size: x-large;
-        border: 1px solid #00F;
-      }
-    </style>
-  </head>
-  <body>
-  <h1>SQLite/Ruby FAQ</h1>
-  <div class="faq-list">
-EOF
-
-process_faq_list( faqs )
-puts "</div>"
-process_faq_descriptions( faqs )
-
-puts "</body></html>"