github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1365 from gnufied/sqlite3

Browse Source 
close statment only if its not closed
This commit is contained in:
Aaron Patterson
2011-05-27 14:40:32 -07:00
parent 2a9b3abe19 ed1a0672ab
commit 4b536f7591
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
View File

@@ -102,7 +102,7 @@ module ActiveRecord
# Clears the prepared statements cache.
def clear_cache!
@statements.values.each { |hash| hash[:stmt].close }
@statements.values.each { |hash| !hash[:stmt].closed? && hash[:stmt].close }
@statements.clear
end

2
activerecord/lib/active_record/relation.rb
View File

@@ -12,7 +12,7 @@ module ActiveRecord
# These are explicitly delegated to improve performance (avoids method_missing)
delegate :to_xml, :to_yaml, :length, :collect, :map, :each, :all?, :include?, :to => :to_a
delegate :table_name, :quoted_table_name, :primary_key, :quoted_primary_key, :to => :klass
delegate :table_name, :quoted_table_name, :primary_key, :quoted_primary_key, :connection, :column_hash,:to => :klass
attr_reader :table, :klass, :loaded
attr_accessor :extensions, :default_scoped