From bbd9277e0ebc3231d0541abd34c49abd2c0ba290 Mon Sep 17 00:00:00 2001 From: Patrick O'brien Date: Sat, 17 Sep 2016 14:32:19 +1000 Subject: [PATCH] Fix compare against null.Bytes --- templates/06_relationship_to_one_eager.tpl | 2 +- templates/07_relationship_to_many_eager.tpl | 2 +- templates/08_relationship_to_one_setops.tpl | 2 +- templates_test/relationship_to_many.tpl | 2 +- templates_test/relationship_to_many_setops.tpl | 2 +- templates_test/relationship_to_one.tpl | 2 +- templates_test/relationship_to_one_setops.tpl | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/06_relationship_to_one_eager.tpl b/templates/06_relationship_to_one_eager.tpl index 86c3052..e2069c2 100644 --- a/templates/06_relationship_to_one_eager.tpl +++ b/templates/06_relationship_to_one_eager.tpl @@ -6,7 +6,7 @@ {{- $slice := printf "%sSlice" .LocalTable.NameGo -}} {{- $foreignTable := getTable $dot.Tables .ForeignKey.ForeignTable -}} {{- $foreignTableFKeyCol := $foreignTable.GetColumn .ForeignKey.ForeignColumn -}} - {{- $usesBytes := eq "[]byte" $foreignTableFKeyCol.Type}} + {{- $usesBytes := or (eq "[]byte" $foreignTableFKeyCol.Type) (eq "null.Bytes" $foreignTableFKeyCol.Type)}} // Load{{.Function.Name}} allows an eager lookup of values, cached into the // loaded structs of the objects. func ({{$varNameSingular}}L) Load{{.Function.Name}}(e boil.Executor, singular bool, {{$arg}} interface{}) error { diff --git a/templates/07_relationship_to_many_eager.tpl b/templates/07_relationship_to_many_eager.tpl index 053286e..ec09f3a 100644 --- a/templates/07_relationship_to_many_eager.tpl +++ b/templates/07_relationship_to_many_eager.tpl @@ -15,7 +15,7 @@ {{- $slice := printf "%sSlice" $txt.LocalTable.NameGo -}} {{- $schemaForeignTable := .ForeignTable | $dot.SchemaTable -}} {{- $fkeyCol := $dot.Table.GetColumn .Column -}} - {{- $usesBytes := eq "[]byte" $fkeyCol.Type -}} + {{- $usesBytes := or (eq "[]byte" $fkeyCol.Type) (eq "null.Bytes" $fkeyCol.Type)}} // Load{{$txt.Function.Name}} allows an eager lookup of values, cached into the // loaded structs of the objects. func ({{$varNameSingular}}L) Load{{$txt.Function.Name}}(e boil.Executor, singular bool, {{$arg}} interface{}) error { diff --git a/templates/08_relationship_to_one_setops.tpl b/templates/08_relationship_to_one_setops.tpl index 76832f3..93432e5 100644 --- a/templates/08_relationship_to_one_setops.tpl +++ b/templates/08_relationship_to_one_setops.tpl @@ -5,7 +5,7 @@ {{- $localNameSingular := .ForeignKey.Table | singular | camelCase -}} {{- $foreignTable := getTable $dot.Tables .ForeignKey.ForeignTable -}} {{- $foreignTableFKeyCol := $foreignTable.GetColumn .ForeignKey.ForeignColumn -}} - {{- $usesBytes := eq "[]byte" $foreignTableFKeyCol.Type -}} + {{- $usesBytes := or (eq "[]byte" $foreignTableFKeyCol.Type) (eq "null.Bytes" $foreignTableFKeyCol.Type)}} // Set{{.Function.Name}} of the {{.ForeignKey.Table | singular}} to the related item. // Sets {{.Function.Receiver}}.R.{{.Function.Name}} to related. // Adds {{.Function.Receiver}} to related.R.{{.Function.ForeignName}}. diff --git a/templates_test/relationship_to_many.tpl b/templates_test/relationship_to_many.tpl index 9e386d2..73c4629 100644 --- a/templates_test/relationship_to_many.tpl +++ b/templates_test/relationship_to_many.tpl @@ -9,7 +9,7 @@ {{- else -}} {{- $rel := textsFromRelationship $dot.Tables $table . -}} {{- $fkeyCol := $dot.Table.GetColumn .Column -}} - {{- $usesBytes := eq "[]byte" $fkeyCol.Type}} + {{- $usesBytes := or (eq "[]byte" $fkeyCol.Type) (eq "null.Bytes" $fkeyCol.Type)}} func test{{$rel.LocalTable.NameGo}}ToMany{{$rel.Function.Name}}(t *testing.T) { var err error tx := MustTx(boil.Begin()) diff --git a/templates_test/relationship_to_many_setops.tpl b/templates_test/relationship_to_many_setops.tpl index c02df30..4fbdae5 100644 --- a/templates_test/relationship_to_many_setops.tpl +++ b/templates_test/relationship_to_many_setops.tpl @@ -11,7 +11,7 @@ {{- $foreignVarNameSingular := .ForeignTable | singular | camelCase -}} {{- $rel := textsFromRelationship $dot.Tables $table . -}} {{- $fkeyCol := $dot.Table.GetColumn .Column -}} - {{- $usesBytes := eq "[]byte" $fkeyCol.Type}} + {{- $usesBytes := or (eq "[]byte" $fkeyCol.Type) (eq "null.Bytes" $fkeyCol.Type)}} func test{{$rel.LocalTable.NameGo}}ToManyAddOp{{$rel.Function.Name}}(t *testing.T) { var err error diff --git a/templates_test/relationship_to_one.tpl b/templates_test/relationship_to_one.tpl index 389bca9..391da92 100644 --- a/templates_test/relationship_to_one.tpl +++ b/templates_test/relationship_to_one.tpl @@ -3,7 +3,7 @@ {{- with .Rel -}} {{- $foreignTable := getTable $dot.Tables .ForeignKey.ForeignTable -}} {{- $foreignTableFKeyCol := $foreignTable.GetColumn .ForeignKey.ForeignColumn -}} -{{- $usesBytes := eq "[]byte" $foreignTableFKeyCol.Type -}} +{{- $usesBytes := or (eq "[]byte" $foreignTableFKeyCol.Type) (eq "null.Bytes" $foreignTableFKeyCol.Type)}} func test{{.LocalTable.NameGo}}ToOne{{.ForeignTable.NameGo}}_{{.Function.Name}}(t *testing.T) { tx := MustTx(boil.Begin()) defer tx.Rollback() diff --git a/templates_test/relationship_to_one_setops.tpl b/templates_test/relationship_to_one_setops.tpl index b59313e..650eb77 100644 --- a/templates_test/relationship_to_one_setops.tpl +++ b/templates_test/relationship_to_one_setops.tpl @@ -5,7 +5,7 @@ {{- $foreignVarNameSingular := .ForeignKey.ForeignTable | singular | camelCase -}} {{- $foreignTable := getTable $dot.Tables .ForeignKey.ForeignTable -}} {{- $foreignTableFKeyCol := $foreignTable.GetColumn .ForeignKey.ForeignColumn -}} -{{- $usesBytes := eq "[]byte" $foreignTableFKeyCol.Type -}} +{{- $usesBytes := or (eq "[]byte" $foreignTableFKeyCol.Type) (eq "null.Bytes" $foreignTableFKeyCol.Type)}} func test{{.LocalTable.NameGo}}ToOneSetOp{{.ForeignTable.NameGo}}_{{.Function.Name}}(t *testing.T) { var err error