Remove unneeded textPreferrer wrapping around composite init factory

jschaf · Apr 27, 2021 · f36faea · f36faea
1 parent a5b736d
commit f36faea
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/example/complex_params/query.sql.go b/example/complex_params/query.sql.go
diff --git a/internal/codegen/golang/declarer_composite.go b/internal/codegen/golang/declarer_composite.go
@@ -241,13 +241,11 @@ func (c CompositeInitDeclarer) Declare(string) (string, error) {
 	sb.WriteString(") pgtype.ValueTranscoder {\n\t")
 
 	// Function body
-	sb.WriteString("return textPreferrer{tr.setValue(tr.")
+	sb.WriteString("return tr.setValue(tr.")
 	sb.WriteString(NameCompositeTranscoderFunc(c.typ))
 	sb.WriteString("(), tr.")
 	sb.WriteString(NameCompositeRawFunc(c.typ))
-	sb.WriteString("(v)), ")
-	sb.WriteString(strconv.Quote(c.typ.PgComposite.Name))
-	sb.WriteString("}\n")
+	sb.WriteString("(v))\n")
 	sb.WriteString("}")
 	return sb.String(), nil
 }

diff --git a/internal/codegen/golang/testdata/declarer_composite.input.golden b/internal/codegen/golang/testdata/declarer_composite.input.golden
@@ -103,7 +103,7 @@ func (tr *typeResolver) newSomeTable() pgtype.ValueTranscoder {
 // newSomeTableInit creates an initialized pgtype.ValueTranscoder for the
 // Postgres composite type 'some_table' to encode query parameters.
 func (tr *typeResolver) newSomeTableInit(v SomeTable) pgtype.ValueTranscoder {
-	return textPreferrer{tr.setValue(tr.newSomeTable(), tr.newSomeTableRaw(v)), "some_table"}
+	return tr.setValue(tr.newSomeTable(), tr.newSomeTableRaw(v))
 }
 
 // newSomeTableRaw returns all composite fields for the Postgres composite

diff --git a/internal/codegen/golang/testdata/declarer_composite_enum.input.golden b/internal/codegen/golang/testdata/declarer_composite_enum.input.golden
@@ -123,7 +123,7 @@ func (tr *typeResolver) newSomeTableEnum() pgtype.ValueTranscoder {
 // newSomeTableEnumInit creates an initialized pgtype.ValueTranscoder for the
 // Postgres composite type 'some_table_enum' to encode query parameters.
 func (tr *typeResolver) newSomeTableEnumInit(v SomeTableEnum) pgtype.ValueTranscoder {
-	return textPreferrer{tr.setValue(tr.newSomeTableEnum(), tr.newSomeTableEnumRaw(v)), "some_table_enum"}
+	return tr.setValue(tr.newSomeTableEnum(), tr.newSomeTableEnumRaw(v))
 }
 
 // newSomeTableEnumRaw returns all composite fields for the Postgres composite

diff --git a/internal/codegen/golang/testdata/declarer_composite_nested.input.golden b/internal/codegen/golang/testdata/declarer_composite_nested.input.golden
@@ -125,7 +125,7 @@ func (tr *typeResolver) newSomeTableNested() pgtype.ValueTranscoder {
 // newSomeTableNestedInit creates an initialized pgtype.ValueTranscoder for the
 // Postgres composite type 'some_table_nested' to encode query parameters.
 func (tr *typeResolver) newSomeTableNestedInit(v SomeTableNested) pgtype.ValueTranscoder {
-	return textPreferrer{tr.setValue(tr.newSomeTableNested(), tr.newSomeTableNestedRaw(v)), "some_table_nested"}
+	return tr.setValue(tr.newSomeTableNested(), tr.newSomeTableNestedRaw(v))
 }
 
 // newSomeTableNestedRaw returns all composite fields for the Postgres composite