aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2005-12-04 06:15:04 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2005-12-04 06:15:04 +0000
commit0632f5a93e20955cedc8834cec0bfe1cddb1bdd7 (patch)
tree809d652ced481a0fbec51bd67273a469bbf97ae5 /activerecord/lib
parentdc64887f21d319bb3beb9a71dcc487641ebf8c1f (diff)
downloadrails-0632f5a93e20955cedc8834cec0bfe1cddb1bdd7.tar.gz
rails-0632f5a93e20955cedc8834cec0bfe1cddb1bdd7.tar.bz2
rails-0632f5a93e20955cedc8834cec0bfe1cddb1bdd7.zip
Move dummy active? and reconnect! from sqlite to base adapter. References #428.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3219 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib')
-rwxr-xr-xactiverecord/lib/active_record/connection_adapters/abstract_adapter.rb13
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb13
2 files changed, 13 insertions, 13 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index 19812dda86..f120a50f8f 100755
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -52,6 +52,19 @@ module ActiveRecord
rt
end
+
+ # CONNECTION MANAGEMENT ====================================
+
+ # Is this connection active and ready to perform queries?
+ def active?
+ true
+ end
+
+ # Close this connection and open a new one in its place.
+ def reconnect!
+ end
+
+
protected
def log(sql, name)
if block_given?
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index 2c87d78fc8..44011a09fd 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -127,19 +127,6 @@ module ActiveRecord
end
- # CONNECTION MANAGEMENT ====================================
-
- def active?
- # TODO: SQLite is an embedded db, it doesn't lose connections,
- # but perhaps some of its exceptions merit a retry, such as
- # LockedException.
- true
- end
-
- def reconnect!
- end
-
-
# DATABASE STATEMENTS ======================================
def execute(sql, name = nil) #:nodoc: