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

Rename t_args to args_

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

8
src/db/pool_statement.cr
View file

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

68
src/db/query_methods.cr
View file

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

20
src/db/statement.cr
View file

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