more todos

Author: bramtayl

Project.toml

@@ -8,6 +8,7 @@ Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 IteratorInterfaceExtensions = "82899510-4779-5014-852e-03e436cf321d"
 MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
 QueryOperators = "2aef5ad7-51ca-5a8f-8e88-e75cf067b44b"
+Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 SQLite = "0aa819cd-b072-5ff4-a722-6bc24af294d9"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 TableShowUtils = "5e66a065-1f0a-5976-b372-e0b8c017ca10"

src/QuerySQLite.jl

@@ -1,17 +1,18 @@
 module QuerySQLite
 
 import Base: !, &, |, ==, !=, *, /, +, -, %, abs, Char, coalesce, collect, convert, eltype, getproperty, length,
-lowercase, in, isdone, isequal, isless, ismissing, iterate, IteratorSize, max, min,
+lowercase, in, isdone, isequal, isless, ismissing, iterate, IteratorSize, join, max, min,
 occursin, rand, replace, repr, round, show, showerror, startswith, string, strip, SubString, uppercase
 using Base: Generator, NamedTuple, RefValue, SizeUnknown, tail
 using Base.Meta: quot
 import Base.Multimedia: showable
 using DataValues: DataValue
-import Dates: Date, DateTime, Time
+import Dates: Date, DateTime, format, Time
 import IteratorInterfaceExtensions: getiterator, isiterable
 import MacroTools
 using MacroTools: @capture
 import QueryOperators
+import Random: randstring
 import SQLite
 import SQLite: getvalue
 using SQLite: columns, DB, execute!, generate_namedtuple, juliatype,

src/code_instead.jl

@@ -152,22 +152,24 @@ end
 
 @code_instead abs SourceCode
 
+# TODO: add more methods
 @code_instead char SourceCode Vararg{Any}
 
 @code_instead coalesce SourceCode Vararg{Any}
 
 @code_instead convert Type{Int} SourceCode
 
-# TODO: support dateformat
 @code_instead Date SourceCode
 
-# TODO: support dateformat
 @code_instead DateTime SourceCode
 
 @code_instead QueryOperators.drop SourceCode Integer
 
 @code_instead QueryOperators.filter SourceCode Any Expr
 
+# TODO: support more methods
+@code_instead format SourceCode AbstractString
+
 @code_instead QueryOperators.groupby SourceCode Any Expr Any Expr
 
 @code_instead hex SourceCode
@@ -197,6 +199,8 @@ end
 
 @code_instead ismissing SourceCode
 
+@code_instead join SourceCode
+
 @code_instead QueryOperators.join SourceCode SourceCode Any Expr Any Expr Any Expr
 
 @code_instead max SourceCode Vararg{Any}
@@ -219,6 +223,9 @@ end
 
 @code_instead rand BySQL Type{Int}
 
+# TODO: add more methods
+@code_instead randstring BySQL Integer
+
 # TODO: add more methods
 @code_instead replace SourceCode Pair
 
@@ -254,11 +261,8 @@ end
 
 # TODO: add
 # printf
-# randomblob
 # zeroblob
-# group_concat
 # total
 # julianday
-# strftime
 
 # TODO: regex start and end

src/translate.jl

@@ -95,6 +95,14 @@ function translate_call(::typeof(QueryOperators.filter), iterator, call, call_ex
     )
 end
 
+function translate_call(::typeof(format), time_type, format_string; _primary = true)
+    SQLExpression(
+        :STRFTIME,
+        translate(format_string; _primary = _primary),
+        translate(time_type; _primary = _primary)
+    )
+end
+
 function translate_call(::typeof(getproperty), source_tables::Database, table_name; _primary = true)
     translated = translate(table_name; _primary = _primary)
     if _primary
@@ -137,6 +145,8 @@ end
 
 @translate_default ::typeof(ismissing) Symbol("IS NULL")
 
+@translate_default ::typeof(join) :GROUP_CONCAT
+
 function translate_call(::typeof(QueryOperators.join), source1, source2, key1, key1_expression, key2, key2_expression, combine, combine_expression; _primary = true)
     model_row_1 = model_row(source1)
     model_row_2 = model_row(source2)
@@ -215,6 +225,8 @@ function translate_call(::typeof(rand), ::Type{Int}; _primary = true, digits = 0
     SQLExpression(:RANDOM)
 end
 
+@translate_default ::typeof(randstring) :RANDOMBLOB
+
 function translate_call(::typeof(replace), it, pair; _primary = true)
     SQLExpression(:REPLACE,
         translate(it; _primary = _primary),

test/runtests.jl

@@ -1,7 +1,7 @@
 using QuerySQLite
 
 using DataValues: DataValue
-using Dates: Date, DateTime, Time
+using Dates: Date, DateTime, format, Time
 using Documenter: doctest
 using Query
 using QueryTables
@@ -125,10 +125,18 @@ execute!(Stmt(connection, """
 execute!(Stmt(connection, """
     INSERT INTO test VALUES(0, 1, -1, "ab", NULL, 65, "b", " a ", "_a_", 1.11, "2019-12-08", "2019-12-08T11:09:00", "11:09:00")
 """))
-database = Database(connection)
+small = Database(connection)
+
+@test (small.test |>
+    @groupby(_.zero) |>
+    @map({
+        join_test = join(_.ab)
+    }) |>
+    collect |>
+    first).join_test == "ab"
 
 result =
-    database.test |>
+    small.test |>
     @map({
         equals_test = _.zero == _.one,
         not_equals_test = _.zero != _.one,
@@ -170,9 +178,12 @@ result =
         SubString_test_1 = SubString(_.ab, 2, 2),
         SubString_test_2 = SubString(_.ab, 2),
         random_test = rand(BySQL(_), Int),
+        # TODO: fix
+        # randstring_test = randstring(BySQL(_), 4),
         date_test = Date(_.date_text),
         datetime_test = DateTime(_.datetime_text),
-        time_test= Time(_.time_text),
+        time_test = Time(_.time_text),
+        format_test = format(_.datetime_text, "%Y-%m-%d %H:%M:%S"),
         type_of_test = type_of(_.zero),
         convert_test = convert(Int, _.b)
     }) |>
@@ -219,8 +230,10 @@ result =
 @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 result.date_test == "2019-12-08"
 @test result.datetime_test == "2019-12-08 11:09:00"
+@test result.format_test == "2019-12-08 11:09:00"
 @test result.time_test == "11:09:00"
 @test result.type_of_test == "integer"