Rename t_args to args_

This commit is contained in:
Brian J. Cardiff 2019-09-16 13:30:36 -03:00
parent 62b1c8520c
commit 1ada763b8a
3 changed files with 48 additions and 48 deletions

View file

@ -15,8 +15,8 @@ module DB
end
# See `QueryMethods#exec`
def exec(*t_args, args : Array? = nil) : ExecResult
statement_with_retry &.exec(*t_args, args: args)
def exec(*args_, args : Array? = nil) : ExecResult
statement_with_retry &.exec(*args_, args: args)
end
# See `QueryMethods#query`
@ -25,8 +25,8 @@ module DB
end
# See `QueryMethods#query`
def query(*t_args, args : Array? = nil) : ResultSet
statement_with_retry &.query(*t_args, args: args)
def query(*args_, args : Array? = nil) : ResultSet
statement_with_retry &.query(*args_, args: args)
end
# See `QueryMethods#scalar`

View file

@ -42,8 +42,8 @@ module DB
# result = db.query "select name from contacts where id = ?", args: [10]
# ```
#
def query(query, *t_args, args : Array? = nil)
build(query).query(*t_args, args: args)
def query(query, *args_, args : Array? = nil)
build(query).query(*args_, args: args)
end
# Executes a *query* and yields a `ResultSet` with the results.
@ -56,9 +56,9 @@ module DB
# end
# end
# ```
def query(query, *t_args, args : Array? = nil)
def query(query, *args_, args : Array? = nil)
# CHECK build(query).query(*args, &block)
rs = query(query, *t_args, args: args)
rs = query(query, *args_, args: args)
yield rs ensure rs.close
end
@ -72,8 +72,8 @@ module DB
# ```
# name = db.query_one "select name from contacts where id = ?", 18, &.read(String)
# ```
def query_one(query, *t_args, args : Array? = nil, &block : ResultSet -> U) : U forall U
query(query, *t_args, args: args) do |rs|
def query_one(query, *args_, args : Array? = nil, &block : ResultSet -> U) : U forall U
query(query, *args_, args: args) do |rs|
raise DB::Error.new("no rows") unless rs.move_next
value = yield rs
@ -90,8 +90,8 @@ module DB
# ```
# db.query_one "select name, age from contacts where id = ?", 1, as: {String, Int32}
# ```
def query_one(query, *t_args, args : Array? = nil, as types : Tuple)
query_one(query, *t_args, args: args) do |rs|
def query_one(query, *args_, args : Array? = nil, as types : Tuple)
query_one(query, *args_, args: args) do |rs|
rs.read(*types)
end
end
@ -105,8 +105,8 @@ module DB
# ```
# db.query_one "select name, age from contacts where id = ?", 1, as: {name: String, age: Int32}
# ```
def query_one(query, *t_args, args : Array? = nil, as types : NamedTuple)
query_one(query, *t_args, args: args) do |rs|
def query_one(query, *args_, args : Array? = nil, as types : NamedTuple)
query_one(query, *args_, args: args) do |rs|
rs.read(**types)
end
end
@ -119,8 +119,8 @@ module DB
# ```
# db.query_one "select name from contacts where id = ?", 1, as: String
# ```
def query_one(query, *t_args, args : Array? = nil, as type : Class)
query_one(query, *t_args, args: args) do |rs|
def query_one(query, *args_, args : Array? = nil, as type : Class)
query_one(query, *args_, args: args) do |rs|
rs.read(type)
end
end
@ -137,8 +137,8 @@ module DB
# name = db.query_one? "select name from contacts where id = ?", 18, &.read(String)
# typeof(name) # => String | Nil
# ```
def query_one?(query, *t_args, args : Array? = nil, &block : ResultSet -> U) : U? forall U
query(query, *t_args, args: args) do |rs|
def query_one?(query, *args_, args : Array? = nil, &block : ResultSet -> U) : U? forall U
query(query, *args_, args: args) do |rs|
return nil unless rs.move_next
value = yield rs
@ -158,8 +158,8 @@ module DB
# result = db.query_one? "select name, age from contacts where id = ?", 1, as: {String, Int32}
# typeof(result) # => Tuple(String, Int32) | Nil
# ```
def query_one?(query, *t_args, args : Array? = nil, as types : Tuple)
query_one?(query, *t_args, args: args) do |rs|
def query_one?(query, *args_, args : Array? = nil, as types : Tuple)
query_one?(query, *args_, args: args) do |rs|
rs.read(*types)
end
end
@ -176,8 +176,8 @@ module DB
# result = db.query_one? "select name, age from contacts where id = ?", 1, as: {age: String, name: Int32}
# typeof(result) # => NamedTuple(age: String, name: Int32) | Nil
# ```
def query_one?(query, *t_args, args : Array? = nil, as types : NamedTuple)
query_one?(query, *t_args, args: args) do |rs|
def query_one?(query, *args_, args : Array? = nil, as types : NamedTuple)
query_one?(query, *args_, args: args) do |rs|
rs.read(**types)
end
end
@ -193,8 +193,8 @@ module DB
# name = db.query_one? "select name from contacts where id = ?", 1, as: String
# typeof(name) # => String?
# ```
def query_one?(query, *t_args, args : Array? = nil, as type : Class)
query_one?(query, *t_args, args: args) do |rs|
def query_one?(query, *args_, args : Array? = nil, as type : Class)
query_one?(query, *args_, args: args) do |rs|
rs.read(type)
end
end
@ -205,9 +205,9 @@ module DB
# ```
# names = db.query_all "select name from contacts", &.read(String)
# ```
def query_all(query, *t_args, args : Array? = nil, &block : ResultSet -> U) : Array(U) forall U
def query_all(query, *args_, args : Array? = nil, &block : ResultSet -> U) : Array(U) forall U
ary = [] of U
query_each(query, *t_args, args: args) do |rs|
query_each(query, *args_, args: args) do |rs|
ary.push(yield rs)
end
ary
@ -219,8 +219,8 @@ module DB
# ```
# contacts = db.query_all "select name, age from contacts", as: {String, Int32}
# ```
def query_all(query, *t_args, args : Array? = nil, as types : Tuple)
query_all(query, *t_args, args: args) do |rs|
def query_all(query, *args_, args : Array? = nil, as types : Tuple)
query_all(query, *args_, args: args) do |rs|
rs.read(*types)
end
end
@ -232,8 +232,8 @@ module DB
# ```
# contacts = db.query_all "select name, age from contacts", as: {name: String, age: Int32}
# ```
def query_all(query, *t_args, args : Array? = nil, as types : NamedTuple)
query_all(query, *t_args, args: args) do |rs|
def query_all(query, *args_, args : Array? = nil, as types : NamedTuple)
query_all(query, *args_, args: args) do |rs|
rs.read(**types)
end
end
@ -244,8 +244,8 @@ module DB
# ```
# names = db.query_all "select name from contacts", as: String
# ```
def query_all(query, *t_args, args : Array? = nil, as type : Class)
query_all(query, *t_args, args: args) do |rs|
def query_all(query, *args_, args : Array? = nil, as type : Class)
query_all(query, *args_, args: args) do |rs|
rs.read(type)
end
end
@ -258,8 +258,8 @@ module DB
# puts rs.read(String)
# end
# ```
def query_each(query, *t_args, args : Array? = nil)
query(query, *t_args, args: args) do |rs|
def query_each(query, *args_, args : Array? = nil)
query(query, *args_, args: args) do |rs|
rs.each do
yield rs
end
@ -267,8 +267,8 @@ module DB
end
# Performs the `query` and returns an `ExecResult`
def exec(query, *t_args, args : Array? = nil)
build(query).exec(*t_args, args: args)
def exec(query, *args_, args : Array? = nil)
build(query).exec(*args_, args: args)
end
# Performs the `query` and returns a single scalar value
@ -276,8 +276,8 @@ module DB
# ```
# puts db.scalar("SELECT MAX(name)").as(String) # => (a String)
# ```
def scalar(query, *t_args, args : Array? = nil)
build(query).scalar(*t_args, args: args)
def scalar(query, *args_, args : Array? = nil)
build(query).scalar(*args_, args: args)
end
end
end

