iv-org-mirror/shard-crystal-db
1
0
Fork 0
mirror of https://gitea.invidious.io/iv-org/shard-crystal-db.git synced 2024-08-15 00:53:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Drop driver getter from database

Browse source
This commit is contained in:
Brian J. Cardiff 2023-05-29 13:40:58 -03:00
parent 0a08eace7a
commit 33a5b2b78b
3 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spec/custom_drivers_types_spec.cr
View file

@ -160,8 +160,8 @@ DB.register_driver "bar", BarDriver
describe DB do describe DB do
it "should be able to register multiple drivers" do it "should be able to register multiple drivers" do
DB.open("foo://host").driver.should be_a(FooDriver) DB.open("foo://host").checkout.should be_a(FooDriver::FooConnection)
DB.open("bar://host").driver.should be_a(BarDriver) DB.open("bar://host").checkout.should be_a(BarDriver::BarConnection)
end end
it "Foo and Bar drivers should return fake_row" do it "Foo and Bar drivers should return fake_row" do

7
spec/db_spec.cr
View file

@ -9,12 +9,9 @@ describe DB do
DB.driver_class("dummy").should eq(DummyDriver) DB.driver_class("dummy").should eq(DummyDriver)
end end
it "should instantiate driver with connection uri" do it "should create dummy connection" do
db = DB.open "dummy://localhost:1027" db = DB.open "dummy://localhost:1027"
db.driver.should be_a(DummyDriver) db.checkout.should be_a(DummyDriver::DummyConnection)
db.uri.scheme.should eq("dummy")
db.uri.host.should eq("localhost")
db.uri.port.should eq(1027)
end end
it "should create a connection and close it" do it "should create a connection and close it" do

10
src/db/database.cr
View file

@ -31,8 +31,6 @@ module DB
include SessionMethods(Database, PoolStatement) include SessionMethods(Database, PoolStatement)
include ConnectionContext include ConnectionContext
# :nodoc:
getter driver
# :nodoc: # :nodoc:
getter pool getter pool
@ -45,13 +43,13 @@ module DB
@statements_cache = StringKeyCache(PoolPreparedStatement).new @statements_cache = StringKeyCache(PoolPreparedStatement).new
# :nodoc: # :nodoc:
def initialize(@driver : Driver, @uri : URI) def initialize(driver : Driver, @uri : URI)
params = HTTP::Params.parse(uri.query || "") params = HTTP::Params.parse(uri.query || "")
@connection_options = @driver.connection_options(params) @connection_options = driver.connection_options(params)
pool_options = @driver.pool_options(params) pool_options = driver.pool_options(params)
@setup_connection = ->(conn : Connection) {} @setup_connection = ->(conn : Connection) {}
factory = @driver.connection_builder(@uri) factory = driver.connection_builder(@uri)
@pool = uninitialized Pool(Connection) # in order to use self in the factory proc @pool = uninitialized Pool(Connection) # in order to use self in the factory proc
@pool = Pool.new(pool_options) { @pool = Pool.new(pool_options) {
conn = factory.call conn = factory.call