Skip to content

Commit 5ca4fc9

Browse files
committed
Add support schema cache dump and load.
1 parent 8cecb47 commit 5ca4fc9

File tree

2 files changed

+49
-14
lines changed

2 files changed

+49
-14
lines changed

activerecord/lib/active_record/connection_adapters/schema_cache.rb

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,12 @@ class SchemaCache
66

77
def initialize(conn)
88
@connection = conn
9-
@tables = {}
109

11-
@columns = Hash.new do |h, table_name|
12-
h[table_name] = conn.columns(table_name)
13-
end
14-
15-
@columns_hash = Hash.new do |h, table_name|
16-
h[table_name] = Hash[columns[table_name].map { |col|
17-
[col.name, col]
18-
}]
19-
end
20-
21-
@primary_keys = Hash.new do |h, table_name|
22-
h[table_name] = table_exists?(table_name) ? conn.primary_key(table_name) : nil
23-
end
10+
@columns = {}
11+
@columns_hash = {}
12+
@primary_keys = {}
13+
@tables = {}
14+
prepare_default_proc
2415
end
2516

2617
# A cached lookup for table existence.
@@ -45,6 +36,35 @@ def clear_table_cache!(table_name)
4536
@primary_keys.delete table_name
4637
@tables.delete table_name
4738
end
39+
40+
def marshal_dump
41+
[:@columns, :@columns_hash, :@primary_keys, :@tables].map do |val|
42+
self.instance_variable_get(val).inject({}) { |h, v| h[v[0]] = v[1]; h }
43+
end
44+
end
45+
46+
def marshal_load(array)
47+
@columns, @columns_hash, @primary_keys, @tables = array
48+
prepare_default_proc
49+
end
50+
51+
private
52+
53+
def prepare_default_proc
54+
@columns.default_proc = Proc.new do |h, table_name|
55+
h[table_name] = connection.columns(table_name)
56+
end
57+
58+
@columns_hash.default_proc = Proc.new do |h, table_name|
59+
h[table_name] = Hash[columns[table_name].map { |col|
60+
[col.name, col]
61+
}]
62+
end
63+
64+
@primary_keys.default_proc = Proc.new do |h, table_name|
65+
h[table_name] = table_exists?(table_name) ? connection.primary_key(table_name) : nil
66+
end
67+
end
4868
end
4969
end
5070
end

activerecord/test/cases/connection_adapters/schema_cache_test.rb

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,21 @@ def test_clearing
3939
assert_equal 0, @cache.tables.size
4040
assert_equal 0, @cache.primary_keys.size
4141
end
42+
43+
def test_dump_and_load
44+
@cache.columns['posts']
45+
@cache.columns_hash['posts']
46+
@cache.tables['posts']
47+
@cache.primary_keys['posts']
48+
49+
@cache = Marshal.load(Marshal.dump(@cache))
50+
51+
assert_equal 12, @cache.columns['posts'].size
52+
assert_equal 12, @cache.columns_hash['posts'].size
53+
assert @cache.tables['posts']
54+
assert_equal 'id', @cache.primary_keys['posts']
55+
end
56+
4257
end
4358
end
4459
end

0 commit comments

Comments
 (0)