View file

@ -8,8 +8,8 @@ module DB
end
# See `QueryMethods#scalar`
def scalar(*t_args, args : Array? = nil)
query(*t_args, args: args) do |rs|
def scalar(*args_, args : Array? = nil)
query(*args_, args: args) do |rs|
rs.each do
return rs.read
end
@ -19,20 +19,20 @@ module DB
end
# See `QueryMethods#query`
def query(*t_args, args : Array? = nil)
rs = query(*t_args, args: args)
def query(*args_, args : Array? = nil)
rs = query(*args_, args: args)
yield rs ensure rs.close
end
# See `QueryMethods#exec`
abstract def exec : ExecResult
# See `QueryMethods#exec`
abstract def exec(*t_args, args : Array? = nil) : ExecResult
abstract def exec(*args_, args : Array? = nil) : ExecResult
# See `QueryMethods#query`
abstract def query : ResultSet
# See `QueryMethods#query`
abstract def query(*t_args, args : Array? = nil) : ResultSet
abstract def query(*args_, args : Array? = nil) : ResultSet
end
# Represents a query in a `Connection`.
@ -64,8 +64,8 @@ module DB
end
# See `QueryMethods#exec`
def exec(*t_args, args : Array? = nil) : DB::ExecResult
perform_exec_and_release(EnumerableConcat.build(t_args, args))
def exec(*args_, args : Array? = nil) : DB::ExecResult
perform_exec_and_release(EnumerableConcat.build(args_, args))
end
# See `QueryMethods#query`
@ -74,8 +74,8 @@ module DB
end
# See `QueryMethods#query`
def query(*t_args, args : Array? = nil) : DB::ResultSet
perform_query_with_rescue(EnumerableConcat.build(t_args, args))
def query(*args_, args : Array? = nil) : DB::ResultSet
perform_query_with_rescue(EnumerableConcat.build(args_, args))
end
private def perform_exec_and_release(args : Enumerable) : ExecResult