Changeset 5637
- Timestamp:
- 11/26/06 22:10:55 (2 years ago)
- Files:
-
- branches/1-2-pre-release/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb (modified) (1 diff)
- branches/1-2-pre-release/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb (modified) (1 diff)
- branches/1-2-pre-release/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb (modified) (1 diff)
- branches/1-2-pre-release/railties/lib/dispatcher.rb (modified) (3 diffs)
- trunk/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb (modified) (1 diff)
- trunk/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb (modified) (1 diff)
- trunk/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb (modified) (1 diff)
- trunk/railties/lib/dispatcher.rb (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/1-2-pre-release/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
r5481 r5637 80 80 end 81 81 82 # Returns true if its safe to reload the connection between requests for development mode. 83 # This is not the case for Ruby/MySQL and it's not necessary for any adapters except SQLite. 84 def supports_reloading? 85 false 86 end 87 82 88 # Lazily verify this connection, calling +active?+ only if it hasn't 83 89 # been called for +timeout+ seconds. branches/1-2-pre-release/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
r4460 r5637 85 85 clear_cache!(@@active_connections) do |name, conn| 86 86 conn.disconnect! 87 end 88 end 89 90 # Clears the cache which maps classes 91 def clear_reloadable_connections! 92 @@active_connections.each do |name, conn| 93 conn.disconnect! if conn.supports_reloading? 94 @@active_connections.delete(name) 87 95 end 88 96 end branches/1-2-pre-release/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
r5353 r5637 100 100 101 101 def supports_migrations? #:nodoc: 102 true 103 end 104 105 def supports_reloading? 102 106 true 103 107 end branches/1-2-pre-release/railties/lib/dispatcher.rb
r5627 r5637 63 63 end 64 64 65 ActiveRecord::Base.clear_ active_connections! if defined?(ActiveRecord)65 ActiveRecord::Base.clear_reloadable_connections! if defined?(ActiveRecord) 66 66 end 67 67 … … 77 77 unless identifier.nil? 78 78 callback = preparation_callbacks.detect { |ident, _| ident == identifier } 79 79 80 if callback # Already registered: update the existing callback 80 81 callback[-1] = block … … 82 83 end 83 84 end 85 84 86 preparation_callbacks << [identifier, block] 85 nil 87 88 return 86 89 end 87 90 trunk/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
r5480 r5637 80 80 end 81 81 82 # Returns true if its safe to reload the connection between requests for development mode. 83 # This is not the case for Ruby/MySQL and it's not necessary for any adapters except SQLite. 84 def supports_reloading? 85 false 86 end 87 82 88 # Lazily verify this connection, calling +active?+ only if it hasn't 83 89 # been called for +timeout+ seconds. trunk/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
r4460 r5637 85 85 clear_cache!(@@active_connections) do |name, conn| 86 86 conn.disconnect! 87 end 88 end 89 90 # Clears the cache which maps classes 91 def clear_reloadable_connections! 92 @@active_connections.each do |name, conn| 93 conn.disconnect! if conn.supports_reloading? 94 @@active_connections.delete(name) 87 95 end 88 96 end trunk/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
r5520 r5637 100 100 101 101 def supports_migrations? #:nodoc: 102 true 103 end 104 105 def supports_reloading? 102 106 true 103 107 end trunk/railties/lib/dispatcher.rb
r5627 r5637 63 63 end 64 64 65 ActiveRecord::Base.clear_ active_connections! if defined?(ActiveRecord)65 ActiveRecord::Base.clear_reloadable_connections! if defined?(ActiveRecord) 66 66 end 67 67 … … 77 77 unless identifier.nil? 78 78 callback = preparation_callbacks.detect { |ident, _| ident == identifier } 79 79 80 if callback # Already registered: update the existing callback 80 81 callback[-1] = block … … 82 83 end 83 84 end 85 84 86 preparation_callbacks << [identifier, block] 85 nil 87 88 return 86 89 end 87 90
