|
1 | | -function generate_namedtuple(::Type{NamedTuple{names, types}}, q) where {names, types} |
| 1 | +function generate_namedtuple(::Type{NamedTuple{names,types}}, q) where {names,types} |
2 | 2 | if @generated |
3 | 3 | vals = Tuple(:(getvalue(q, $i, $(fieldtype(types, i)))) for i = 1:fieldcount(types)) |
4 | | - return :(NamedTuple{names, types}(($(vals...),))) |
| 4 | + return :(NamedTuple{names,types}(($(vals...),))) |
5 | 5 | else |
6 | | - return NamedTuple{names, types}(Tuple(getvalue(q, i, fieldtype(types, i)) for i = 1:fieldcount(types))) |
| 6 | + return NamedTuple{names,types}(Tuple(getvalue(q, i, fieldtype(types, i)) for i = 1:fieldcount(types))) |
7 | 7 | end |
8 | 8 | end |
9 | 9 |
|
@@ -44,14 +44,14 @@ function getvalue(cursor::SQLiteCursor, column_number::Int, ::Type{Value}) where |
44 | 44 | julia_type = juliatype(column_type) # native SQLite Int, Float, and Text types |
45 | 45 | sqlitevalue( |
46 | 46 | if julia_type === Any |
47 | | - if !isbitstype(Value) |
48 | | - Value |
49 | | - else |
50 | | - julia_type |
51 | | - end |
| 47 | + if !isbitstype(Value) |
| 48 | + Value |
52 | 49 | else |
53 | 50 | julia_type |
54 | | - end, handle, column_number) |
| 51 | + end |
| 52 | + else |
| 53 | + julia_type |
| 54 | + end, handle, column_number) |
55 | 55 | end |
56 | 56 | end |
57 | 57 |
|
@@ -118,14 +118,11 @@ function getiterator(source_code::SourceCode) |
118 | 118 | handle = statement.handle |
119 | 119 | schema = ntuple( |
120 | 120 | let handle = handle |
121 | | - column_number -> name_and_type(handle, column_number) |
122 | | - end, |
| 121 | + column_number->name_and_type(handle, column_number) |
| 122 | + end, |
123 | 123 | sqlite3_column_count(handle) |
124 | 124 | ) |
125 | | - SQLiteCursor{NamedTuple{ |
126 | | - Tuple(map(first, schema)), |
127 | | - Tuple{map(second, schema)...} |
128 | | - }}(statement, Ref(status), Ref(0)) |
| 125 | + SQLiteCursor{NamedTuple{Tuple(map(first, schema)),Tuple{map(second, schema)...}}}(statement, Ref(status), Ref(0)) |
129 | 126 | end |
130 | 127 |
|
131 | 128 | # Use default show methods from the queryverse |
|
0 commit comments