Code cleanup due to Crystal >= 0.28.0

This commit is contained in:
Brian J. Cardiff 2019-06-06 12:36:16 -03:00
parent 2bfda2aa13
commit 4b4441bb37
3 changed files with 3 additions and 22 deletions

View File

@ -19,13 +19,7 @@ describe Driver do
assert_filename("sqlite3:/path/to/file.db", "/path/to/file.db")
assert_filename("sqlite3:///path/to/file.db", "/path/to/file.db")
{% if compare_versions(Crystal::VERSION, "0.28.0") >= 0 %}
# Before 0.28.0 the filename had the query string in this case
# but it didn't bother when deleting the file in pool_spec.cr.
# After 0.28.0 the behavior is changed, but can't be fixed prior that
# due to the use of URI#opaque.
assert_filename("sqlite3:./file.db?max_pool_size=5", "./file.db")
{% end %}
assert_filename("sqlite3:./file.db?max_pool_size=5", "./file.db")
assert_filename("sqlite3:/path/to/file.db?max_pool_size=5", "/path/to/file.db")
assert_filename("sqlite3://./file.db?max_pool_size=5", "./file.db")
assert_filename("sqlite3:///path/to/file.db?max_pool_size=5", "/path/to/file.db")

View File

@ -21,12 +21,7 @@ describe DB::Pool do
fibers.times { channel.receive }
# all numbers were inserted
s : Int32
{% if compare_versions(Crystal::VERSION, "0.28.0") >= 0 %}
s = fibers * max_n * (max_n + 1) // 2
{% else %}
s = fibers * max_n * (max_n + 1) / 2
{% end %}
s = fibers * max_n * (max_n + 1) // 2
db.scalar("select sum(n) from numbers").should eq(s)
# numbers were not inserted one fiber at a time

View File

@ -9,15 +9,7 @@ class SQLite3::Connection < DB::Connection
end
def self.filename(uri : URI)
{% if compare_versions(Crystal::VERSION, "0.28.0") >= 0 %}
URI.unescape((uri.host || "") + uri.path)
{% else %}
URI.unescape (if path = uri.path
(uri.host || "") + path
else
uri.opaque.not_nil!
end)
{% end %}
URI.unescape((uri.host || "") + uri.path)
end
def build_prepared_statement(query)