Skip to content

Commit 7ed3da6

Browse files
committed
refactor: remove type casting from sqlc argument string formatting
Remove unnecessary PostgreSQL type casting (::type) from sqlc.arg() and sqlc.narg() function calls in argument string generation. This simplifies the output format while maintaining functionality. Signed-off-by: Svetlin Ralchev <iamralch@users.noreply.github.com>
1 parent 344d54f commit 7ed3da6

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

‎internal/sqlc/catalog.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,9 +248,9 @@ type Argument struct {
248248
func (x *Argument) String() string {
249249
// Prepare the argument string based on nullability
250250
if x.Column.Null {
251-
return fmt.Sprintf("sqlc.narg(%s)::%s", x.Column.Name, x.Column.Type)
251+
return fmt.Sprintf("sqlc.narg(%s)", x.Column.Name)
252252
}
253-
return fmt.Sprintf("sqlc.arg(%s)::%s", x.Column.Name, x.Column.Type)
253+
return fmt.Sprintf("sqlc.arg(%s)", x.Column.Name)
254254
}
255255

256256
// Attributes represents common attributes that can be applied to schemas, tables, and columns.

‎internal/sqlc/catalog_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ var _ = Describe("Catalog", func() {
202202
Argument: arg,
203203
}
204204

205-
Expect(condition.String()).To(Equal("user_id = sqlc.arg(user_id)::integer"))
205+
Expect(condition.String()).To(Equal("user_id = sqlc.arg(user_id)"))
206206
})
207207
})
208208

@@ -219,7 +219,7 @@ var _ = Describe("Catalog", func() {
219219
Column: column,
220220
}
221221

222-
Expect(arg.String()).To(Equal("sqlc.narg(description)::text"))
222+
Expect(arg.String()).To(Equal("sqlc.narg(description)"))
223223
})
224224
})
225225

@@ -235,7 +235,7 @@ var _ = Describe("Catalog", func() {
235235
Column: column,
236236
}
237237

238-
Expect(arg.String()).To(Equal("sqlc.arg(id)::integer"))
238+
Expect(arg.String()).To(Equal("sqlc.arg(id)"))
239239
})
240240
})
241241
})
@@ -281,7 +281,7 @@ var _ = Describe("Catalog", func() {
281281
composite.AddColumn(column2)
282282

283283
result := composite.String()
284-
Expect(result).To(Equal("id = sqlc.arg(id)::integer AND email = sqlc.arg(email)::text"))
284+
Expect(result).To(Equal("id = sqlc.arg(id) AND email = sqlc.arg(email)"))
285285
})
286286

287287
It("returns empty string when there are no conditions", func() {
@@ -313,7 +313,7 @@ var _ = Describe("Catalog", func() {
313313
composite.AddColumn(column2)
314314

315315
result := composite.String()
316-
Expect(result).To(Equal("id = sqlc.arg(id)::integer OR email = sqlc.arg(email)::text"))
316+
Expect(result).To(Equal("id = sqlc.arg(id) OR email = sqlc.arg(email)"))
317317
})
318318
})
319319
})

0 commit comments

Comments
 (0)