Skip to content

Commit dfc7fc0

Browse files
committed
query: select legacy code
1 parent c454f2d commit dfc7fc0

File tree

1 file changed

+23
-8
lines changed

1 file changed

+23
-8
lines changed

src/sqlbuilderpkg/select_legacy.nim

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
# Copyright 2020 - Thomas T. Jarløv
22

33
when NimMajor >= 2:
4-
import
5-
db_connector/db_common
4+
import db_connector/db_common
65
else:
7-
import
8-
std/db_common
6+
import std/db_common
97

108
import
119
std/macros,
@@ -21,9 +19,15 @@ import
2119

2220

2321
proc sqlSelect*(
24-
table: string, data: varargs[string], left: varargs[string], whereC: varargs[string], access: string, accessC: string, user: string,
22+
table: string,
23+
data: varargs[string],
24+
left: varargs[string],
25+
whereC: varargs[string],
26+
access: string,
27+
accessC: string,
28+
user: string,
2529
args: ArgsContainer.query = @[],
26-
hideIsDeleted: bool = true,
30+
useDeleteMarker: bool = true,
2731
tablesWithDeleteMarker: varargs[string] = (when declared(tablesWithDeleteMarkerInit): tablesWithDeleteMarkerInit else: []), #@[],
2832
deleteMarker = ".is_deleted IS NULL",
2933
): SqlQuery {.deprecated.} =
@@ -84,13 +88,16 @@ proc sqlSelect*(
8488
whereInValue = @[access],
8589
customSQL = user,
8690
checkedArgs = args,
87-
hideIsDeleted = hideIsDeleted,
91+
useDeleteMarker = useDeleteMarker,
8892
tablesWithDeleteMarker = tablesWithDeleteMarker,
8993
deleteMarker = deleteMarker
9094
)
9195

9296

9397
#[
98+
##
99+
## Raw legacy procedure
100+
##
94101
proc sqlSelect*(table: string, data: varargs[string], left: varargs[string], whereC: varargs[string], access: string, accessC: string, user: string): SqlQuery =
95102
## SQL builder for SELECT queries
96103
## Does NOT check for NULL values
@@ -193,7 +200,15 @@ proc sqlSelect*(table: string, data: varargs[string], left: varargs[string], whe
193200
result = sql(res & " FROM " & table & lef & wes & acc & " " & user)
194201
]#
195202

196-
macro sqlSelectMacro*(table: string, data: varargs[string], left: varargs[string], whereC: varargs[string], access: string, accessC: string, user: string): SqlQuery {.deprecated.} =
203+
macro sqlSelectMacro*(
204+
table: string,
205+
data: varargs[string],
206+
left: varargs[string],
207+
whereC: varargs[string],
208+
access: string,
209+
accessC: string,
210+
user: string
211+
): SqlQuery {.deprecated.} =
197212
## SQL builder for SELECT queries
198213
## Does NOT check for NULL values
199214

0 commit comments

Comments
 (0)