introduce database as driver wrapper.

expose list of types to support by the drivers implementors.
deal with nilable types with `#read?(T.class) : T?` methods.
change `#has_next` to `#move_next`
This commit is contained in:
Brian J. Cardiff 2016-01-29 16:13:01 -03:00
parent c16dc42e96
commit 1572062501
7 changed files with 91 additions and 51 deletions

View file

@ -8,8 +8,9 @@ describe DB::Driver do
end
it "should instantiate driver with options" do
driver = DB.driver "dummy", {"host": "localhost", "port": "1027"}
driver.options["host"].should eq("localhost")
driver.options["port"].should eq("1027")
db = DB.open "dummy", {"host": "localhost", "port": "1027"}
db.driver_class.should eq(DummyDriver)
db.options["host"].should eq("localhost")
db.options["port"].should eq("1027")
end
end

View file

@ -18,7 +18,7 @@ class DummyDriver < DB::Driver
super(statement)
end
def has_next
def move_next
@iterator.next.tap do |n|
return false if n.is_a?(Iterator::Stop)
@values = n.each
@ -26,12 +26,27 @@ class DummyDriver < DB::Driver
end
end
def read_string
@values.not_nil!.next as String
def read?(t : String.class)
n = @values.not_nil!.next
raise "end of row" if n.is_a?(Iterator::Stop)
return nil if n == "NULL"
return n as String
end
def read_u_int64
read_string.to_u64
def read?(t : Int32.class)
read?(String).try &.to_i32
end
def read?(t : Int64.class)
read?(String).try &.to_i64
end
def read?(t : Float32.class)
read?(String).try &.to_f23
end
def read?(t : Float64.class)
read?(String).try &.to_f64
end
end
end
@ -39,5 +54,5 @@ end
DB.register_driver "dummy", DummyDriver
def get_dummy
DB.driver "dummy", {} of String => String
DB.open "dummy", {} of String => String
end

View file

@ -17,50 +17,60 @@ describe DummyDriver do
it "should enumerate records by spaces" do
result_set = get_dummy.prepare("").exec
result_set.has_next.should be_false
result_set.move_next.should be_false
result_set = get_dummy.prepare("a,b").exec
result_set.has_next.should be_true
result_set.has_next.should be_false
result_set.move_next.should be_true
result_set.move_next.should be_false
result_set = get_dummy.prepare("a,b 1,2").exec
result_set.has_next.should be_true
result_set.has_next.should be_true
result_set.has_next.should be_false
result_set.move_next.should be_true
result_set.move_next.should be_true
result_set.move_next.should be_false
result_set = get_dummy.prepare("a,b 1,2 c,d").exec
result_set.has_next.should be_true
result_set.has_next.should be_true
result_set.has_next.should be_true
result_set.has_next.should be_false
result_set.move_next.should be_true
result_set.move_next.should be_true
result_set.move_next.should be_true
result_set.move_next.should be_false
end
it "should enumerate string fields" do
result_set = get_dummy.prepare("a,b 1,2").exec
result_set.has_next
result_set.move_next
result_set.read(String).should eq("a")
result_set.read(String).should eq("b")
result_set.has_next
result_set.move_next
result_set.read(String).should eq("1")
result_set.read(String).should eq("2")
end
it "should enumerate uint64 fields" do
it "should enumerate nil fields" do
result_set = get_dummy.prepare("a,NULL 1,NULL").exec
result_set.move_next
result_set.read?(String).should eq("a")
result_set.read?(String).should be_nil
result_set.move_next
result_set.read?(Int64).should eq(1)
result_set.read?(Int64).should be_nil
end
it "should enumerate int64 fields" do
result_set = get_dummy.prepare("3,4 1,2").exec
result_set.has_next
result_set.read(UInt64).should eq(3)
result_set.read(UInt64).should eq(4)
result_set.has_next
result_set.read(UInt64).should eq(1)
result_set.read(UInt64).should eq(2)
result_set.move_next
result_set.read(Int64).should eq(3i64)
result_set.read(Int64).should eq(4i64)
result_set.move_next
result_set.read(Int64).should eq(1i64)
result_set.read(Int64).should eq(2i64)
end
it "should enumerate records using each" do
nums = [] of UInt64
nums = [] of Int32
result_set = get_dummy.prepare("3,4 1,2").exec
result_set.each do
nums << result_set.read(UInt64)
nums << result_set.read(UInt64)
nums << result_set.read(Int32)
nums << result_set.read(Int32)
end
nums.should eq([3, 4, 1, 2])