LBRYCommunity/sqlboiler
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Fix MySQL return query optimization.

Browse source 
- Before, this could erroneously detect that it could do without the
  return query because it thought all we wanted was the id. Now with
  this fix it should properly discard the query when all we want is id.
This commit is contained in:
Aaron L 2016-09-15 22:28:23 -07:00
parent bac82b6f0e
commit b0b0ff87c6
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
templates/12_insert.tpl
View file

@ -104,7 +104,8 @@ func (o *{{$tableNameSingular}}) Insert(exec boil.Executor, whitelist ... string
if lastID != 0 { if lastID != 0 {
{{- $colName := index .Table.PKey.Columns 0 -}} {{- $colName := index .Table.PKey.Columns 0 -}}
{{- $col := .Table.GetColumn $colName -}} {{- $col := .Table.GetColumn $colName -}}
o.{{$colName | singular | titleCase}} = {{$col.Type}}(lastID) {{- $colTitled := $colName | singular | titleCase}}
o.{{$colTitled}} = {{$col.Type}}(lastID)
identifierCols = []interface{}{lastID} identifierCols = []interface{}{lastID}
} else { } else {
identifierCols = []interface{}{ identifierCols = []interface{}{
@ -114,7 +115,7 @@ func (o *{{$tableNameSingular}}) Insert(exec boil.Executor, whitelist ... string
} }
} }
if lastID != 0 && len(cache.retMapping) == 1 { if lastID == 0 || len(cache.retMapping) != 1 || cache.retMapping[0] == {{$varNameSingular}}Mapping["{{$colTitled}}"] {
if boil.DebugMode { if boil.DebugMode {
fmt.Fprintln(boil.DebugWriter, cache.retQuery) fmt.Fprintln(boil.DebugWriter, cache.retQuery)
fmt.Fprintln(boil.DebugWriter, identifierCols...) fmt.Fprintln(boil.DebugWriter, identifierCols...)

5
templates/14_upsert.tpl
View file

@ -145,7 +145,8 @@ func (o *{{$tableNameSingular}}) Upsert(exec boil.Executor, {{if ne .DriverName
if lastID != 0 { if lastID != 0 {
{{- $colName := index .Table.PKey.Columns 0 -}} {{- $colName := index .Table.PKey.Columns 0 -}}
{{- $col := .Table.GetColumn $colName -}} {{- $col := .Table.GetColumn $colName -}}
o.{{$colName | singular | titleCase}} = {{$col.Type}}(lastID) {{- $colTitled := $colName | singular | titleCase}}
o.{{$colTitled}} = {{$col.Type}}(lastID)
identifierCols = []interface{}{lastID} identifierCols = []interface{}{lastID}
} else { } else {
identifierCols = []interface{}{ identifierCols = []interface{}{
@ -155,7 +156,7 @@ func (o *{{$tableNameSingular}}) Upsert(exec boil.Executor, {{if ne .DriverName
} }
} }
if lastID != 0 && len(cache.retMapping) == 1 { if lastID == 0 || len(cache.retMapping) != 1 || cache.retMapping[0] == {{$varNameSingular}}Mapping["{{$colTitled}}"] {
if boil.DebugMode { if boil.DebugMode {
fmt.Fprintln(boil.DebugWriter, cache.retQuery) fmt.Fprintln(boil.DebugWriter, cache.retQuery)
fmt.Fprintln(boil.DebugWriter, identifierCols...) fmt.Fprintln(boil.DebugWriter, identifierCols...)