summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Holland <rob@inversepath.com>2008-05-07 12:30:20 +0100
committerRob Holland <rob@inversepath.com>2008-05-07 12:30:20 +0100
commit3222a34cfb4d56c7dfce9a2f7daf50e65b4fd0a9 (patch)
tree46f16717c69a1789e0f41123663add4f64c46cff
parent0443c36bd95f53aa93e3ce8811372366d0257c69 (diff)
downloadthird_party-sqlite3-ruby-3222a34cfb4d56c7dfce9a2f7daf50e65b4fd0a9.tar.gz
third_party-sqlite3-ruby-3222a34cfb4d56c7dfce9a2f7daf50e65b4fd0a9.tar.xz
third_party-sqlite3-ruby-3222a34cfb4d56c7dfce9a2f7daf50e65b4fd0a9.zip
Correct busy_handler documentation
-rw-r--r--lib/sqlite3/database.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/sqlite3/database.rb b/lib/sqlite3/database.rb
index 92160b8..ca955fd 100644
--- a/lib/sqlite3/database.rb
+++ b/lib/sqlite3/database.rb
@@ -302,19 +302,19 @@ module SQLite3
# The handler will be invoked with the name of the resource that was
# busy, and the number of times it has been retried.
#
- # See also #busy_timeout.
+ # See also the mutually exclusive #busy_timeout.
def busy_handler( data=nil, &block ) # :yields: data, retries
result = @driver.busy_handler( @handle, data, &block )
Error.check( result, self )
end
# Indicates that if a request for a resource terminates because that
- # resource is busy, SQLite should wait for the indicated number of
- # milliseconds before trying again. By default, SQLite does not retry
+ # resource is busy, SQLite should sleep and retry for up to the indicated
+ # number of milliseconds. By default, SQLite does not retry
# busy resources. To restore the default behavior, send 0 as the
# +ms+ parameter.
#
- # See also #busy_handler.
+ # See also the mutually exclusive #busy_handler.
def busy_timeout( ms )
result = @driver.busy_timeout( @handle, ms )
Error.check( result, self )