diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-04-27 10:30:03 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-04-27 10:30:03 +0100 |
| commit | 4ed6167e985ed41311d979371813f22fcb0143b7 (patch) | |
| tree | ee82a44517f747576a55ba0fc363e1e62182a3b3 /activerecord/test | |
| parent | cf1a83c8816edeacd209725ae6c90846e9c6b4fc (diff) | |
| parent | 7d1a42a0b17028662e24967a32c6a36849e48068 (diff) | |
| download | rails-4ed6167e985ed41311d979371813f22fcb0143b7.tar.gz rails-4ed6167e985ed41311d979371813f22fcb0143b7.tar.bz2 rails-4ed6167e985ed41311d979371813f22fcb0143b7.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/adapters/sqlite3/quoting_test.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/adapters/sqlite3/statement_pool_test.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/base_test.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/helper.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/test/cases/adapters/sqlite3/quoting_test.rb b/activerecord/test/cases/adapters/sqlite3/quoting_test.rb index 1dbeb66af6..2ba9143cd5 100644 --- a/activerecord/test/cases/adapters/sqlite3/quoting_test.rb +++ b/activerecord/test/cases/adapters/sqlite3/quoting_test.rb @@ -5,7 +5,7 @@ require 'securerandom' module ActiveRecord module ConnectionAdapters - class SQLiteAdapter + class SQLite3Adapter class QuotingTest < ActiveRecord::TestCase def setup @conn = Base.sqlite3_connection :database => ':memory:', diff --git a/activerecord/test/cases/adapters/sqlite3/statement_pool_test.rb b/activerecord/test/cases/adapters/sqlite3/statement_pool_test.rb index ae272e2c4b..2f04c60a9a 100644 --- a/activerecord/test/cases/adapters/sqlite3/statement_pool_test.rb +++ b/activerecord/test/cases/adapters/sqlite3/statement_pool_test.rb @@ -1,7 +1,7 @@ require 'cases/helper' module ActiveRecord::ConnectionAdapters - class SQLiteAdapter + class SQLite3Adapter class StatementPoolTest < ActiveRecord::TestCase def test_cache_is_per_pid return skip('must support fork') unless Process.respond_to?(:fork) diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb index da7d99e2c5..19ef2f592d 100644 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -228,7 +228,7 @@ class BasicsTest < ActiveRecord::TestCase ) # For adapters which support microsecond resolution. - if current_adapter?(:PostgreSQLAdapter) || current_adapter?(:SQLiteAdapter) + if current_adapter?(:PostgreSQLAdapter) || current_adapter?(:SQLite3Adapter) assert_equal 11, Topic.find(1).written_on.sec assert_equal 223300, Topic.find(1).written_on.usec assert_equal 9900, Topic.find(2).written_on.usec diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb index 5c3560a33b..345ae0b582 100644 --- a/activerecord/test/cases/helper.rb +++ b/activerecord/test/cases/helper.rb @@ -36,7 +36,7 @@ def current_adapter?(*types) end def in_memory_db? - current_adapter?(:SQLiteAdapter) && + current_adapter?(:SQLite3Adapter) && ActiveRecord::Base.connection_pool.spec.config[:database] == ":memory:" end |