From a8757f10d1897209040e551daa8a020807261357 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2020 16:49:04 +0000 Subject: [PATCH] Format files using DocumentFormat --- coverage/submit.jl | 4 +- src/iterate.jl | 27 ++++---- src/model_row.jl | 6 +- src/translate.jl | 12 ++-- src/utilities.jl | 8 +-- test/runtests.jl | 162 ++++++++++++++++++++++----------------------- 6 files changed, 108 insertions(+), 111 deletions(-) diff --git a/coverage/submit.jl b/coverage/submit.jl index 3a8e529..da20846 100644 --- a/coverage/submit.jl +++ b/coverage/submit.jl @@ -9,8 +9,8 @@ submit( filter( let prefix = joinpath(pwd(), "src", "") - coverage -> startswith(coverage.filename, prefix) - end, + coverage->startswith(coverage.filename, prefix) + end, readfolder(".") ) ) diff --git a/src/iterate.jl b/src/iterate.jl index d0cacdf..3c6b1fe 100644 --- a/src/iterate.jl +++ b/src/iterate.jl @@ -1,9 +1,9 @@ -function generate_namedtuple(::Type{NamedTuple{names, types}}, q) where {names, types} +function generate_namedtuple(::Type{NamedTuple{names,types}}, q) where {names,types} if @generated vals = Tuple(:(getvalue(q, $i, $(fieldtype(types, i)))) for i = 1:fieldcount(types)) - return :(NamedTuple{names, types}(($(vals...),))) + return :(NamedTuple{names,types}(($(vals...),))) else - return NamedTuple{names, types}(Tuple(getvalue(q, i, fieldtype(types, i)) for i = 1:fieldcount(types))) + return NamedTuple{names,types}(Tuple(getvalue(q, i, fieldtype(types, i)) for i = 1:fieldcount(types))) end end @@ -44,14 +44,14 @@ function getvalue(cursor::SQLiteCursor, column_number::Int, ::Type{Value}) where julia_type = juliatype(column_type) # native SQLite Int, Float, and Text types sqlitevalue( if julia_type === Any - if !isbitstype(Value) - Value - else - julia_type - end + if !isbitstype(Value) + Value else julia_type - end, handle, column_number) + end + else + julia_type + end, handle, column_number) end end @@ -118,14 +118,11 @@ function getiterator(source_code::SourceCode) handle = statement.handle schema = ntuple( let handle = handle - column_number -> name_and_type(handle, column_number) - end, + column_number->name_and_type(handle, column_number) + end, sqlite3_column_count(handle) ) - SQLiteCursor{NamedTuple{ - Tuple(map(first, schema)), - Tuple{map(second, schema)...} - }}(statement, Ref(status), Ref(0)) + SQLiteCursor{NamedTuple{Tuple(map(first, schema)),Tuple{map(second, schema)...}}}(statement, Ref(status), Ref(0)) end # Use default show methods from the queryverse diff --git a/src/model_row.jl b/src/model_row.jl index ce6fb7b..34abf62 100644 --- a/src/model_row.jl +++ b/src/model_row.jl @@ -28,8 +28,8 @@ function model_row_call(::typeof(getproperty), source_tables::Database, table_na source_row = SourceRow(source, table_name) NamedTuple{column_names}( map(column_names) do column_name - get_column(source_row, column_name) - end + get_column(source_row, column_name) + end ) end @@ -39,7 +39,7 @@ function model_row_call(::typeof(QueryOperators.map), iterator, call, call_expre end # Grouped rows have their own dedicated model type -struct GroupRow{Group, Row} +struct GroupRow{Group,Row} group::Group row::Row end diff --git a/src/translate.jl b/src/translate.jl index 587bb06..fcc743e 100644 --- a/src/translate.jl +++ b/src/translate.jl @@ -10,7 +10,7 @@ function nest(sql_expression) SQLExpression(:AS, SQLExpression(:FROM, sql_expression), :__TABLE__) end -function translate(something::Union{Char, AbstractString}; _primary = true) +function translate(something::Union{Char,AbstractString}; _primary = true) repr(something) end @@ -29,11 +29,11 @@ end function translate_default(location, function_type, SQL_call) result = :( function translate_call($function_type, arguments...; _primary = true) - $SQLExpression($SQL_call, $map( - argument -> $translate(argument; _primary = _primary), + $SQLExpression($SQL_call, $map( + argument->$translate(argument; _primary = _primary), arguments )...) - end + end ) result.args[2].args[1] = location result @@ -161,7 +161,7 @@ function translate_call(::typeof(QueryOperators.join), source1, source2, key1, k ), # mark both as not _primary to always be explicit about table Generator( - pair -> as(pair; _primary = false), + pair->as(pair; _primary = false), pairs(combine(model_row_1, model_row_2)) )... ) @@ -179,7 +179,7 @@ function translate_call(::typeof(QueryOperators.map), select_table, call, call_e SQLExpression( :SELECT, inner, Generator( - pair -> as(pair; _primary = _primary), + pair->as(pair; _primary = _primary), pairs(call(model_row(select_table))) )... ) diff --git a/src/utilities.jl b/src/utilities.jl index 389a92a..805aeef 100644 --- a/src/utilities.jl +++ b/src/utilities.jl @@ -4,10 +4,10 @@ end split_keyword(keyword::Expr) = if keyword.head === :kw - Pair(keyword.args[1], keyword.args[2]) - else - error("Cannot split keyword $keyword") - end + Pair(keyword.args[1], keyword.args[2]) +else + error("Cannot split keyword $keyword") +end # Split a function call into its pieces # Normalize non-function-like patterns into function calls diff --git a/test/runtests.jl b/test/runtests.jl index f8cf3b0..be0bf33 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -13,45 +13,45 @@ doctest(QuerySQLite) @testset "SQLite tutorial" begin -filename = joinpath(@__DIR__, "Chinook_Sqlite.sqlite") -database = Database(filename) -database2 = Database(DB(filename)) + filename = joinpath(@__DIR__, "Chinook_Sqlite.sqlite") + database = Database(filename) + database2 = Database(DB(filename)) -@test (database.Track |> + @test (database.Track |> @filter(_.AlbumId == 1) |> collect |> first).Name == "For Those About To Rock (We Salute You)" -@test database.Track |> + @test database.Track |> @map({_.TrackId, _.Name, _.Composer, _.UnitPrice}) |> collect |> first |> propertynames == (:TrackId, :Name, :Composer, :UnitPrice) -@test (database2.Customer |> + @test (database2.Customer |> @map({_.City, _.Country}) |> @orderby(_.Country) |> DataTable).Country[1] == "Argentina" -@test database.Customer |> + @test database.Customer |> @map({_.City}) |> @unique() |> collect |> length == 53 -@test database.Track |> + @test database.Track |> @map({_.TrackId, _.Name}) |> @take(10) |> collect |> length == 10 -@test first((database.Track |> + @test first((database.Track |> @map({_.TrackId, _.Name}) |> @take(10) |> @drop(10) |> DataTable).Name) == "C.O.D." -@test first(( + @test first(( @from i in database.Track begin @orderby descending(i.Bytes), i.Name @select {i.TrackId, i.Name, i.Bytes} @@ -59,7 +59,7 @@ database2 = Database(DB(filename)) end ).Bytes) == 1059546140 -@test first(( + @test first(( @from i in database.Track begin @orderby i.Bytes, descending(i.Name) @select {i.TrackId, i.Name, i.Bytes} @@ -67,18 +67,18 @@ database2 = Database(DB(filename)) end ).Bytes) == 38747 -@test database.Artist |> + @test database.Artist |> @join(database.Album, _.ArtistId, _.ArtistId, {_.ArtistId, __.AlbumId}) |> DataTable |> length == 347 -@test (database.Track |> + @test (database.Track |> @map({_.Name, _.Milliseconds, _.Bytes, _.AlbumId}) |> @filter(_.AlbumId == 1) |> collect |> first).Name == "For Those About To Rock (We Salute You)" -group_by_row = + group_by_row = database.Track |> @groupby(_.AlbumId) |> @map({ @@ -92,13 +92,13 @@ group_by_row = collect |> first -@test group_by_row.AlbumId == 1 -@test group_by_row.length == 10 -@test group_by_row.sum == 2400415 -@test group_by_row.min == 199836 -@test group_by_row.mean == 240041.5 + @test group_by_row.AlbumId == 1 + @test group_by_row.length == 10 + @test group_by_row.sum == 2400415 + @test group_by_row.min == 199836 + @test group_by_row.mean == 240041.5 -@test collect( + @test collect( database.Track |> @select(:AlbumId, :Composer) |> @mutate(bar = _.AlbumId * 2) @@ -108,13 +108,13 @@ end @testset "Systematic tests" begin -filename = joinpath(@__DIR__, "tmp", "test.sqlite") -isfile(filename) && rm(filename) -cp(joinpath(@__DIR__, "test.sqlite"), filename) + filename = joinpath(@__DIR__, "tmp", "test.sqlite") + isfile(filename) && rm(filename) + cp(joinpath(@__DIR__, "test.sqlite"), filename) -connection = DB(filename) -execute(Stmt(connection, """DROP TABLE IF EXISTS test""")) -execute(Stmt(connection, """ + connection = DB(filename) + execute(Stmt(connection, """DROP TABLE IF EXISTS test""")) + execute(Stmt(connection, """ CREATE TABLE test ( zero Int, one Int, @@ -131,12 +131,12 @@ execute(Stmt(connection, """ datetime_text Text, format Text )""")) -execute(Stmt(connection, """ + execute(Stmt(connection, """ INSERT INTO test VALUES(0, 1, -1, "ab", NULL, 65, "a", "b", " a ", "_a_", "a%", 1.11, "2019-12-08T11:09:00", "%Y-%m-%d %H:%M:%S") """)) -small = Database(connection) + small = Database(connection) -@test (small.test |> + @test (small.test |> @groupby(_.zero) |> @map({ join_test = join(_.ab) @@ -144,7 +144,7 @@ small = Database(connection) collect |> first).join_test == "ab" -result = + result = small.test |> @map({ equals_test = _.zero == _.one, @@ -202,58 +202,58 @@ result = collect |> first -@test result.equals_test == 0 -@test result.not_equals_test == 1 -@test result.not_test == 1 -@test result.and_test == 0 -@test result.or_test == 1 -@test result.times_test == 0 -@test result.divide_test == 0 -@test result.plus_test == 1 -@test result.minus_test == 1 -@test result.mod_test == 0 -@test result.abs_test == 1 -@test result.in_test == 1 -@test result.coalesce_test == 0 -@test result.if_else_test_1 == 1 -@test result.if_else_test_2 == 1 -@test result.if_else_test_3 == 0 -@test result.if_else_test_4 == 0 -@test result.if_else_test_5 == 0 -@test result.if_else_test_6 == 1 -@test result.if_else_test_7 == 1 -@test result.ismissing_test == 1 -@test result.max_test == 1 -@test result.min_test == 0 -@test result.occursin_test == 1 -@test result.occursin_test_2 == 1 -@test result.occursin_test_3 == 1 -@test result.uppercase_test == "AB" -@test result.lowercase_test == "ab" -@test result.char_test == "A" -@test result.instr_test_1 == 2 -@test result.instr_test_2 == 2 -@test result.instr_test_3 == 2 -@test result.hex_test == "6162" -@test result.strip_test == "a" -@test result.strip_test_2 == "a" -@test result.repr_test == "\'ab\'" -@test result.replace_test == "aa" -@test result.round_test_1 == 1.1 -@test result.round_test_2 == 1.0 -@test result.SubString_test_1 == "b" -@test result.SubString_test_2 == "b" -@test result.random_test isa DataValue{Int} -@test_broken length(result.randomstring_test) == 4 -@test_broken length(result.randomstring_test2) == 1 -@test result.format_test == "2019-12-08 11:09:00" -@test result.format_test_2 == "2019-12-08 11:09:00" -@test result.format_test_3 == "2019-12-08 11:09:00" -@test result.type_of_test == "integer" -@test result.string_test == "ab" + @test result.equals_test == 0 + @test result.not_equals_test == 1 + @test result.not_test == 1 + @test result.and_test == 0 + @test result.or_test == 1 + @test result.times_test == 0 + @test result.divide_test == 0 + @test result.plus_test == 1 + @test result.minus_test == 1 + @test result.mod_test == 0 + @test result.abs_test == 1 + @test result.in_test == 1 + @test result.coalesce_test == 0 + @test result.if_else_test_1 == 1 + @test result.if_else_test_2 == 1 + @test result.if_else_test_3 == 0 + @test result.if_else_test_4 == 0 + @test result.if_else_test_5 == 0 + @test result.if_else_test_6 == 1 + @test result.if_else_test_7 == 1 + @test result.ismissing_test == 1 + @test result.max_test == 1 + @test result.min_test == 0 + @test result.occursin_test == 1 + @test result.occursin_test_2 == 1 + @test result.occursin_test_3 == 1 + @test result.uppercase_test == "AB" + @test result.lowercase_test == "ab" + @test result.char_test == "A" + @test result.instr_test_1 == 2 + @test result.instr_test_2 == 2 + @test result.instr_test_3 == 2 + @test result.hex_test == "6162" + @test result.strip_test == "a" + @test result.strip_test_2 == "a" + @test result.repr_test == "\'ab\'" + @test result.replace_test == "aa" + @test result.round_test_1 == 1.1 + @test result.round_test_2 == 1.0 + @test result.SubString_test_1 == "b" + @test result.SubString_test_2 == "b" + @test result.random_test isa DataValue{Int} + @test_broken length(result.randomstring_test) == 4 + @test_broken length(result.randomstring_test2) == 1 + @test result.format_test == "2019-12-08 11:09:00" + @test result.format_test_2 == "2019-12-08 11:09:00" + @test result.format_test_3 == "2019-12-08 11:09:00" + @test result.type_of_test == "integer" + @test result.string_test == "ab" -drop!(connection, "test") + drop!(connection, "test") -@test_throws ArgumentError Database("file.not_sqlite") + @test_throws ArgumentError Database("file.not_sqlite") end