more remaining TODOs

Author: bramtayl

.gitignore

@@ -3,3 +3,4 @@
 *.jl.mem
 .vscode
 docs/build
+test/test.sqlite

docs/src/index.md

@@ -18,6 +18,10 @@ Patterns like `if` and functions like `ifelse` and `typeof` can't be overloaded.
 
 If you would like to translate code to SQL, but you do not pass any SQL arguments, you will need to use [`BySQL`](@ref) to pass a dummy SQL object instead. See the `BySQL` docstring for more information.
 
+### Pattern matching
+
+Use SQLite syntax, not Julia syntax, for pattern matching for regular expressions and date formats.
+
 ## Developer documentation
 
 QuerySQLite hijacks Julia's multiple dispatch to translate external database commands to SQL instead of evaluating them. To do this, it constructs a "model_row" that represents the structure of a row of data. If you would like to add support for a new function, there are only a few steps:

src/QuerySQLite.jl

@@ -7,7 +7,7 @@ using Base: Generator, NamedTuple, RefValue, SizeUnknown, tail
 using Base.Meta: quot
 import Base.Multimedia: showable
 using DataValues: DataValue
-import Dates: Date, DateTime, format, Time
+import Dates: format
 import IteratorInterfaceExtensions: getiterator, isiterable
 import MacroTools
 using MacroTools: @capture

src/code_instead.jl

@@ -159,16 +159,13 @@ end
 
 @code_instead convert Type{Int} SourceCode
 
-@code_instead Date SourceCode
-
-@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 format AbstractString SourceCode
+@code_instead format SourceCode SourceCode
 
 @code_instead QueryOperators.groupby SourceCode Any Expr Any Expr
 
@@ -215,18 +212,19 @@ end
 
 @code_instead QueryOperators.map SourceCode Any Expr
 
-@code_instead occursin Regex SourceCode
+@code_instead occursin AbstractString SourceCode
+@code_instead occursin SourceCode AbstractString
+@code_instead occursin SourceCode SourceCode
 
 @code_instead QueryOperators.orderby SourceCode Any Expr
 
 @code_instead QueryOperators.orderby_descending SourceCode Any Expr
 
 @code_instead rand BySQL Type{Int}
 
-# TODO: add more methods
 @code_instead randstring BySQL Integer
+@code_instead randstring SourceCode
 
-# TODO: add more methods
 @code_instead replace SourceCode Pair
 
 @code_instead repr SourceCode
@@ -235,6 +233,9 @@ end
 
 @code_instead secondary SourceCode
 
+# TODO: add more methods
+@code_instead string SourceCode Vararg{Any}
+
 @code_instead strip SourceCode
 @code_instead strip SourceCode Char
 
@@ -249,20 +250,12 @@ end
 
 @code_instead QueryOperators.thenby_descending SourceCode Any Expr
 
-# TODO: support dateformat
-@code_instead Time SourceCode
-
 @code_instead type_of SourceCode
 
-# TODO: add more methods
 @code_instead QueryOperators.unique SourceCode Any Expr
 
 @code_instead uppercase SourceCode
 
 # TODO: add
 # printf
 # zeroblob
-# total
-# julianday
-
-# TODO: regex start and end

src/show.jl

@@ -100,6 +100,8 @@ function show(io::IO, sql_expression::SQLExpression)
         infix(io, call, arguments...)
     elseif call === :%
         infix(io, call, arguments...)
+    elseif call === :||
+        infix(io, call, arguments...)
     elseif call === :AND
         infix(io, call, arguments...)
     elseif call === :AS

src/translate.jl

@@ -80,10 +80,6 @@ function translate_call(::typeof(convert), ::Type{Int}, it; _primary = true)
     SQLExpression(:UNICODE, translate(it))
 end
 
-@translate_default ::Type{Date} :DATE
-
-@translate_default ::Type{DateTime} :DATETIME
-
 @translate_default ::typeof(hex) :HEX
 
 @translate_default ::typeof(QueryOperators.drop) :OFFSET
@@ -195,12 +191,11 @@ end
 
 @translate_default ::typeof(min) :min
 
-translate_call(::typeof(occursin), needle::Regex, haystack; _primary = true) =
+translate_call(::typeof(occursin), needle, haystack; _primary = true) =
     SQLExpression(
         :LIKE,
         translate(haystack; _primary = _primary),
-        # * => %, . => _
-        translate(replace(replace(needle.pattern, r"(?<!\\)\.\*" => "%"), r"(?<!\\)\." => "_"))
+        translate(needle; _primary = _primary)
     )
 
 function translate_call(::typeof(QueryOperators.orderby), unordered, key_function, key_function_expression; _primary = true)
@@ -268,8 +263,6 @@ function translate_call(::typeof(QueryOperators.thenby_descending), unordered, k
     )
 end
 
-@translate_default ::Type{Time} :Time
-
 @translate_default ::typeof(type_of) :TYPEOF
 
 function translate_call(::typeof(QueryOperators.unique), repeated, key_function, key_function_expression; _primary = true)

test/runtests.jl

@@ -114,16 +114,17 @@ execute!(Stmt(connection, """
         ab Text,
         null_column Int,
         A_code Int,
+        a Text,
         b Text,
         a_space Text,
         a_underscore Text,
+        a_wild Text,
         one_point_one_one Real,
-        date_text Text,
         datetime_text Text,
-        time_text Text
+        format Text
     )"""))
 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")
+    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)
 
@@ -162,7 +163,9 @@ result =
         lowercase_test = lowercase(_.ab),
         max_test = max(_.one, 0),
         min_test = min(_.zero, 1),
-        occursin_test = occursin(r"A.*", _.ab),
+        occursin_test = occursin("a%", _.ab),
+        occursin_test_2 = occursin(_.a_wild, "ab"),
+        occursin_test_3 = occursin(_.a_wild, _.ab),
         uppercase_test = uppercase(_.ab),
         char_test = char(_.A_code),
         instr_test_1 = instr(_.ab, "b"),
@@ -180,12 +183,13 @@ result =
         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),
+        # randstring_test2 = randstring(_.one),
         format_test = format(_.datetime_text, "%Y-%m-%d %H:%M:%S"),
+        format_test_2 = format("2019-12-08T11:09:00", _.format),
+        format_test_3 = format(_.datetime_text, _.format),
         type_of_test = type_of(_.zero),
-        convert_test = convert(Int, _.b)
+        convert_test = convert(Int, _.b),
+        string_test = string(_.a, _.b)
     }) |>
     collect |>
     first
@@ -214,6 +218,8 @@ result =
 @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"
@@ -231,11 +237,12 @@ result =
 @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_broken length(result.randomstring_test2) == 1
 @test result.format_test == "2019-12-08 11:09:00"
-@test result.time_test == "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")