diff options
author | Eugene Kenny <elkenny@gmail.com> | 2015-04-29 11:02:47 +0100 |
---|---|---|
committer | Eugene Kenny <elkenny@gmail.com> | 2015-04-29 11:02:47 +0100 |
commit | 33fe7cc8892e7e2cf82f7cb0baf467590eb61988 (patch) | |
tree | c89048ab57537411aa93b749b7985f372d0b321b /activerecord/test/cases | |
parent | 4e6f0053db49f8c5b207c739efc39dd86c2552e3 (diff) | |
download | rails-33fe7cc8892e7e2cf82f7cb0baf467590eb61988.tar.gz rails-33fe7cc8892e7e2cf82f7cb0baf467590eb61988.tar.bz2 rails-33fe7cc8892e7e2cf82f7cb0baf467590eb61988.zip |
Apply schema cache dump when creating connections
The `db:schema:cache:dump` rake task dumps the database schema structure
to `db/schema_cache.dump`. If this file is present, the schema details
are loaded into the currently checked out connection by a railtie while
Rails is booting, to avoid having to query the database for its schema.
The schema cache dump is only applied to the initial connection used to
boot the application though; other connections from the same pool are
created with an empty schema cache, and still have to load the structure
of each table directly from the database.
With this change, a copy of the schema cache is associated with the
connection pool and applied to connections as they are created.
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r-- | activerecord/test/cases/connection_pool_test.rb | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb index aa50efc979..f5928814a3 100644 --- a/activerecord/test/cases/connection_pool_test.rb +++ b/activerecord/test/cases/connection_pool_test.rb @@ -341,6 +341,21 @@ module ActiveRecord handler.establish_connection anonymous, nil } end + + def test_pool_sets_connection_schema_cache + connection = pool.checkout + schema_cache = SchemaCache.new connection + schema_cache.add(:posts) + pool.schema_cache = schema_cache + + pool.with_connection do |conn| + assert_not_same pool.schema_cache, conn.schema_cache + assert_equal pool.schema_cache.size, conn.schema_cache.size + assert_same pool.schema_cache.columns(:posts), conn.schema_cache.columns(:posts) + end + + pool.checkin connection + end end end end |