Skip to content

Commit a2d0f3b

Browse files
committed
print which SQLite version the tests run against + support specifying driver gem version
1 parent 4c28f9f commit a2d0f3b

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

Gemfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ group :rails do
4848
gem 'actionpack', :require => nil
4949
end
5050

51+
if sqlite_version = ENV['JDBC_SQLITE_VERSION'] # for testing against different version(s)
52+
gem 'jdbc-sqlite3', sqlite_version, :require => nil, :platform => :jruby, :group => :test
53+
end
54+
5155
gem 'mysql2', :require => nil, :platform => :mri, :group => :test
5256
gem 'pg', :require => nil, :platform => :mri, :group => :test
5357
gem 'sqlite3', :require => nil, :platform => :mri, :group => :test

rakelib/02-test.rake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def test_task_for(adapter, options = {})
5353
desc = options[:desc] || options[:comment] ||
5454
"Run tests against #{options[:database_name] || adapter}"
5555
adapter = adapter.to_s.downcase
56-
driver = options.key?(:driver) ? options[:driver] : adapter
56+
driver = adapter if ( driver = options[:driver] ).nil?
5757
prereqs = options[:prereqs] || []
5858
unless prereqs.frozen?
5959
prereqs = [ prereqs ].flatten; prereqs << 'test_appraisal_hint'
@@ -87,7 +87,7 @@ test_task_for :MSSQL, :driver => :jtds, :database_name => 'MS-SQL (SQLServer)'
8787
test_task_for :MySQL, :prereqs => 'db:mysql'
8888
test_task_for :PostgreSQL, :driver => 'postgres', :prereqs => 'db:postgresql'
8989
task :test_postgres => :test_postgresql # alias
90-
test_task_for :SQLite3
90+
test_task_for :SQLite3, :driver => ENV['JDBC_SQLITE_VERSION']
9191
task :test_sqlite => :test_sqlite3 # alias
9292
test_task_for :Firebird
9393

test/db/sqlite3/has_many_though_test.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,9 @@
33

44
class SQLite3HasManyThroughTest < Test::Unit::TestCase
55
include HasManyThroughMethods
6+
7+
def self.startup
8+
puts "Using SQLite: #{ActiveRecord::Base.connection.send(:sqlite_version)}"
9+
end
10+
611
end

0 commit comments

Comments
 (0)