Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Vladimir Barsukov
zGo
Commits
c730f5f1
Commit
c730f5f1
authored
2 months ago
by
Vladimir Barsukov
Browse files
Options
Download
Email Patches
Plain Diff
fix sql prepare
parent
45bffcb4
master
v1.6.3
v1.6.2
v1.6.1
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
zdb/exec.go
+2
-2
zdb/exec.go
zdb/get.go
+5
-5
zdb/get.go
zdb/select.go
+6
-6
zdb/select.go
with
13 additions
and
13 deletions
+13
-13
zdb/exec.go
+
2
-
2
View file @
c730f5f1
...
...
@@ -6,13 +6,13 @@ func (d *Pool) WExec(sql string, args ...any) error {
func
(
d
*
Pool
)
WExecNamed
(
sql
string
,
args
map
[
string
]
any
)
error
{
newSql
,
newArgs
:=
d
.
prepare
(
sql
,
args
)
return
d
.
qExec
(
d
.
SrvMaster
,
newSql
,
newArgs
)
return
d
.
qExec
(
d
.
SrvMaster
,
newSql
,
newArgs
...
)
}
func
(
d
*
Pool
)
WExecOpts
(
opts
Opts
)
error
{
sql
,
args
:=
opts
.
Opts
()
newSql
,
newArgs
:=
d
.
prepare
(
sql
,
args
)
return
d
.
qExec
(
d
.
SrvMaster
,
newSql
,
newArgs
)
return
d
.
qExec
(
d
.
SrvMaster
,
newSql
,
newArgs
...
)
}
func
(
d
*
Pool
)
qExec
(
q
*
Conn
,
sql
string
,
args
...
any
)
error
{
...
...
This diff is collapsed.
Click to expand it.
zdb/get.go
+
5
-
5
View file @
c730f5f1
...
...
@@ -10,13 +10,13 @@ func (d *Pool) WGet(dst any, sql string, args ...any) error {
func
(
d
*
Pool
)
WGetNamed
(
dst
any
,
sql
string
,
args
map
[
string
]
any
)
error
{
newSql
,
newArgs
:=
d
.
prepare
(
sql
,
args
)
return
d
.
qGet
(
d
.
SrvMaster
,
dst
,
newSql
,
newArgs
)
return
d
.
qGet
(
d
.
SrvMaster
,
dst
,
newSql
,
newArgs
...
)
}
func
(
d
*
Pool
)
WGetOpts
(
dst
any
,
opts
Opts
)
error
{
sql
,
args
:=
opts
.
Opts
()
newSql
,
newArgs
:=
d
.
prepare
(
sql
,
args
)
return
d
.
qGet
(
d
.
SrvMaster
,
dst
,
newSql
,
newArgs
)
return
d
.
qGet
(
d
.
SrvMaster
,
dst
,
newSql
,
newArgs
...
)
}
func
(
d
*
Pool
)
Get
(
dst
any
,
sql
string
,
args
...
any
)
error
{
...
...
@@ -36,7 +36,7 @@ func (d *Pool) GetOpts(dst any, opts Opts) error {
newSql
,
newArgs
:=
d
.
prepare
(
sql
,
args
)
return
d
.
execWrapper
(
ConnModeSync
,
dst
,
func
(
q
*
Conn
,
dst1
any
)
error
{
return
d
.
qGet
(
q
,
dst1
,
newSql
,
newArgs
)
return
d
.
qGet
(
q
,
dst1
,
newSql
,
newArgs
...
)
})
}
...
...
@@ -49,7 +49,7 @@ func (d *Pool) GetAsyncNamed(dst any, sql string, args map[string]any) error {
return
d
.
execWrapper
(
ConnModeAsync
,
dst
,
func
(
q
*
Conn
,
dst1
any
)
error
{
newSql
,
newArgs
:=
d
.
prepare
(
sql
,
args
)
return
d
.
qGet
(
q
,
dst1
,
newSql
,
newArgs
)
return
d
.
qGet
(
q
,
dst1
,
newSql
,
newArgs
...
)
})
}
func
(
d
*
Pool
)
GetAsyncOpts
(
dst
any
,
opts
Opts
)
error
{
...
...
@@ -58,7 +58,7 @@ func (d *Pool) GetAsyncOpts(dst any, opts Opts) error {
return
d
.
execWrapper
(
ConnModeAsync
,
dst
,
func
(
q
*
Conn
,
dst1
any
)
error
{
return
d
.
qGet
(
q
,
dst1
,
newSql
,
newArgs
)
return
d
.
qGet
(
q
,
dst1
,
newSql
,
newArgs
...
)
})
}
...
...
This diff is collapsed.
Click to expand it.
zdb/select.go
+
6
-
6
View file @
c730f5f1
...
...
@@ -10,13 +10,13 @@ func (d *Pool) WSelect(dst any, sql string, args ...any) error {
func
(
d
*
Pool
)
WSelectNamed
(
dst
any
,
sql
string
,
args
map
[
string
]
any
)
error
{
newSql
,
newArgs
:=
d
.
prepare
(
sql
,
args
)
return
d
.
qSelect
(
d
.
SrvMaster
,
dst
,
newSql
,
newArgs
)
return
d
.
qSelect
(
d
.
SrvMaster
,
dst
,
newSql
,
newArgs
...
)
}
func
(
d
*
Pool
)
WSelectOpts
(
dst
any
,
opts
Opts
)
error
{
sql
,
args
:=
opts
.
Opts
()
newSql
,
newArgs
:=
d
.
prepare
(
sql
,
args
)
return
d
.
qSelect
(
d
.
SrvMaster
,
dst
,
newSql
,
newArgs
)
return
d
.
qSelect
(
d
.
SrvMaster
,
dst
,
newSql
,
newArgs
...
)
}
func
(
d
*
Pool
)
Select
(
dst
any
,
sql
string
,
args
...
any
)
error
{
...
...
@@ -28,7 +28,7 @@ func (d *Pool) SelectNamed(dst any, sql string, args map[string]any) error {
return
d
.
execWrapper
(
ConnModeSync
,
dst
,
func
(
conn
*
Conn
,
dst1
any
)
error
{
newSql
,
newArgs
:=
d
.
prepare
(
sql
,
args
)
return
d
.
qSelect
(
conn
,
dst1
,
newSql
,
newArgs
)
return
d
.
qSelect
(
conn
,
dst1
,
newSql
,
newArgs
...
)
})
}
func
(
d
*
Pool
)
SelectOpts
(
dst
any
,
opts
Opts
)
error
{
...
...
@@ -36,7 +36,7 @@ func (d *Pool) SelectOpts(dst any, opts Opts) error {
newSql
,
newArgs
:=
d
.
prepare
(
sql
,
args
)
return
d
.
execWrapper
(
ConnModeSync
,
dst
,
func
(
conn
*
Conn
,
dst1
any
)
error
{
return
d
.
qSelect
(
conn
,
dst1
,
newSql
,
newArgs
)
return
d
.
qSelect
(
conn
,
dst1
,
newSql
,
newArgs
...
)
})
}
...
...
@@ -49,7 +49,7 @@ func (d *Pool) SelectAsyncNamed(dst any, sql string, args map[string]any) error
return
d
.
execWrapper
(
ConnModeAsync
,
dst
,
func
(
conn
*
Conn
,
dst1
any
)
error
{
newSql
,
newArgs
:=
d
.
prepare
(
sql
,
args
)
return
d
.
qSelect
(
conn
,
dst1
,
newSql
,
newArgs
)
return
d
.
qSelect
(
conn
,
dst1
,
newSql
,
newArgs
...
)
})
}
func
(
d
*
Pool
)
SelectAsyncOpts
(
dst
any
,
opts
Opts
)
error
{
...
...
@@ -57,7 +57,7 @@ func (d *Pool) SelectAsyncOpts(dst any, opts Opts) error {
newSql
,
newArgs
:=
d
.
prepare
(
sql
,
args
)
return
d
.
execWrapper
(
ConnModeAsync
,
dst
,
func
(
conn
*
Conn
,
dst1
any
)
error
{
return
d
.
qSelect
(
conn
,
dst1
,
newSql
,
newArgs
)
return
d
.
qSelect
(
conn
,
dst1
,
newSql
,
newArgs
...
)
})
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets