Changeset 2627

Timestamp:

10/15/05 20:49:04 (3 years ago)

Author:

minam

Message:

Allow ARStore::Session to indicate that it should not be reloaded in dev mode

Files:

• trunk/actionpack/lib/action_controller/session/active_record_store.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/base.rb (modified) (1 diff)

trunk/actionpack/lib/action_controller/session/active_record_store.rb

@@ -47 +47 @@
-        class << self
-
+          # Don't try to reload ARStore::Session in dev mode.
+          def reloadable? #:nodoc:
+            false
+          end
+          
-          def data_column_size_limit
-            connection.columns(table_name).find {|column| column.name == 'data'}.limit

trunk/activerecord/lib/active_record/base.rb

@@ -257 +257 @@
-      super
-    end
+    
+    # Allow all subclasses of AR::Base to be reloaded in dev mode, unless they
+    # explicitly decline the honor. USE WITH CAUTION. Only AR subclasses kept
+    # in the framework should use the flag, so #reset_subclasses and so forth
+    # leave it alone.
+    def self.reloadable? #:nodoc:
+      true
+    end
-
-    def self.reset_subclasses
+      nonreloadables = []
-      subclasses.each do |klass|
+        unless klass.reloadable?
+          nonreloadables << klass
+          next
+        end
-        klass.instance_variables.each { |var| klass.send(:remove_instance_variable, var) }
-        klass.instance_methods(false).each { |m| klass.send :undef_method, m }
-      end
-
+
+
-    end
-