mirror of
https://gitea.invidious.io/iv-org/shard-crystal-db.git
synced 2024-08-15 00:53:32 +00:00
Release connection when unprepared statements can't be built
Add specs Fix typo in docs
This commit is contained in:
parent
4fe3884898
commit
9b03aa6535
4 changed files with 31 additions and 2 deletions
|
@ -149,6 +149,28 @@ describe DB::Database do
|
|||
end
|
||||
end
|
||||
|
||||
it "should return connection to the pool if prepared statement is unable to be built" do
|
||||
connection = uninitialized DB::Connection
|
||||
with_dummy "dummy://localhost:1027?initial_pool_size=1" do |db|
|
||||
connection = DummyDriver::DummyConnection.connections.first
|
||||
expect_raises do
|
||||
db.prepared.exec("syntax error")
|
||||
end
|
||||
db.pool.is_available?(connection).should be_true
|
||||
end
|
||||
end
|
||||
|
||||
it "should return connection to the pool if unprepared statement is unable to be built" do
|
||||
connection = uninitialized DB::Connection
|
||||
with_dummy "dummy://localhost:1027?initial_pool_size=1" do |db|
|
||||
connection = DummyDriver::DummyConnection.connections.first
|
||||
expect_raises do
|
||||
db.unprepared.exec("syntax error")
|
||||
end
|
||||
db.pool.is_available?(connection).should be_true
|
||||
end
|
||||
end
|
||||
|
||||
describe "prepared_statements connection option" do
|
||||
it "defaults to true" do
|
||||
with_dummy "dummy://localhost:1027" do |db|
|
||||
|
|
|
@ -99,6 +99,7 @@ class DummyDriver < DB::Driver
|
|||
def initialize(connection, @query : String, @prepared : Bool)
|
||||
@params = Hash(Int32 | String, DB::Any).new
|
||||
super(connection)
|
||||
raise query if query == "syntax error"
|
||||
end
|
||||
|
||||
protected def perform_query(args : Enumerable)
|
||||
|
|
|
@ -29,7 +29,7 @@ module DB
|
|||
end
|
||||
|
||||
# builds a statement over a real connection
|
||||
# the conneciton is registered in `@connections`
|
||||
# the connection is registered in `@connections`
|
||||
private def build_statement
|
||||
clean_connections
|
||||
conn, existing = @db.checkout_some(@connections)
|
||||
|
|
|
@ -15,7 +15,13 @@ module DB
|
|||
|
||||
# builds a statement over a real connection
|
||||
private def build_statement
|
||||
@db.pool.checkout.unprepared.build(@query)
|
||||
conn = @db.pool.checkout
|
||||
begin
|
||||
conn.unprepared.build(@query)
|
||||
rescue ex
|
||||
conn.release
|
||||
raise ex
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue