more functions

Author: bramtayl

Project.toml

@@ -10,6 +10,7 @@ SQLite = "0aa819cd-b072-5ff4-a722-6bc24af294d9"
 TableTraits = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c"
 DataValues = "e7dc6d0d-1eca-5fa6-8ad6-5aecde8b7ea5"
 TableShowUtils = "5e66a065-1f0a-5976-b372-e0b8c017ca10"
+Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

src/QuerySQLite.jl

@@ -16,11 +16,13 @@ import SQLite: getvalue
 using SQLite: columns, DB, execute!, generate_namedtuple, juliatype,
 SQLITE_DONE, SQLITE_NULL, SQLITE_ROW, sqlite3_column_count, sqlite3_column_name,
 sqlite3_column_type, sqlite3_step, sqlitevalue, Stmt, tables
+import Statistics: mean, sum
 using TableShowUtils: printdataresource, printHTMLtable, printtable
 import TableTraits: isiterabletable
 
 export Database
 
+include("functions.jl")
 include("utilities.jl")
 include("database.jl")
 include("code_instead.jl")

src/code_instead.jl

@@ -107,6 +107,8 @@ end
 
 @code_instead abs SourceCode
 
+@code_instead char SourceCode Vararg{Any}
+
 @code_instead coalesce SourceCode Vararg{Any}
 
 @code_instead QueryOperators.drop SourceCode Integer
@@ -126,6 +128,10 @@ end
 # TODO: add more methods
 @code_instead in SourceCode Any
 
+@code_instead instr SourceCode Any
+@code_instead instr Any SourceCode
+@code_instead instr SourceCode SourceCode
+
 @code_instead isequal SourceCode Any
 @code_instead isequal Any SourceCode
 @code_instead isequal SourceCode SourceCode
@@ -140,10 +146,14 @@ end
 
 @code_instead max SourceCode Vararg{Any}
 
+@code_instead mean SourceCode
+
 @code_instead min SourceCode Vararg{Any}
 
 @code_instead length SourceCode
 
+@code_instead lowercase SourceCode
+
 @code_instead QueryOperators.map SourceCode Any Expr
 
 @code_instead occursin Regex SourceCode
@@ -160,21 +170,15 @@ end
 
 @code_instead QueryOperators.thenby_descending SourceCode Any Expr
 
+@code_instead sum SourceCode
+
 # TODO: add more methods
 @code_instead QueryOperators.unique SourceCode Any Expr
 
 @code_instead uppercase SourceCode
 
 # TODO: add
-# char
-# glob
 # hex
-# ifnull
-# instr
-# like
-# lower
-# ltrim
-# nullif
 # printf
 # quote
 # random
@@ -185,14 +189,13 @@ end
 # trim
 # typeof
 # unicode
-# upper
 # zeroblob
-# avg
 # group_concat
-# sum
 # total
 # date
 # time
 # datetime
 # julianday
 # strftime
+
+# TODO: regex start and end

src/translate.jl

@@ -6,6 +6,10 @@ struct SQLExpression
     SQLExpression(call, arguments...) = new(call, arguments)
 end
 
+function translate(something::AbstractString; primary = true)
+    repr(something)
+end
+
 function translate(something; primary = true)
     something
 end
@@ -61,7 +65,7 @@ function as(pair; primary = true)
     )
 end
 
-@translate_default ::Type{Char} :CHAR
+@translate_default ::typeof(char) :CHAR
 
 @translate_default ::typeof(coalesce) :COALESCE
 
@@ -109,6 +113,8 @@ end
 
 @translate_default ::typeof(in) :IN
 
+@translate_default ::typeof(instr) :INSTR
+
 @translate_default ::typeof(isequal) Symbol("IS NOT DISTINCT FROM")
 
 @translate_default ::typeof(isless) :<
@@ -155,6 +161,8 @@ end
 
 @translate_default ::typeof(max) :max
 
+@translate_default ::typeof(mean) :AVG
+
 @translate_default ::typeof(min) :min
 
 translate_call(::typeof(occursin), needle::Regex, haystack; primary = true) =
@@ -183,6 +191,8 @@ end
 
 @translate_default ::typeof(string) :||
 
+@translate_default ::typeof(sum) :SUM
+
 @translate_default ::typeof(QueryOperators.take) :LIMIT
 
 function translate_call(::typeof(QueryOperators.thenby), unordered, key_function, key_function_expression; primary = true)

src/utilities.jl

@@ -58,40 +58,3 @@ function split_call(call_expression::Expr)
         error("$call_expression is not a function call")
     end
 end
-
-"""
-    if_else(switch, yes, no)
-
-`ifelse` that you can add methods to.
-
-```jldoctest
-julia> using QuerySQLite
-
-julia> if_else(true, 1, 0)
-1
-
-julia> if_else(false, 1, 0)
-0
-```
-"""
-function if_else(switch, yes, no)
-    ifelse(switch, yes, no)
-end
-export if_else
-
-"""
-    type_of(it)
-
-`typeof` that you can add methods to.
-
-```jldoctest
-julia> using QuerySQLite
-
-julia> type_of('a')
-Char
-```
-"""
-function type_of(it)
-    typeof(it)
-end
-export type_of

test/runtests.jl

@@ -1,8 +1,9 @@
+using QuerySQLite
 using Query
 using Test
-using QuerySQLite
 using SQLite: DB, drop!, execute!, Stmt
 using QueryTables
+using Statistics: mean
 
 @testset "SQLite tutorial" begin
 
@@ -60,18 +61,32 @@ database2 = Database(DB(filename))
     DataTable |>
     length == 347
 
-@test (database.Track |>
-    @groupby(_.AlbumId) |>
-    @map({AlbumId = key(_), Count = length(_.AlbumId)}) |>
-    collect |>
-    first).Count == 10
-
 @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 =
+    database.Track |>
+    @groupby(_.AlbumId) |>
+    @map({
+        AlbumId = key(_),
+        length = length(_.AlbumId),
+        sum = sum(_.Milliseconds),
+        min = min(_.Milliseconds),
+        max = max(_.Milliseconds),
+        mean = mean(_.Milliseconds)
+    }) |>
+    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
+
 end
 
 @testset "Systematic tests" begin
@@ -85,10 +100,12 @@ execute!(Stmt(connection, """
         b Int,
         c Int,
         d Text,
-        e Int
+        e Int,
+        f Int,
+        g Text
     )"""))
 execute!(Stmt(connection, """
-    INSERT INTO test VALUES(0, 1, -1, "ab", NULL)
+    INSERT INTO test VALUES(0, 1, -1, "ab", NULL, 65, "b")
 """))
 database = Database(connection)
 result =
@@ -113,10 +130,15 @@ result =
         if_else_test_6 = if_else(_.b, _.b, 0),
         if_else_test_7 = if_else(_.b, _.b, _.a),
         ismissing_test = ismissing(_.e),
+        lowercase_test = lowercase(_.d),
         max_test = max(_.b, 0),
         min_test = min(_.a, 1),
-        occursin_test = occursin(r"a.*", _.d),
-        uppercase_test = uppercase(_.d)
+        occursin_test = occursin(r"A.*", _.d),
+        uppercase_test = uppercase(_.d),
+        char_test = char(_.f),
+        instr_test_1 = instr(_.d, "b"),
+        instr_test_2 = instr("ab", _.g),
+        instr_test_3 = instr(_.d, _.g)
     }) |>
     collect |>
     first
@@ -144,9 +166,17 @@ result =
 @test result.min_test == 0
 @test result.occursin_test == 1
 @test result.uppercase_test == "AB"
+@test result.lowercase_test == "ab"
+@test result.char_test == "A"
+# TODO: fix
+@test_broken result.instr_test_1 == 2
+@test result.instr_test_2 == 2
+@test result.instr_test_3 == 2
 
 drop!(connection, "test")
 
 @test_throws ArgumentError Database("file.not_sqlite")
 
 end
+
+# TODO: add doctests as tests