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

Fix non-int comparisons

Browse source
This commit is contained in:
Patrick O'brien 2016-09-17 13:13:44 +10:00
parent ab67fddac3
commit 6c13b63500
3 changed files with 32 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
templates/12_insert.tpl
View file

@ -100,20 +100,23 @@ func (o *{{$tableNameSingular}}) Insert(exec boil.Executor, whitelist ... string
if err != nil { if err != nil {
return ErrSyncFail return ErrSyncFail
} }
if lastID != 0 { {{- $colName := index .Table.PKey.Columns 0 -}}
{{- $colName := index .Table.PKey.Columns 0 -}} {{- $col := .Table.GetColumn $colName -}}
{{- $col := .Table.GetColumn $colName -}} {{- $colTitled := $colName | singular | titleCase}}
{{- $colTitled := $colName | singular | titleCase}} {{if eq 1 (len .Table.PKey.Columns)}}
o.{{$colTitled}} = {{$col.Type}}(lastID) {{$cnames := .Table.Columns | filterColumnsByDefault true | columnNames}}
identifierCols = []interface{}{lastID} {{if setInclude $colName $cnames}}
} else { o.{{$colTitled}} = {{$col.Type}}(lastID)
identifierCols = []interface{}{ identifierCols = []interface{}{lastID}
{{range .Table.PKey.Columns -}} {{end}}
o.{{. | singular | titleCase}}, {{else}}
{{end -}} identifierCols = []interface{}{
} {{range .Table.PKey.Columns -}}
o.{{. | singular | titleCase}},
{{end -}}
} }
{{end}}
if lastID == 0 || len(cache.retMapping) != 1 || cache.retMapping[0] == {{$varNameSingular}}Mapping["{{$colTitled}}"] { if lastID == 0 || len(cache.retMapping) != 1 || cache.retMapping[0] == {{$varNameSingular}}Mapping["{{$colTitled}}"] {
if boil.DebugMode { if boil.DebugMode {

27
templates/14_upsert.tpl
View file

@ -142,19 +142,22 @@ func (o *{{$tableNameSingular}}) Upsert(exec boil.Executor, {{if ne .DriverName
return ErrSyncFail return ErrSyncFail
} }
if lastID != 0 { {{- $colName := index .Table.PKey.Columns 0 -}}
{{- $colName := index .Table.PKey.Columns 0 -}} {{- $col := .Table.GetColumn $colName -}}
{{- $col := .Table.GetColumn $colName -}} {{- $colTitled := $colName | singular | titleCase}}
{{- $colTitled := $colName | singular | titleCase}} {{if eq 1 (len .Table.PKey.Columns)}}
o.{{$colTitled}} = {{$col.Type}}(lastID) {{$cnames := .Table.Columns | filterColumnsByDefault true | columnNames}}
identifierCols = []interface{}{lastID} {{if setInclude $colName $cnames}}
} else { o.{{$colTitled}} = {{$col.Type}}(lastID)
identifierCols = []interface{}{ identifierCols = []interface{}{lastID}
{{range .Table.PKey.Columns -}} {{end}}
o.{{. | singular | titleCase}}, {{else}}
{{end -}} identifierCols = []interface{}{
} {{range .Table.PKey.Columns -}}
o.{{. | singular | titleCase}},
{{end -}}
} }
{{end}}
if lastID == 0 || len(cache.retMapping) != 1 || cache.retMapping[0] == {{$varNameSingular}}Mapping["{{$colTitled}}"] { if lastID == 0 || len(cache.retMapping) != 1 || cache.retMapping[0] == {{$varNameSingular}}Mapping["{{$colTitled}}"] {
if boil.DebugMode { if boil.DebugMode {

2
templates_test/relationship_to_one_setops.tpl
View file

@ -2,7 +2,7 @@
{{- $dot := .Dot -}} {{- $dot := .Dot -}}
{{- with .Rel -}} {{- with .Rel -}}
{{- $varNameSingular := .ForeignKey.Table | singular | camelCase -}} {{- $varNameSingular := .ForeignKey.Table | singular | camelCase -}}
{{- $foreignVarNameSingular := .ForeignKey.ForeignTable | singular | camelCase}} {{- $foreignVarNameSingular := .ForeignKey.ForeignTable | singular | camelCase -}}
{{- $foreignTable := getTable $dot.Tables .ForeignKey.ForeignTable -}} {{- $foreignTable := getTable $dot.Tables .ForeignKey.ForeignTable -}}
{{- $foreignTableFKeyCol := $foreignTable.GetColumn .ForeignKey.ForeignColumn -}} {{- $foreignTableFKeyCol := $foreignTable.GetColumn .ForeignKey.ForeignColumn -}}
{{- $usesBytes := eq "[]byte" $foreignTableFKeyCol.Type -}} {{- $usesBytes := eq "[]byte" $foreignTableFKeyCol.Type -}}