aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib/active_record')
-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: