activerecord 3.2.22.4 → 4.0.13

data/lib/active_record/connection_adapters/schema_cache.rb

@@ -1,25 +1,27 @@
+require 'active_support/deprecation/reporting'
+
 module ActiveRecord
   module ConnectionAdapters
     class SchemaCache
-      attr_reader :primary_keys, :tables
-      attr_reader :connection
+      attr_reader :version
+      attr_accessor :connection
 
       def initialize(conn)
         @connection = conn
-        @tables     = {}
-
-        @columns = Hash.new do |h, table_name|
-          h[table_name] = connection.columns(table_name, "#{table_name} Columns")
-        end
 
-        @columns_hash = Hash.new do |h, table_name|
-          h[table_name] = Hash[columns[table_name].map { |col|
-            [col.name, col]
-          }]
-        end
+        @columns      = {}
+        @columns_hash = {}
+        @primary_keys = {}
+        @tables       = {}
+        prepare_default_proc
+      end
 
-        @primary_keys = Hash.new do |h, table_name|
-          h[table_name] = table_exists?(table_name) ? connection.primary_key(table_name) : nil
+      def primary_keys(table_name = nil)
+        if table_name
+          @primary_keys[table_name]
+        else
+          ActiveSupport::Deprecation.warn('call primary_keys with a table name!')
+          @primary_keys.dup
         end
       end
 
@@ -30,12 +32,31 @@ module ActiveRecord
         @tables[name] = connection.table_exists?(name)
       end
 
+      # Add internal cache for table with +table_name+.
+      def add(table_name)
+        if table_exists?(table_name)
+          @primary_keys[table_name]
+          @columns[table_name]
+          @columns_hash[table_name]
+        end
+      end
+
+      def tables(name = nil)
+        if name
+          @tables[name]
+        else
+          ActiveSupport::Deprecation.warn('call tables with a name!')
+          @tables.dup
+        end
+      end
+
       # Get the columns for a table
       def columns(table = nil)
         if table
           @columns[table]
         else
-          @columns
+          ActiveSupport::Deprecation.warn('call columns with a table name!')
+          @columns.dup
         end
       end
 
@@ -45,7 +66,8 @@ module ActiveRecord
         if table
           @columns_hash[table]
         else
-          @columns_hash
+          ActiveSupport::Deprecation.warn('call columns_hash with a table name!')
+          @columns_hash.dup
         end
       end
 
@@ -55,6 +77,13 @@ module ActiveRecord
         @columns_hash.clear
         @primary_keys.clear
         @tables.clear
+        @version = nil
+      end
+
+      def size
+        [@columns, @columns_hash, @primary_keys, @tables].map { |x|
+          x.size
+        }.inject :+
       end
 
       # Clear out internal caches for table with +table_name+.
@@ -64,6 +93,37 @@ module ActiveRecord
         @primary_keys.delete table_name
         @tables.delete table_name
       end
+
+      def marshal_dump
+        # if we get current version during initialization, it happens stack over flow.
+        @version = ActiveRecord::Migrator.current_version
+        [@version] + [@columns, @columns_hash, @primary_keys, @tables].map { |val|
+          Hash[val]
+        }
+      end
+
+      def marshal_load(array)
+        @version, @columns, @columns_hash, @primary_keys, @tables = array
+        prepare_default_proc
+      end
+
+      private
+
+      def prepare_default_proc
+        @columns.default_proc = Proc.new do |h, table_name|
+          h[table_name] = connection.columns(table_name)
+        end
+
+        @columns_hash.default_proc = Proc.new do |h, table_name|
+          h[table_name] = Hash[columns(table_name).map { |col|
+            [col.name, col]
+          }]
+        end
+
+        @primary_keys.default_proc = Proc.new do |h, table_name|
+          h[table_name] = table_exists?(table_name) ? connection.primary_key(table_name) : nil
+        end
+      end
     end
   end
 end