activerecord 3.2.22.5 → 4.2.11.3

data/lib/active_record/connection_adapters/schema_cache.rb

@@ -1,52 +1,54 @@
 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       = {}
+      end
 
-        @primary_keys = Hash.new do |h, table_name|
-          h[table_name] = table_exists?(table_name) ? connection.primary_key(table_name) : nil
-        end
+      def primary_keys(table_name)
+        @primary_keys[table_name] ||= table_exists?(table_name) ? connection.primary_key(table_name) : nil
       end
 
       # A cached lookup for table existence.
       def table_exists?(name)
+        prepare_tables if @tables.empty?
         return @tables[name] if @tables.key? name
 
         @tables[name] = connection.table_exists?(name)
       end
 
-      # Get the columns for a table
-      def columns(table = nil)
-        if table
-          @columns[table]
-        else
-          @columns
+      # 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)
+        @tables[name]
+      end
+
+      # Get the columns for a table
+      def columns(table_name)
+        @columns[table_name] ||= connection.columns(table_name)
+      end
+
       # Get the columns for a table as a hash, key is the column name
       # value is the column object.
-      def columns_hash(table = nil)
-        if table
-          @columns_hash[table]
-        else
-          @columns_hash
-        end
+      def columns_hash(table_name)
+        @columns_hash[table_name] ||= Hash[columns(table_name).map { |col|
+          [col.name, col]
+        }]
       end
 
       # Clears out internal caches
@@ -55,6 +57,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 +73,22 @@ 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]
+      end
+
+      def marshal_load(array)
+        @version, @columns, @columns_hash, @primary_keys, @tables = array
+      end
+
+      private
+
+        def prepare_tables
+          connection.tables.each { |table| @tables[table] = true }
+        end
     end
   end
 end