aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@gmail.com>2016-06-04 08:46:07 -0400
committerEileen M. Uchitelle <eileencodes@gmail.com>2016-06-04 08:46:07 -0400
commit0ddcade928741886ad2ac1bd0273c3ce28a5e1e1 (patch)
tree9f508a27c970e0dd0ec7c633e285ce188fd39508 /activerecord
parent66ebbc4952f6cfb37d719f63036441ef98149418 (diff)
parentfaed011acc86db91cf8166be5d3cf1a9a0dd9581 (diff)
downloadrails-0ddcade928741886ad2ac1bd0273c3ce28a5e1e1.tar.gz
rails-0ddcade928741886ad2ac1bd0273c3ce28a5e1e1.tar.bz2
rails-0ddcade928741886ad2ac1bd0273c3ce28a5e1e1.zip
Merge pull request #25272 from kamipo/fix_sqlite3_test_failure
Fix sqlite3 test failure
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/adapters/sqlite3/quoting_test.rb4
-rw-r--r--activerecord/test/cases/adapters/sqlite3/statement_pool_test.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/adapters/sqlite3/quoting_test.rb b/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
index ee4801fe86..fe2425b845 100644
--- a/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
@@ -80,14 +80,14 @@ class SQLite3QuotingTest < ActiveRecord::SQLite3TestCase
def test_quoting_binary_strings
value = "hello".encode('ascii-8bit')
- type = Type::String.new
+ type = ActiveRecord::Type::String.new
assert_equal "'hello'", @conn.quote(type.serialize(value))
end
def test_quoted_time_returns_date_qualified_time
value = ::Time.utc(2000, 1, 1, 12, 30, 0, 999999)
- type = Type::Time.new
+ type = ActiveRecord::Type::Time.new
assert_equal "'2000-01-01 12:30:00.999999'", @conn.quote(type.serialize(value))
end
diff --git a/activerecord/test/cases/adapters/sqlite3/statement_pool_test.rb b/activerecord/test/cases/adapters/sqlite3/statement_pool_test.rb
index d9db690522..24cc6875ab 100644
--- a/activerecord/test/cases/adapters/sqlite3/statement_pool_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/statement_pool_test.rb
@@ -4,7 +4,7 @@ class SQLite3StatementPoolTest < ActiveRecord::SQLite3TestCase
if Process.respond_to?(:fork)
def test_cache_is_per_pid
- cache = StatementPool.new(10)
+ cache = ActiveRecord::ConnectionAdapters::SQLite3Adapter::StatementPool.new(10)
cache['foo'] = 'bar'
assert_equal 'bar', cache['foo']