Merge pull request #315 from petergoldstein/feature/add_ruby_3_0_and_3_1

Add Ruby 3.0 and Ruby 3.1 to the CI matrix

Author: flavorjones

.github/workflows/sqlite3-ruby.yml

@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu, macos ]
-        ruby: [ head, 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, truffleruby-head ]
+        ruby: [ head, 3.1, '3.0', 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, truffleruby-head ]
     steps:
       - uses: actions/checkout@v2
       - name: load Ruby and dependencies
@@ -37,7 +37,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows ]
-        ruby: [ mingw, 2.7, 2.6, 2.5, 2.4 ]
+        ruby: [ mingw, 3.1, '3.0', 2.7, 2.6, 2.5, 2.4 ]
     steps:
       - uses: actions/checkout@v2
       - name: load Ruby and sqlite3

Gemfile

@@ -8,7 +8,7 @@ source "https://rubygems.org/"
 gem "minitest", "~>5.11", :group => [:development, :test]
 gem "rake-compiler", "~>1.0", :group => [:development, :test]
 gem "rake-compiler-dock", "~>0.6.0", :group => [:development, :test]
-gem "mini_portile", "~>0.6.2", :group => [:development, :test]
+gem "mini_portile2", "~>2.0", :group => [:development, :test]
 gem "hoe-bundler", "~>1.0", :group => [:development, :test]
 gem "hoe-gemspec", "~>1.0", :group => [:development, :test]
 gem "rdoc", ">=4.0", "<6", :group => [:development, :test]

lib/sqlite3/pragmas.rb

@@ -543,6 +543,13 @@ def table_info table
 
         tweak_default(new_row) if needs_tweak_default
 
+        # Ensure the type value is downcased.  On Mac and Windows
+        # platforms this value is now being returned as all upper
+        # case.
+        if new_row['type']
+          new_row['type'] = new_row['type'].downcase
+        end
+
         if block_given?
           yield new_row
         else

lib/sqlite3/statement.rb

@@ -137,7 +137,8 @@ def get_metadata
         column_name column
       end
       @types = Array.new(column_count) do |column|
-        column_decltype column
+        val = column_decltype(column)
+        val.nil? ? nil : val.downcase
       end
     end
   end

rakelib/gem.rake

@@ -27,7 +27,7 @@ HOE = Hoe.spec 'sqlite3' do
 
   extra_dev_deps << ['rake-compiler', "~> 1.0"]
   extra_dev_deps << ['rake-compiler-dock', "~> 0.6.0"]
-  extra_dev_deps << ["mini_portile", "~> 0.6.2"]
+  extra_dev_deps << ["mini_portile2", "~> 2.0"]
   extra_dev_deps << ["minitest", "~> 5.0"]
   extra_dev_deps << ["hoe-bundler", "~> 1.0"]
   extra_dev_deps << ["hoe-gemspec", "~> 1.0"]

rakelib/vendor_sqlite3.rake

@@ -1,14 +1,14 @@
 require "rake/clean"
 require "rake/extensioncompiler"
-require "mini_portile"
+require "mini_portile2"
 
 CLOBBER.include("ports")
 
 directory "ports"
 
 def define_sqlite_task(platform, host)
   recipe = MiniPortile.new "sqlite3", BINARY_VERSION
-  recipe.files << "http://sqlite.org#{URL_PATH}/sqlite-autoconf-#{URL_VERSION}.tar.gz"
+  recipe.files = ["http://sqlite.org#{URL_PATH}/sqlite-autoconf-#{URL_VERSION}.tar.gz"]
   recipe.host = host
 
   desc "Compile sqlite3 for #{platform} (#{host})"

sqlite3.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<minitest>.freeze, ["~> 5.11"])
       s.add_development_dependency(%q<rake-compiler>.freeze, ["~> 1.0"])
       s.add_development_dependency(%q<rake-compiler-dock>.freeze, ["~> 0.6.0"])
-      s.add_development_dependency(%q<mini_portile>.freeze, ["~> 0.6.2"])
+      s.add_development_dependency(%q<mini_portile2>.freeze, ["~> 2.0"])
       s.add_development_dependency(%q<hoe-bundler>.freeze, ["~> 1.0"])
       s.add_development_dependency(%q<hoe-gemspec>.freeze, ["~> 1.0"])
       s.add_development_dependency(%q<rdoc>.freeze, ["< 6", ">= 4.0"])
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<minitest>.freeze, ["~> 5.11"])
       s.add_dependency(%q<rake-compiler>.freeze, ["~> 1.0"])
       s.add_dependency(%q<rake-compiler-dock>.freeze, ["~> 0.6.0"])
-      s.add_dependency(%q<mini_portile>.freeze, ["~> 0.6.2"])
+      s.add_dependency(%q<mini_portile2>.freeze, ["~> 2.0"])
       s.add_dependency(%q<hoe-bundler>.freeze, ["~> 1.0"])
       s.add_dependency(%q<hoe-gemspec>.freeze, ["~> 1.0"])
       s.add_dependency(%q<rdoc>.freeze, ["< 6", ">= 4.0"])
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<minitest>.freeze, ["~> 5.11"])
     s.add_dependency(%q<rake-compiler>.freeze, ["~> 1.0"])
     s.add_dependency(%q<rake-compiler-dock>.freeze, ["~> 0.6.0"])
-    s.add_dependency(%q<mini_portile>.freeze, ["~> 0.6.2"])
+    s.add_dependency(%q<mini_portile2>.freeze, ["~> 2.0"])
     s.add_dependency(%q<hoe-bundler>.freeze, ["~> 1.0"])
     s.add_dependency(%q<hoe-gemspec>.freeze, ["~> 1.0"])
     s.add_dependency(%q<rdoc>.freeze, ["< 6", ">= 4.0"])

test/test_statement.rb

@@ -127,7 +127,7 @@ def test_bind_blob
       row = @db.execute('select * from foo')
 
       assert_equal ['hello'], row.first
-      assert_equal row.first.types, ['BLOB']
+      assert_equal ['blob'], row.first.types
     end
 
     def test_bind_64