From 4d61b0d81644ca75301c7320844e34cff51e3b06 Mon Sep 17 00:00:00 2001
From: lushenle <lushenle@bytedance.com>
Date: Fri, 21 Feb 2025 16:40:07 +0800
Subject: [PATCH] Fix redundant rows.Close() calls in queryCode.tmpl

- Updated queryCode.tmpl to use defer for rows.Close()
- Ensured rows.Close() is called only once
- Improved resource management following Go best practices
---
 .../golang/templates/stdlib/queryCode.tmpl    |  3 --
 .../testdata/any/stdlib/go/query.sql.go       |  3 --
 .../testdata/array_in/stdlib/go/query.sql.go  |  3 --
 .../array_text/stdlib/go/query.sql.go         |  3 --
 .../array_text_join/stdlib/go/query.sql.go    |  3 --
 .../between_args/mysql/go/query.sql.go        | 12 --------
 .../between_args/sqlite/go/query.sql.go       |  9 ------
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../case_stmt_bool/stdlib/go/query.sql.go     |  3 --
 .../testdata/case_text/stdlib/go/query.sql.go |  3 --
 .../cast_coalesce/stdlib/go/query.sql.go      |  3 --
 .../testdata/cast_null/stdlib/go/query.sql.go |  3 --
 .../cast_param/sqlite/go/query.sql.go         |  3 --
 .../testdata/citext/stdlib/go/query.sql.go    |  3 --
 .../testdata/coalesce/mysql/go/query.sql.go   |  6 ----
 .../postgresql/stdlib/go/query.sql.go         | 18 -----------
 .../testdata/coalesce/sqlite/go/query.sql.go  |  6 ----
 .../coalesce_as/mysql/go/query.sql.go         |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../coalesce_as/sqlite/go/query.sql.go        |  3 --
 .../coalesce_join/postgresql/go/query.sql.go  |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  6 ----
 .../comparisons/mysql/go/query.sql.go         | 27 -----------------
 .../postgresql/stdlib/go/query.sql.go         | 21 -------------
 .../comparisons/sqlite/go/query.sql.go        | 21 -------------
 .../composite_type/stdlib/go/query.sql.go     |  3 --
 .../postgresql/go/query.sql.go                |  3 --
 .../postgresql/go/query.sql.go                |  3 --
 .../create_table_like/mysql/go/query.sql.go   |  3 --
 .../postgresql/go/query.sql.go                |  3 --
 .../create_view/mysql/go/query.sql.go         |  6 ----
 .../create_view/postgresql/go/query.sql.go    |  6 ----
 .../create_view/sqlite/go/query.sql.go        |  6 ----
 .../testdata/cte_count/mysql/go/query.sql.go  |  3 --
 .../testdata/cte_count/stdlib/go/query.sql.go |  3 --
 .../testdata/cte_filter/mysql/go/query.sql.go |  3 --
 .../cte_filter/stdlib/go/query.sql.go         |  3 --
 .../cte_in_delete/stdlib/go/query.sql.go      |  3 --
 .../cte_recursive/mysql/go/query.sql.go       |  3 --
 .../cte_recursive/stdlib/go/query.sql.go      |  3 --
 .../postgresql/pgx/go/query.sql.go            |  2 +-
 .../data_type_boolean/mysql/db/query.sql.go   |  6 ----
 .../postgresql/stdlib/go/query.sql.go         |  6 ----
 .../data_type_boolean/sqlite/db/query.sql.go  |  6 ----
 .../sqlite/go/query.sql.go                    |  3 --
 .../sqlite/go/query.sql.go                    |  3 --
 .../sqlite/go/query.sql.go                    |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../ddl_create_enum/mysql/go/query.sql.go     |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  9 ------
 .../testdata/diff_no_output/go/query.sql.go   |  3 --
 .../testdata/diff_output/go/query.sql.go      | 26 ++++++++--------
 .../mysql/go/query.sql.go                     |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../sqlite/go/query.sql.go                    |  3 --
 .../emit_db_tags/mysql/go/query.sql.go        |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../emit_db_tags/sqlite/go/query.sql.go       |  3 --
 .../emit_empty_slices/stdlib/go/query.sql.go  |  3 --
 .../mysql/go/query.sql.go                     |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../sqlite/go/query.sql.go                    |  3 --
 .../mysql/go/query.sql.go                     |  6 ----
 .../stdlib/go/query.sql.go                    |  3 --
 .../testdata/enum/mysql/go/query.sql.go       |  3 --
 .../enum/postgresql/stdlib/go/query.sql.go    |  3 --
 .../enum_column/mysql/go/query.sql.go         |  6 ----
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../func_aggregate/pganalyze/go/query.sql.go  |  4 +--
 .../func_match_types/mysql/go/query.sql.go    |  3 --
 .../postgresql/go/query.sql.go                |  3 --
 .../func_match_types/sqlite/go/query.sql.go   |  3 --
 .../postgresql/pganalyze/go/query.sql.go      |  6 ++--
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../golang_initialisms_empty/db/query.sql.go  |  3 --
 .../golang_initialisms_url/db/query.sql.go    |  3 --
 .../testdata/having/mysql/go/query.sql.go     |  3 --
 .../having/postgresql/go/query.sql.go         |  3 --
 .../testdata/hstore/stdlib/go/hstore.sql.go   |  6 ----
 .../identical_tables/mysql/go/query.sql.go    |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../identical_tables/sqlite/go/query.sql.go   |  3 --
 .../db/query.sql.go                           |  3 --
 .../testdata/in_union/mysql/go/query.sql.go   |  3 --
 .../testdata/inflection/mysql/go/query.sql.go | 15 ----------
 .../postgresql/stdlib/go/query.sql.go         | 15 ----------
 .../inflection/sqlite/go/query.sql.go         | 15 ----------
 .../testdata/interval/stdlib/go/query.sql.go  |  3 --
 .../testdata/join_alias/mysql/go/query.sql.go |  6 ----
 .../postgresql/stdlib/go/query.sql.go         |  6 ----
 .../join_alias/sqlite/go/query.sql.go         |  6 ----
 .../postgresql/go/query.sql.go                | 12 --------
 .../testdata/join_from/mysql/go/query.sql.go  |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../testdata/join_from/sqlite/go/query.sql.go |  3 --
 .../join_full/postgresql/go/query.sql.go      |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../join_inner/postgresql/go/query.sql.go     |  6 ----
 .../testdata/join_left/mysql/go/query.sql.go  | 27 -----------------
 .../join_left/postgresql/go/query.sql.go      | 27 -----------------
 .../testdata/join_left/sqlite/go/query.sql.go | 30 -------------------
 .../mysql/go/query.sql.go                     |  3 --
 .../postgres/go/query.sql.go                  |  3 --
 .../sqlite/go/query.sql.go                    |  3 --
 .../join_order_by/postgresql/pgx/sqlc.yaml    |  1 +
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../testdata/join_right/mysql/go/query.sql.go |  3 --
 .../join_right/postgresql/go/query.sql.go     |  3 --
 .../join_two_tables/mysql/go/query.sql.go     |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../join_two_tables/sqlite/go/query.sql.go    |  3 --
 .../join_where_clause/mysql/go/query.sql.go   |  9 ------
 .../postgresql/stdlib/go/query.sql.go         |  9 ------
 .../join_where_clause/sqlite/go/query.sql.go  |  9 ------
 .../postgresql/pgx/go/query.sql.go            |  4 +--
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../testdata/limit/sqlite/go/query.sql.go     |  3 --
 .../testdata/limit/stdlib/go/query.sql.go     |  3 --
 .../testdata/lower/stdlib/go/query.sql.go     |  3 --
 .../stdlib/go/query.sql.go                    |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../stdlib/go/query.sql.go                    |  3 --
 .../postgresql/pgx/go/query.sql.go            |  6 ++--
 .../stdlib/go/query.sql.go                    |  3 --
 .../multischema/stdlib/go/query.sql.go        |  6 ----
 .../go/group_concat.sql.go                    |  6 ----
 .../mysql_vector/mysql/go/query.sql.go        |  3 --
 .../named_param/sqlite/go/query.sql.go        |  6 ----
 .../named_param/stdlib/go/query.sql.go        |  6 ----
 .../postgresql/pganalyzer/db/query.sql.go     |  4 +--
 .../omit_sqlc_version/db/query.sql.go         |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../order_by_binds/mysql/go/query.sql.go      |  9 ------
 .../order_by_binds/pganalyze/go/query.sql.go  |  9 +-----
 .../order_by_binds/postgresql/go/query.sql.go |  9 ------
 .../order_by_union/mysql/go/query.sql.go      |  3 --
 .../order_by_union/postgresql/go/query.sql.go |  3 --
 .../output_file_names/stdlib/go/query.sql.go  |  3 --
 .../stdlib/go/query.sql_gen.go                |  3 --
 .../overrides_go_types/mysql/go/query.sql.go  |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../overrides_unsigned/mysql/go/query.sql.go  |  3 --
 .../params_duplicate/mysql/go/query.sql.go    |  9 ------
 .../postgresql/go/query.sql.go                |  9 ------
 .../mysql/db/query.sql.go                     |  3 --
 .../postgresql/db/query.sql.go                |  3 --
 .../params_location/mysql/go/query.sql.go     | 18 -----------
 .../postgresql/stdlib/go/query.sql.go         | 18 -----------
 .../mysql/go/query.sql.go                     |  6 ----
 .../postgresql/go/query.sql.go                |  6 ----
 .../testdata/params_two/mysql/go/query.sql.go |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../pattern_in_expr/mysql/go/query.sql.go     | 12 --------
 .../pattern_matching/mysql/go/query.sql.go    |  3 --
 .../postgresql/go/query.sql.go                |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../endtoend/testdata/pg_dump/db/query.sql.go |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../pg_timezone_names/go_stdlib/query.sql.go  |  9 ------
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../prepared_queries/mysql/go/query.sql.go    |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../postgresql/go/query.sql.go                |  3 --
 .../postgresql/go/query.sql.go                |  3 --
 .../quoted_colname/sqlite/go/query.sql.go     |  3 --
 .../quoted_tablename/sqlite/go/query.sql.go   |  3 --
 .../testdata/rename/v1/stdlib/go/query.sql.go |  6 ----
 .../testdata/rename/v2/stdlib/go/query.sql.go |  6 ----
 .../schema_scoped_enum/stdlib/go/query.sql.go |  3 --
 .../mysql/go/query.sql.go                     |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../schema_scoped_list/mysql/go/query.sql.go  |  6 ----
 .../postgresql/stdlib/go/query.sql.go         |  6 ----
 .../select_column_cast/mysql/go/query.sql.go  |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../select_column_cast/sqlite/go/query.sql.go |  3 --
 .../select_cte/sqlite/go/query.sql.go         |  3 --
 .../select_distinct/stdlib/go/query.sql.go    |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../select_limit/mysql/go/query.sql.go        |  6 ----
 .../postgresql/stdlib/go/query.sql.go         |  6 ----
 .../select_limit/sqlite/go/query.sql.go       |  6 ----
 .../select_nested_count/mysql/go/query.sql.go |  3 --
 .../postgresql/go/query.sql.go                |  3 --
 .../sqlite/go/query.sql.go                    |  3 --
 .../select_star/mysql/go/query.sql.go         |  6 ----
 .../postgresql/stdlib/go/query.sql.go         |  6 ----
 .../select_star/sqlite/go/query.sql.go        |  6 ----
 .../select_star_quoted/mysql/go/query.sql.go  |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../select_text_array/stdlib/go/query.sql.go  |  3 --
 .../select_union/mysql/go/query.sql.go        | 15 ----------
 .../postgres/stdlib/go/query.sql.go           | 15 ----------
 .../select_union/sqlite/go/query.sql.go       | 15 ----------
 .../mysql/go/query.sql.go                     |  3 --
 .../show_warnings/mysql/go/query.sql.go       |  3 --
 .../testdata/sqlc_arg/mysql/go/query.sql.go   |  9 ------
 .../postgresql/stdlib/go/query.sql.go         |  6 ----
 .../testdata/sqlc_arg/sqlite/go/query.sql.go  |  6 ----
 .../testdata/sqlc_embed/mysql/go/query.sql.go |  6 ----
 .../postgresql/stdlib/go/query.sql.go         |  6 ----
 .../sqlc_embed/sqlite/go/query.sql.go         |  6 ----
 .../testdata/sqlc_narg/mysql/go/query.sql.go  | 12 --------
 .../postgresql/stdlib/go/query.sql.go         | 12 --------
 .../postgresql/stdlib/go_strict/query.sql.go  | 12 --------
 .../testdata/sqlc_narg/sqlite/go/query.sql.go | 12 --------
 .../testdata/sqlc_slice/mysql/go/query.sql.go | 18 -----------
 .../postgresql/stdlib/go/query.sql.go         |  6 ----
 .../sqlc_slice/sqlite/go/query.sql.go         | 15 ----------
 .../sqlite/go/query.sql.go                    |  3 --
 .../testdata/sqlite_skip_todo/db/query.sql.go |  6 ----
 .../star_expansion/mysql/go/query.sql.go      |  6 ----
 .../postgresql/stdlib/go/query.sql.go         |  6 ----
 .../star_expansion/sqlite/go/query.sql.go     |  6 ----
 .../star_expansion_cte/stdlib/go/query.sql.go |  6 ----
 .../stdlib/go/query.sql.go                    |  3 --
 .../star_expansion_join/mysql/go/query.sql.go |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../mysql/go/query.sql.go                     |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../mysql/go/query.sql.go                     |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../mysql/go/query.sql.go                     |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../sqlite/go/query.sql.go                    |  3 --
 .../sum_type/postgresql/pgx/go/query.sql.go   |  6 ++--
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../table_function/sqlite/go/query.sql.go     |  3 --
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../unnest/postgresql/stdlib/go/query.sql.go  |  6 ----
 .../postgresql/pgx/go/query.sql.go            |  6 ++--
 .../postgresql/stdlib/go/query.sql.go         |  3 --
 .../postgresql/pgx/go/query.sql.go            |  4 +--
 .../mysql/go/query.sql.go                     |  9 ------
 .../pganalyzer/go/query.sql.go                | 12 +-------
 .../postgresql/go/query.sql.go                |  9 ------
 .../virtual_table/sqlite/go/query.sql.go      | 21 -------------
 244 files changed, 31 insertions(+), 1322 deletions(-)

diff --git a/internal/codegen/golang/templates/stdlib/queryCode.tmpl b/internal/codegen/golang/templates/stdlib/queryCode.tmpl
index cf56000ec6..b7e194c6df 100644
--- a/internal/codegen/golang/templates/stdlib/queryCode.tmpl
+++ b/internal/codegen/golang/templates/stdlib/queryCode.tmpl
@@ -53,9 +53,6 @@ func (q *Queries) {{.MethodName}}(ctx context.Context, {{ dbarg }} {{.Arg.Pair}}
         }
         items = append(items, {{.Ret.ReturnName}})
     }
-    if err := rows.Close(); err != nil {
-        return nil, err
-    }
     if err := rows.Err(); err != nil {
         return nil, err
     }
diff --git a/internal/endtoend/testdata/any/stdlib/go/query.sql.go b/internal/endtoend/testdata/any/stdlib/go/query.sql.go
index d022ccba93..4c75aff8b6 100644
--- a/internal/endtoend/testdata/any/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/any/stdlib/go/query.sql.go
@@ -31,9 +31,6 @@ func (q *Queries) Any(ctx context.Context, dollar_1 []int64) ([]int64, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/array_in/stdlib/go/query.sql.go b/internal/endtoend/testdata/array_in/stdlib/go/query.sql.go
index 9e5199f78d..8e4281b5d0 100644
--- a/internal/endtoend/testdata/array_in/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/array_in/stdlib/go/query.sql.go
@@ -34,9 +34,6 @@ func (q *Queries) In(ctx context.Context, arg InParams) ([]int32, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/array_text/stdlib/go/query.sql.go b/internal/endtoend/testdata/array_text/stdlib/go/query.sql.go
index 4fc6fd0336..f0e7fd58dd 100644
--- a/internal/endtoend/testdata/array_text/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/array_text/stdlib/go/query.sql.go
@@ -29,9 +29,6 @@ func (q *Queries) TextArray(ctx context.Context) ([][]string, error) {
 		}
 		items = append(items, tags)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/array_text_join/stdlib/go/query.sql.go b/internal/endtoend/testdata/array_text_join/stdlib/go/query.sql.go
index 89e3f048e7..362e69ed88 100644
--- a/internal/endtoend/testdata/array_text_join/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/array_text_join/stdlib/go/query.sql.go
@@ -31,9 +31,6 @@ func (q *Queries) JoinTextArray(ctx context.Context) ([][]string, error) {
 		}
 		items = append(items, info)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/between_args/mysql/go/query.sql.go b/internal/endtoend/testdata/between_args/mysql/go/query.sql.go
index 2bec57f21f..84bdbe0cee 100644
--- a/internal/endtoend/testdata/between_args/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/between_args/mysql/go/query.sql.go
@@ -34,9 +34,6 @@ func (q *Queries) GetBetweenPrices(ctx context.Context, arg GetBetweenPricesPara
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -68,9 +65,6 @@ func (q *Queries) GetBetweenPricesNamed(ctx context.Context, arg GetBetweenPrice
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -102,9 +96,6 @@ func (q *Queries) GetBetweenPricesTable(ctx context.Context, arg GetBetweenPrice
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -136,9 +127,6 @@ func (q *Queries) GetBetweenPricesTableAlias(ctx context.Context, arg GetBetween
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/between_args/sqlite/go/query.sql.go b/internal/endtoend/testdata/between_args/sqlite/go/query.sql.go
index 7581640fc8..cdd8ea68ba 100644
--- a/internal/endtoend/testdata/between_args/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/between_args/sqlite/go/query.sql.go
@@ -34,9 +34,6 @@ func (q *Queries) GetBetweenPrices(ctx context.Context, arg GetBetweenPricesPara
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -68,9 +65,6 @@ func (q *Queries) GetBetweenPricesTable(ctx context.Context, arg GetBetweenPrice
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -102,9 +96,6 @@ func (q *Queries) GetBetweenPricesTableAlias(ctx context.Context, arg GetBetween
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/build_tags/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/build_tags/postgresql/stdlib/go/query.sql.go
index 50e6dcbedb..a31eab3cc2 100644
--- a/internal/endtoend/testdata/build_tags/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/build_tags/postgresql/stdlib/go/query.sql.go
@@ -74,9 +74,6 @@ func (q *Queries) ListAuthors(ctx context.Context) ([]Author, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/case_stmt_bool/stdlib/go/query.sql.go b/internal/endtoend/testdata/case_stmt_bool/stdlib/go/query.sql.go
index c8dffb1be1..d4c4fd7162 100644
--- a/internal/endtoend/testdata/case_stmt_bool/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/case_stmt_bool/stdlib/go/query.sql.go
@@ -31,9 +31,6 @@ func (q *Queries) CaseStatementBoolean(ctx context.Context, id string) ([]bool,
 		}
 		items = append(items, is_one)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/case_text/stdlib/go/query.sql.go b/internal/endtoend/testdata/case_text/stdlib/go/query.sql.go
index cef930fe39..30ae0c579e 100644
--- a/internal/endtoend/testdata/case_text/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/case_text/stdlib/go/query.sql.go
@@ -31,9 +31,6 @@ func (q *Queries) CaseStatementText(ctx context.Context, id string) ([]string, e
 		}
 		items = append(items, is_one)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/cast_coalesce/stdlib/go/query.sql.go b/internal/endtoend/testdata/cast_coalesce/stdlib/go/query.sql.go
index 274368bb7b..b61a9948f6 100644
--- a/internal/endtoend/testdata/cast_coalesce/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/cast_coalesce/stdlib/go/query.sql.go
@@ -28,9 +28,6 @@ func (q *Queries) CastCoalesce(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, login)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/cast_null/stdlib/go/query.sql.go b/internal/endtoend/testdata/cast_null/stdlib/go/query.sql.go
index b3dbb08f63..d870f48364 100644
--- a/internal/endtoend/testdata/cast_null/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/cast_null/stdlib/go/query.sql.go
@@ -45,9 +45,6 @@ func (q *Queries) ListNullable(ctx context.Context) ([]ListNullableRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/cast_param/sqlite/go/query.sql.go b/internal/endtoend/testdata/cast_param/sqlite/go/query.sql.go
index 28cb58fb11..72bbdfc497 100644
--- a/internal/endtoend/testdata/cast_param/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/cast_param/sqlite/go/query.sql.go
@@ -29,9 +29,6 @@ func (q *Queries) GetData(ctx context.Context, allowInvalid bool) ([]MyTable, er
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/citext/stdlib/go/query.sql.go b/internal/endtoend/testdata/citext/stdlib/go/query.sql.go
index 4700f663d1..ea37e7f4d8 100644
--- a/internal/endtoend/testdata/citext/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/citext/stdlib/go/query.sql.go
@@ -28,9 +28,6 @@ func (q *Queries) GetCitexts(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/coalesce/mysql/go/query.sql.go b/internal/endtoend/testdata/coalesce/mysql/go/query.sql.go
index 468c288698..5cf63ab405 100644
--- a/internal/endtoend/testdata/coalesce/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/coalesce/mysql/go/query.sql.go
@@ -29,9 +29,6 @@ func (q *Queries) Coalesce(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, login)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -63,9 +60,6 @@ func (q *Queries) CoalesceColumns(ctx context.Context) ([]CoalesceColumnsRow, er
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/coalesce/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/coalesce/postgresql/stdlib/go/query.sql.go
index 075d3bdf74..716d89c647 100644
--- a/internal/endtoend/testdata/coalesce/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/coalesce/postgresql/stdlib/go/query.sql.go
@@ -29,9 +29,6 @@ func (q *Queries) CoalesceNumeric(ctx context.Context) ([]int64, error) {
 		}
 		items = append(items, login)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -63,9 +60,6 @@ func (q *Queries) CoalesceNumericColumns(ctx context.Context) ([]CoalesceNumeric
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -96,9 +90,6 @@ func (q *Queries) CoalesceNumericNull(ctx context.Context) ([]CoalesceNumericNul
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -124,9 +115,6 @@ func (q *Queries) CoalesceString(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, login)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -158,9 +146,6 @@ func (q *Queries) CoalesceStringColumns(ctx context.Context) ([]CoalesceStringCo
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -191,9 +176,6 @@ func (q *Queries) CoalesceStringNull(ctx context.Context) ([]CoalesceStringNullR
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/coalesce/sqlite/go/query.sql.go b/internal/endtoend/testdata/coalesce/sqlite/go/query.sql.go
index 468c288698..5cf63ab405 100644
--- a/internal/endtoend/testdata/coalesce/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/coalesce/sqlite/go/query.sql.go
@@ -29,9 +29,6 @@ func (q *Queries) Coalesce(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, login)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -63,9 +60,6 @@ func (q *Queries) CoalesceColumns(ctx context.Context) ([]CoalesceColumnsRow, er
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/coalesce_as/mysql/go/query.sql.go b/internal/endtoend/testdata/coalesce_as/mysql/go/query.sql.go
index e56fe39d4e..7d80c94b43 100644
--- a/internal/endtoend/testdata/coalesce_as/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/coalesce_as/mysql/go/query.sql.go
@@ -35,9 +35,6 @@ func (q *Queries) SumBaz(ctx context.Context) ([]SumBazRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/coalesce_as/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/coalesce_as/postgresql/stdlib/go/query.sql.go
index e56fe39d4e..7d80c94b43 100644
--- a/internal/endtoend/testdata/coalesce_as/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/coalesce_as/postgresql/stdlib/go/query.sql.go
@@ -35,9 +35,6 @@ func (q *Queries) SumBaz(ctx context.Context) ([]SumBazRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/coalesce_as/sqlite/go/query.sql.go b/internal/endtoend/testdata/coalesce_as/sqlite/go/query.sql.go
index e56fe39d4e..7d80c94b43 100644
--- a/internal/endtoend/testdata/coalesce_as/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/coalesce_as/sqlite/go/query.sql.go
@@ -35,9 +35,6 @@ func (q *Queries) SumBaz(ctx context.Context) ([]SumBazRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/coalesce_join/postgresql/go/query.sql.go b/internal/endtoend/testdata/coalesce_join/postgresql/go/query.sql.go
index f4c689f9a7..762ada2c4c 100644
--- a/internal/endtoend/testdata/coalesce_join/postgresql/go/query.sql.go
+++ b/internal/endtoend/testdata/coalesce_join/postgresql/go/query.sql.go
@@ -34,9 +34,6 @@ func (q *Queries) GetBar(ctx context.Context) ([]GetBarRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/comment_on/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/comment_on/postgresql/stdlib/go/query.sql.go
index f391048ab3..580a326f3e 100644
--- a/internal/endtoend/testdata/comment_on/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/comment_on/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) ListBar(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, baz)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -54,9 +51,6 @@ func (q *Queries) ListBat(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, baz)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/comparisons/mysql/go/query.sql.go b/internal/endtoend/testdata/comparisons/mysql/go/query.sql.go
index b8e6fbdc71..dfbb7df2c6 100644
--- a/internal/endtoend/testdata/comparisons/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/comparisons/mysql/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) AlsoNotEqual(ctx context.Context) ([]bool, error) {
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -54,9 +51,6 @@ func (q *Queries) Equal(ctx context.Context) ([]bool, error) {
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -81,9 +75,6 @@ func (q *Queries) GreaterThan(ctx context.Context) ([]bool, error) {
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -108,9 +99,6 @@ func (q *Queries) GreaterThanOrEqual(ctx context.Context) ([]bool, error) {
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -135,9 +123,6 @@ func (q *Queries) IsNotNull(ctx context.Context) ([]bool, error) {
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -162,9 +147,6 @@ func (q *Queries) IsNull(ctx context.Context) ([]bool, error) {
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -189,9 +171,6 @@ func (q *Queries) LessThan(ctx context.Context) ([]bool, error) {
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -216,9 +195,6 @@ func (q *Queries) LessThanOrEqual(ctx context.Context) ([]bool, error) {
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -243,9 +219,6 @@ func (q *Queries) NotEqual(ctx context.Context) ([]bool, error) {
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/comparisons/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/comparisons/postgresql/stdlib/go/query.sql.go
index b32a885cac..f63f8fd9b1 100644
--- a/internal/endtoend/testdata/comparisons/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/comparisons/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) AlsoNotEqual(ctx context.Context) ([]bool, error) {
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -54,9 +51,6 @@ func (q *Queries) Equal(ctx context.Context) ([]bool, error) {
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -81,9 +75,6 @@ func (q *Queries) GreaterThan(ctx context.Context) ([]bool, error) {
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -108,9 +99,6 @@ func (q *Queries) GreaterThanOrEqual(ctx context.Context) ([]bool, error) {
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -135,9 +123,6 @@ func (q *Queries) LessThan(ctx context.Context) ([]bool, error) {
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -162,9 +147,6 @@ func (q *Queries) LessThanOrEqual(ctx context.Context) ([]bool, error) {
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -189,9 +171,6 @@ func (q *Queries) NotEqual(ctx context.Context) ([]bool, error) {
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/comparisons/sqlite/go/query.sql.go b/internal/endtoend/testdata/comparisons/sqlite/go/query.sql.go
index b32a885cac..f63f8fd9b1 100644
--- a/internal/endtoend/testdata/comparisons/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/comparisons/sqlite/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) AlsoNotEqual(ctx context.Context) ([]bool, error) {
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -54,9 +51,6 @@ func (q *Queries) Equal(ctx context.Context) ([]bool, error) {
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -81,9 +75,6 @@ func (q *Queries) GreaterThan(ctx context.Context) ([]bool, error) {
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -108,9 +99,6 @@ func (q *Queries) GreaterThanOrEqual(ctx context.Context) ([]bool, error) {
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -135,9 +123,6 @@ func (q *Queries) LessThan(ctx context.Context) ([]bool, error) {
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -162,9 +147,6 @@ func (q *Queries) LessThanOrEqual(ctx context.Context) ([]bool, error) {
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -189,9 +171,6 @@ func (q *Queries) NotEqual(ctx context.Context) ([]bool, error) {
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/composite_type/stdlib/go/query.sql.go b/internal/endtoend/testdata/composite_type/stdlib/go/query.sql.go
index 528bca13cb..67b1d85aaa 100644
--- a/internal/endtoend/testdata/composite_type/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/composite_type/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) ListPaths(ctx context.Context) ([]FooPath, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/create_materialized_view/postgresql/go/query.sql.go b/internal/endtoend/testdata/create_materialized_view/postgresql/go/query.sql.go
index dd2b7fd455..afd9c2dd77 100644
--- a/internal/endtoend/testdata/create_materialized_view/postgresql/go/query.sql.go
+++ b/internal/endtoend/testdata/create_materialized_view/postgresql/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) GetFirst(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, val)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/create_table_as/postgresql/go/query.sql.go b/internal/endtoend/testdata/create_table_as/postgresql/go/query.sql.go
index f7f2705b24..5b1f41191c 100644
--- a/internal/endtoend/testdata/create_table_as/postgresql/go/query.sql.go
+++ b/internal/endtoend/testdata/create_table_as/postgresql/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) GetFirst(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, val)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/create_table_like/mysql/go/query.sql.go b/internal/endtoend/testdata/create_table_like/mysql/go/query.sql.go
index 0b50142b8e..044ba664ae 100644
--- a/internal/endtoend/testdata/create_table_like/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/create_table_like/mysql/go/query.sql.go
@@ -32,9 +32,6 @@ func (q *Queries) GetAll(ctx context.Context) ([]SuperUser, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/create_table_like/postgresql/go/query.sql.go b/internal/endtoend/testdata/create_table_like/postgresql/go/query.sql.go
index 0b50142b8e..044ba664ae 100644
--- a/internal/endtoend/testdata/create_table_like/postgresql/go/query.sql.go
+++ b/internal/endtoend/testdata/create_table_like/postgresql/go/query.sql.go
@@ -32,9 +32,6 @@ func (q *Queries) GetAll(ctx context.Context) ([]SuperUser, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/create_view/mysql/go/query.sql.go b/internal/endtoend/testdata/create_view/mysql/go/query.sql.go
index ca55df0bb1..582e4861da 100644
--- a/internal/endtoend/testdata/create_view/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/create_view/mysql/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) GetFirst(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, val)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -54,9 +51,6 @@ func (q *Queries) GetSecond(ctx context.Context) ([]SecondView, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/create_view/postgresql/go/query.sql.go b/internal/endtoend/testdata/create_view/postgresql/go/query.sql.go
index 9908e04aca..aac3dfe5f9 100644
--- a/internal/endtoend/testdata/create_view/postgresql/go/query.sql.go
+++ b/internal/endtoend/testdata/create_view/postgresql/go/query.sql.go
@@ -28,9 +28,6 @@ func (q *Queries) GetFirst(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, val)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -55,9 +52,6 @@ func (q *Queries) GetSecond(ctx context.Context, val2 sql.NullInt32) ([]SecondVi
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/create_view/sqlite/go/query.sql.go b/internal/endtoend/testdata/create_view/sqlite/go/query.sql.go
index 52746d5bc3..d07ffb380d 100644
--- a/internal/endtoend/testdata/create_view/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/create_view/sqlite/go/query.sql.go
@@ -28,9 +28,6 @@ func (q *Queries) GetFirst(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, val)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -55,9 +52,6 @@ func (q *Queries) GetSecond(ctx context.Context, val2 sql.NullInt64) ([]SecondVi
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/cte_count/mysql/go/query.sql.go b/internal/endtoend/testdata/cte_count/mysql/go/query.sql.go
index 48a52b85b1..5d7e4f50ee 100644
--- a/internal/endtoend/testdata/cte_count/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/cte_count/mysql/go/query.sql.go
@@ -38,9 +38,6 @@ func (q *Queries) CTECount(ctx context.Context) ([]CTECountRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/cte_count/stdlib/go/query.sql.go b/internal/endtoend/testdata/cte_count/stdlib/go/query.sql.go
index 48a52b85b1..5d7e4f50ee 100644
--- a/internal/endtoend/testdata/cte_count/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/cte_count/stdlib/go/query.sql.go
@@ -38,9 +38,6 @@ func (q *Queries) CTECount(ctx context.Context) ([]CTECountRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/cte_filter/mysql/go/query.sql.go b/internal/endtoend/testdata/cte_filter/mysql/go/query.sql.go
index a130858a80..3364506c21 100644
--- a/internal/endtoend/testdata/cte_filter/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/cte_filter/mysql/go/query.sql.go
@@ -31,9 +31,6 @@ func (q *Queries) CTEFilter(ctx context.Context, ready bool) ([]int64, error) {
 		}
 		items = append(items, count)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/cte_filter/stdlib/go/query.sql.go b/internal/endtoend/testdata/cte_filter/stdlib/go/query.sql.go
index cd5081019c..c85289d8d8 100644
--- a/internal/endtoend/testdata/cte_filter/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/cte_filter/stdlib/go/query.sql.go
@@ -31,9 +31,6 @@ func (q *Queries) CTEFilter(ctx context.Context, ready bool) ([]int64, error) {
 		}
 		items = append(items, count)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/cte_in_delete/stdlib/go/query.sql.go b/internal/endtoend/testdata/cte_in_delete/stdlib/go/query.sql.go
index 3c54185f78..94968614e5 100644
--- a/internal/endtoend/testdata/cte_in_delete/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/cte_in_delete/stdlib/go/query.sql.go
@@ -31,9 +31,6 @@ func (q *Queries) DeleteReadyWithCTE(ctx context.Context) ([]int32, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/cte_recursive/mysql/go/query.sql.go b/internal/endtoend/testdata/cte_recursive/mysql/go/query.sql.go
index 7e52aca137..3c2d4c2985 100644
--- a/internal/endtoend/testdata/cte_recursive/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/cte_recursive/mysql/go/query.sql.go
@@ -40,9 +40,6 @@ func (q *Queries) CTERecursive(ctx context.Context, id int32) ([]CTERecursiveRow
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/cte_recursive/stdlib/go/query.sql.go b/internal/endtoend/testdata/cte_recursive/stdlib/go/query.sql.go
index 4b78f50504..6534f779eb 100644
--- a/internal/endtoend/testdata/cte_recursive/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/cte_recursive/stdlib/go/query.sql.go
@@ -40,9 +40,6 @@ func (q *Queries) CTERecursive(ctx context.Context, id int32) ([]CTERecursiveRow
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/cte_recursive_star/postgresql/pgx/go/query.sql.go b/internal/endtoend/testdata/cte_recursive_star/postgresql/pgx/go/query.sql.go
index 8519b04c73..9d495a36f1 100644
--- a/internal/endtoend/testdata/cte_recursive_star/postgresql/pgx/go/query.sql.go
+++ b/internal/endtoend/testdata/cte_recursive_star/postgresql/pgx/go/query.sql.go
@@ -26,7 +26,7 @@ type GetDictTreeRow struct {
 	ParentCode string
 	Label      string
 	Value      pgtype.Text
-	Path       []string
+	Path       interface{}
 	Depth      int32
 }
 
diff --git a/internal/endtoend/testdata/data_type_boolean/mysql/db/query.sql.go b/internal/endtoend/testdata/data_type_boolean/mysql/db/query.sql.go
index df3364012d..4d69ba9351 100644
--- a/internal/endtoend/testdata/data_type_boolean/mysql/db/query.sql.go
+++ b/internal/endtoend/testdata/data_type_boolean/mysql/db/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) ListBar(ctx context.Context) ([]Bar, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -54,9 +51,6 @@ func (q *Queries) ListFoo(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/data_type_boolean/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/data_type_boolean/postgresql/stdlib/go/query.sql.go
index 891f1dc412..0d23752296 100644
--- a/internal/endtoend/testdata/data_type_boolean/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/data_type_boolean/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) ListBar(ctx context.Context) ([]Bar, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -54,9 +51,6 @@ func (q *Queries) ListFoo(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/data_type_boolean/sqlite/db/query.sql.go b/internal/endtoend/testdata/data_type_boolean/sqlite/db/query.sql.go
index 7154a09d2f..10c6a8c72f 100644
--- a/internal/endtoend/testdata/data_type_boolean/sqlite/db/query.sql.go
+++ b/internal/endtoend/testdata/data_type_boolean/sqlite/db/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) ListBar(ctx context.Context) ([]Bar, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -54,9 +51,6 @@ func (q *Queries) ListFoo(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/ddl_alter_table_add_column/sqlite/go/query.sql.go b/internal/endtoend/testdata/ddl_alter_table_add_column/sqlite/go/query.sql.go
index 0646b88259..64fdc67237 100644
--- a/internal/endtoend/testdata/ddl_alter_table_add_column/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/ddl_alter_table_add_column/sqlite/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) Placeholder(ctx context.Context) ([]Venue, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/ddl_alter_table_rename/sqlite/go/query.sql.go b/internal/endtoend/testdata/ddl_alter_table_rename/sqlite/go/query.sql.go
index b2839a94df..de74326cb0 100644
--- a/internal/endtoend/testdata/ddl_alter_table_rename/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/ddl_alter_table_rename/sqlite/go/query.sql.go
@@ -28,9 +28,6 @@ func (q *Queries) Placeholder(ctx context.Context) ([]sql.NullString, error) {
 		}
 		items = append(items, name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/ddl_alter_table_rename_column/sqlite/go/query.sql.go b/internal/endtoend/testdata/ddl_alter_table_rename_column/sqlite/go/query.sql.go
index 1cabc0ca4c..6baeebb193 100644
--- a/internal/endtoend/testdata/ddl_alter_table_rename_column/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/ddl_alter_table_rename_column/sqlite/go/query.sql.go
@@ -28,9 +28,6 @@ func (q *Queries) Placeholder(ctx context.Context) ([]sql.NullString, error) {
 		}
 		items = append(items, boo)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/ddl_alter_type_rename/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/ddl_alter_type_rename/postgresql/stdlib/go/query.sql.go
index 2daa5cecb4..300ce2c078 100644
--- a/internal/endtoend/testdata/ddl_alter_type_rename/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/ddl_alter_type_rename/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) ListAuthors(ctx context.Context) ([]LogLine, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/ddl_alter_type_rename_and_update_columns/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/ddl_alter_type_rename_and_update_columns/postgresql/stdlib/go/query.sql.go
index 2daa5cecb4..300ce2c078 100644
--- a/internal/endtoend/testdata/ddl_alter_type_rename_and_update_columns/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/ddl_alter_type_rename_and_update_columns/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) ListAuthors(ctx context.Context) ([]LogLine, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/ddl_alter_type_set_schema/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/ddl_alter_type_set_schema/postgresql/stdlib/go/query.sql.go
index de2e826e5e..f2de1e3fb7 100644
--- a/internal/endtoend/testdata/ddl_alter_type_set_schema/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/ddl_alter_type_set_schema/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) ListAuthors(ctx context.Context) ([]LogLine, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/ddl_create_enum/mysql/go/query.sql.go b/internal/endtoend/testdata/ddl_create_enum/mysql/go/query.sql.go
index 004bd2be11..365b51ba91 100644
--- a/internal/endtoend/testdata/ddl_create_enum/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/ddl_create_enum/mysql/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) ListFoo(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/ddl_create_enum/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/ddl_create_enum/postgresql/stdlib/go/query.sql.go
index 1496c7047d..22ef83525a 100644
--- a/internal/endtoend/testdata/ddl_create_enum/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/ddl_create_enum/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) ListFoo(ctx context.Context) ([]Foobar, error) {
 		}
 		items = append(items, val)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/stdlib/go/query.sql.go
index daa0f1f186..7b6edb9fb0 100644
--- a/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) GetAllOrganisations(ctx context.Context) ([]Organisation, erro
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -54,9 +51,6 @@ func (q *Queries) GetAllParties(ctx context.Context) ([]Party, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -86,9 +80,6 @@ func (q *Queries) GetAllPeople(ctx context.Context) ([]Person, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/diff_no_output/go/query.sql.go b/internal/endtoend/testdata/diff_no_output/go/query.sql.go
index 846197947b..16e458b868 100644
--- a/internal/endtoend/testdata/diff_no_output/go/query.sql.go
+++ b/internal/endtoend/testdata/diff_no_output/go/query.sql.go
@@ -62,9 +62,6 @@ func (q *Queries) ListAuthors(ctx context.Context) ([]Author, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/diff_output/go/query.sql.go b/internal/endtoend/testdata/diff_output/go/query.sql.go
index 4249a55b5c..16e458b868 100644
--- a/internal/endtoend/testdata/diff_output/go/query.sql.go
+++ b/internal/endtoend/testdata/diff_output/go/query.sql.go
@@ -31,16 +31,6 @@ func (q *Queries) CreateAuthor(ctx context.Context, arg CreateAuthorParams) (Aut
 	return i, err
 }
 
-const deleteAuthor = `-- name: DeleteAuthor :exec
-DELETE FROM authors
-WHERE id = $1
-`
-
-func (q *Queries) DeleteAuthor(ctx context.Context, id int64) error {
-	_, err := q.db.ExecContext(ctx, deleteAuthor, id)
-	return err
-}
-
 const getAuthor = `-- name: GetAuthor :one
 SELECT id, name, bio FROM authors
 WHERE id = $1 LIMIT 1
@@ -55,7 +45,7 @@ func (q *Queries) GetAuthor(ctx context.Context, id int64) (Author, error) {
 
 const listAuthors = `-- name: ListAuthors :many
 SELECT id, name, bio FROM authors
-ORDER BY name
+ORDER BY bio
 `
 
 func (q *Queries) ListAuthors(ctx context.Context) ([]Author, error) {
@@ -72,11 +62,19 @@ func (q *Queries) ListAuthors(ctx context.Context) ([]Author, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
 	return items, nil
 }
+
+const selectOne = `-- name: SelectOne :one
+SELECT 1
+`
+
+func (q *Queries) SelectOne(ctx context.Context) (int32, error) {
+	row := q.db.QueryRowContext(ctx, selectOne)
+	var column_1 int32
+	err := row.Scan(&column_1)
+	return column_1, err
+}
diff --git a/internal/endtoend/testdata/emit_db_and_json_tags/mysql/go/query.sql.go b/internal/endtoend/testdata/emit_db_and_json_tags/mysql/go/query.sql.go
index 28fc0625e1..dd8eb42027 100644
--- a/internal/endtoend/testdata/emit_db_and_json_tags/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/emit_db_and_json_tags/mysql/go/query.sql.go
@@ -32,9 +32,6 @@ func (q *Queries) GetAll(ctx context.Context) ([]User, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/emit_db_and_json_tags/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/emit_db_and_json_tags/postgresql/stdlib/go/query.sql.go
index 28fc0625e1..dd8eb42027 100644
--- a/internal/endtoend/testdata/emit_db_and_json_tags/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/emit_db_and_json_tags/postgresql/stdlib/go/query.sql.go
@@ -32,9 +32,6 @@ func (q *Queries) GetAll(ctx context.Context) ([]User, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/emit_db_and_json_tags/sqlite/go/query.sql.go b/internal/endtoend/testdata/emit_db_and_json_tags/sqlite/go/query.sql.go
index 28fc0625e1..dd8eb42027 100644
--- a/internal/endtoend/testdata/emit_db_and_json_tags/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/emit_db_and_json_tags/sqlite/go/query.sql.go
@@ -32,9 +32,6 @@ func (q *Queries) GetAll(ctx context.Context) ([]User, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/emit_db_tags/mysql/go/query.sql.go b/internal/endtoend/testdata/emit_db_tags/mysql/go/query.sql.go
index 28fc0625e1..dd8eb42027 100644
--- a/internal/endtoend/testdata/emit_db_tags/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/emit_db_tags/mysql/go/query.sql.go
@@ -32,9 +32,6 @@ func (q *Queries) GetAll(ctx context.Context) ([]User, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/emit_db_tags/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/emit_db_tags/postgresql/stdlib/go/query.sql.go
index 28fc0625e1..dd8eb42027 100644
--- a/internal/endtoend/testdata/emit_db_tags/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/emit_db_tags/postgresql/stdlib/go/query.sql.go
@@ -32,9 +32,6 @@ func (q *Queries) GetAll(ctx context.Context) ([]User, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/emit_db_tags/sqlite/go/query.sql.go b/internal/endtoend/testdata/emit_db_tags/sqlite/go/query.sql.go
index 28fc0625e1..dd8eb42027 100644
--- a/internal/endtoend/testdata/emit_db_tags/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/emit_db_tags/sqlite/go/query.sql.go
@@ -32,9 +32,6 @@ func (q *Queries) GetAll(ctx context.Context) ([]User, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/emit_empty_slices/stdlib/go/query.sql.go b/internal/endtoend/testdata/emit_empty_slices/stdlib/go/query.sql.go
index e7bc33a0b2..8fc1e37349 100644
--- a/internal/endtoend/testdata/emit_empty_slices/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/emit_empty_slices/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) ListBar(ctx context.Context) ([]int32, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/emit_methods_with_db_argument/mysql/go/query.sql.go b/internal/endtoend/testdata/emit_methods_with_db_argument/mysql/go/query.sql.go
index 5b73d5cb4c..e14aa96cf3 100644
--- a/internal/endtoend/testdata/emit_methods_with_db_argument/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/emit_methods_with_db_argument/mysql/go/query.sql.go
@@ -32,9 +32,6 @@ func (q *Queries) GetAll(ctx context.Context, db DBTX) ([]User, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/emit_methods_with_db_argument/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/emit_methods_with_db_argument/postgresql/stdlib/go/query.sql.go
index 5b73d5cb4c..e14aa96cf3 100644
--- a/internal/endtoend/testdata/emit_methods_with_db_argument/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/emit_methods_with_db_argument/postgresql/stdlib/go/query.sql.go
@@ -32,9 +32,6 @@ func (q *Queries) GetAll(ctx context.Context, db DBTX) ([]User, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/emit_methods_with_db_argument/sqlite/go/query.sql.go b/internal/endtoend/testdata/emit_methods_with_db_argument/sqlite/go/query.sql.go
index 5b73d5cb4c..e14aa96cf3 100644
--- a/internal/endtoend/testdata/emit_methods_with_db_argument/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/emit_methods_with_db_argument/sqlite/go/query.sql.go
@@ -32,9 +32,6 @@ func (q *Queries) GetAll(ctx context.Context, db DBTX) ([]User, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/emit_result_and_params_struct_pointers/mysql/go/query.sql.go b/internal/endtoend/testdata/emit_result_and_params_struct_pointers/mysql/go/query.sql.go
index b79bbf75ef..a63e950df2 100644
--- a/internal/endtoend/testdata/emit_result_and_params_struct_pointers/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/emit_result_and_params_struct_pointers/mysql/go/query.sql.go
@@ -28,9 +28,6 @@ func (q *Queries) GetAll(ctx context.Context) ([]*Foo, error) {
 		}
 		items = append(items, &i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -55,9 +52,6 @@ func (q *Queries) GetAllAByB(ctx context.Context, b sql.NullInt32) ([]sql.NullIn
 		}
 		items = append(items, a)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/emit_sql_as_comment/stdlib/go/query.sql.go b/internal/endtoend/testdata/emit_sql_as_comment/stdlib/go/query.sql.go
index b07d721eec..e33ba0f4df 100644
--- a/internal/endtoend/testdata/emit_sql_as_comment/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/emit_sql_as_comment/stdlib/go/query.sql.go
@@ -34,9 +34,6 @@ func (q *Queries) ListBar(ctx context.Context) ([]int32, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/enum/mysql/go/query.sql.go b/internal/endtoend/testdata/enum/mysql/go/query.sql.go
index 8a9025425b..172791aa9e 100644
--- a/internal/endtoend/testdata/enum/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/enum/mysql/go/query.sql.go
@@ -50,9 +50,6 @@ func (q *Queries) GetAll(ctx context.Context, db DBTX) ([]User, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/enum/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/enum/postgresql/stdlib/go/query.sql.go
index bf3e7747ed..a1986dd0a0 100644
--- a/internal/endtoend/testdata/enum/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/enum/postgresql/stdlib/go/query.sql.go
@@ -50,9 +50,6 @@ func (q *Queries) GetAll(ctx context.Context, db DBTX) ([]User, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/enum_column/mysql/go/query.sql.go b/internal/endtoend/testdata/enum_column/mysql/go/query.sql.go
index 054fa629c5..6da06eb078 100644
--- a/internal/endtoend/testdata/enum_column/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/enum_column/mysql/go/query.sql.go
@@ -34,9 +34,6 @@ func (q *Queries) ListAuthors(ctx context.Context) ([]Author, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -61,9 +58,6 @@ func (q *Queries) ListBooks(ctx context.Context) ([]Book, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/enum_ordering/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/enum_ordering/postgresql/stdlib/go/query.sql.go
index a4a04b6ff4..2f3e4605aa 100644
--- a/internal/endtoend/testdata/enum_ordering/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/enum_ordering/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) GetAll(ctx context.Context) ([]int32, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/func_aggregate/pganalyze/go/query.sql.go b/internal/endtoend/testdata/func_aggregate/pganalyze/go/query.sql.go
index f3b25bc4bf..9603f76862 100644
--- a/internal/endtoend/testdata/func_aggregate/pganalyze/go/query.sql.go
+++ b/internal/endtoend/testdata/func_aggregate/pganalyze/go/query.sql.go
@@ -14,9 +14,9 @@ select percentile_disc(0.5) within group (order by authors.name)
 from authors
 `
 
-func (q *Queries) Percentile(ctx context.Context) (string, error) {
+func (q *Queries) Percentile(ctx context.Context) (interface{}, error) {
 	row := q.db.QueryRowContext(ctx, percentile)
-	var percentile_disc string
+	var percentile_disc interface{}
 	err := row.Scan(&percentile_disc)
 	return percentile_disc, err
 }
diff --git a/internal/endtoend/testdata/func_match_types/mysql/go/query.sql.go b/internal/endtoend/testdata/func_match_types/mysql/go/query.sql.go
index c8d439d43d..7d88595028 100644
--- a/internal/endtoend/testdata/func_match_types/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/func_match_types/mysql/go/query.sql.go
@@ -35,9 +35,6 @@ func (q *Queries) AuthorPages(ctx context.Context) ([]AuthorPagesRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/func_match_types/postgresql/go/query.sql.go b/internal/endtoend/testdata/func_match_types/postgresql/go/query.sql.go
index 51782f15e5..088850cc96 100644
--- a/internal/endtoend/testdata/func_match_types/postgresql/go/query.sql.go
+++ b/internal/endtoend/testdata/func_match_types/postgresql/go/query.sql.go
@@ -35,9 +35,6 @@ func (q *Queries) AuthorPages(ctx context.Context) ([]AuthorPagesRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/func_match_types/sqlite/go/query.sql.go b/internal/endtoend/testdata/func_match_types/sqlite/go/query.sql.go
index 8293640679..2f52758115 100644
--- a/internal/endtoend/testdata/func_match_types/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/func_match_types/sqlite/go/query.sql.go
@@ -36,9 +36,6 @@ func (q *Queries) AuthorPages(ctx context.Context) ([]AuthorPagesRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/func_return_date/postgresql/pganalyze/go/query.sql.go b/internal/endtoend/testdata/func_return_date/postgresql/pganalyze/go/query.sql.go
index af611077c4..29d12c0063 100644
--- a/internal/endtoend/testdata/func_return_date/postgresql/pganalyze/go/query.sql.go
+++ b/internal/endtoend/testdata/func_return_date/postgresql/pganalyze/go/query.sql.go
@@ -7,17 +7,15 @@ package querytest
 
 import (
 	"context"
-
-	"github.com/jackc/pgx/v5/pgtype"
 )
 
 const getDate = `-- name: GetDate :one
 SELECT now from NOW()
 `
 
-func (q *Queries) GetDate(ctx context.Context) (pgtype.Timestamptz, error) {
+func (q *Queries) GetDate(ctx context.Context) (interface{}, error) {
 	row := q.db.QueryRow(ctx, getDate)
-	var now pgtype.Timestamptz
+	var now interface{}
 	err := row.Scan(&now)
 	return now, err
 }
diff --git a/internal/endtoend/testdata/func_return_series/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/func_return_series/postgresql/stdlib/go/query.sql.go
index 6c262200b4..58084906a4 100644
--- a/internal/endtoend/testdata/func_return_series/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/func_return_series/postgresql/stdlib/go/query.sql.go
@@ -34,9 +34,6 @@ func (q *Queries) GenerateSeries(ctx context.Context, arg GenerateSeriesParams)
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/golang_initialisms_empty/db/query.sql.go b/internal/endtoend/testdata/golang_initialisms_empty/db/query.sql.go
index ea6bbec26d..133f867b45 100644
--- a/internal/endtoend/testdata/golang_initialisms_empty/db/query.sql.go
+++ b/internal/endtoend/testdata/golang_initialisms_empty/db/query.sql.go
@@ -28,9 +28,6 @@ func (q *Queries) SelectFoo(ctx context.Context) ([]sql.NullString, error) {
 		}
 		items = append(items, bar_id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/golang_initialisms_url/db/query.sql.go b/internal/endtoend/testdata/golang_initialisms_url/db/query.sql.go
index 48958da69b..be2a8eae55 100644
--- a/internal/endtoend/testdata/golang_initialisms_url/db/query.sql.go
+++ b/internal/endtoend/testdata/golang_initialisms_url/db/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) SelectFoo(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/having/mysql/go/query.sql.go b/internal/endtoend/testdata/having/mysql/go/query.sql.go
index 70f553ac50..79d70236fd 100644
--- a/internal/endtoend/testdata/having/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/having/mysql/go/query.sql.go
@@ -30,9 +30,6 @@ func (q *Queries) ColdCities(ctx context.Context, tempLo int32) ([]string, error
 		}
 		items = append(items, city)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/having/postgresql/go/query.sql.go b/internal/endtoend/testdata/having/postgresql/go/query.sql.go
index 3a172bc015..be2d392b07 100644
--- a/internal/endtoend/testdata/having/postgresql/go/query.sql.go
+++ b/internal/endtoend/testdata/having/postgresql/go/query.sql.go
@@ -30,9 +30,6 @@ func (q *Queries) ColdCities(ctx context.Context, tempLo int32) ([]string, error
 		}
 		items = append(items, city)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/hstore/stdlib/go/hstore.sql.go b/internal/endtoend/testdata/hstore/stdlib/go/hstore.sql.go
index 8edf4f6719..dac9b93e2b 100644
--- a/internal/endtoend/testdata/hstore/stdlib/go/hstore.sql.go
+++ b/internal/endtoend/testdata/hstore/stdlib/go/hstore.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) ListBar(ctx context.Context) ([]interface{}, error) {
 		}
 		items = append(items, bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -54,9 +51,6 @@ func (q *Queries) ListBaz(ctx context.Context) ([]interface{}, error) {
 		}
 		items = append(items, baz)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/identical_tables/mysql/go/query.sql.go b/internal/endtoend/testdata/identical_tables/mysql/go/query.sql.go
index 59101f6229..88be3e9327 100644
--- a/internal/endtoend/testdata/identical_tables/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/identical_tables/mysql/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) IdenticalTable(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/identical_tables/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/identical_tables/postgresql/stdlib/go/query.sql.go
index 59101f6229..88be3e9327 100644
--- a/internal/endtoend/testdata/identical_tables/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/identical_tables/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) IdenticalTable(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/identical_tables/sqlite/go/query.sql.go b/internal/endtoend/testdata/identical_tables/sqlite/go/query.sql.go
index 59101f6229..88be3e9327 100644
--- a/internal/endtoend/testdata/identical_tables/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/identical_tables/sqlite/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) IdenticalTable(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/identifier_case_sensitivity/db/query.sql.go b/internal/endtoend/testdata/identifier_case_sensitivity/db/query.sql.go
index 7293601a30..ad90f99d4c 100644
--- a/internal/endtoend/testdata/identifier_case_sensitivity/db/query.sql.go
+++ b/internal/endtoend/testdata/identifier_case_sensitivity/db/query.sql.go
@@ -68,9 +68,6 @@ func (q *Queries) ListAuthors(ctx context.Context) ([]Author, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/in_union/mysql/go/query.sql.go b/internal/endtoend/testdata/in_union/mysql/go/query.sql.go
index 753116f601..75448daa13 100644
--- a/internal/endtoend/testdata/in_union/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/in_union/mysql/go/query.sql.go
@@ -28,9 +28,6 @@ func (q *Queries) GetAuthors(ctx context.Context) ([]Author, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/inflection/mysql/go/query.sql.go b/internal/endtoend/testdata/inflection/mysql/go/query.sql.go
index 83b91a5a51..12c3962fc8 100644
--- a/internal/endtoend/testdata/inflection/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/inflection/mysql/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) GetProductMetadata(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -54,9 +51,6 @@ func (q *Queries) ListCalories(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -81,9 +75,6 @@ func (q *Queries) ListCampuses(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -108,9 +99,6 @@ func (q *Queries) ListMetadata(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -135,9 +123,6 @@ func (q *Queries) ListStudents(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/inflection/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/inflection/postgresql/stdlib/go/query.sql.go
index 83b91a5a51..12c3962fc8 100644
--- a/internal/endtoend/testdata/inflection/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/inflection/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) GetProductMetadata(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -54,9 +51,6 @@ func (q *Queries) ListCalories(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -81,9 +75,6 @@ func (q *Queries) ListCampuses(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -108,9 +99,6 @@ func (q *Queries) ListMetadata(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -135,9 +123,6 @@ func (q *Queries) ListStudents(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/inflection/sqlite/go/query.sql.go b/internal/endtoend/testdata/inflection/sqlite/go/query.sql.go
index 83b91a5a51..12c3962fc8 100644
--- a/internal/endtoend/testdata/inflection/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/inflection/sqlite/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) GetProductMetadata(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -54,9 +51,6 @@ func (q *Queries) ListCalories(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -81,9 +75,6 @@ func (q *Queries) ListCampuses(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -108,9 +99,6 @@ func (q *Queries) ListMetadata(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -135,9 +123,6 @@ func (q *Queries) ListStudents(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/interval/stdlib/go/query.sql.go b/internal/endtoend/testdata/interval/stdlib/go/query.sql.go
index 411efc0396..3167710a9c 100644
--- a/internal/endtoend/testdata/interval/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/interval/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) Get(ctx context.Context, limit int32) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_alias/mysql/go/query.sql.go b/internal/endtoend/testdata/join_alias/mysql/go/query.sql.go
index a3ccd51665..7fa5b0368c 100644
--- a/internal/endtoend/testdata/join_alias/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/join_alias/mysql/go/query.sql.go
@@ -37,9 +37,6 @@ func (q *Queries) AliasExpand(ctx context.Context, id uint64) ([]AliasExpandRow,
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -72,9 +69,6 @@ func (q *Queries) AliasJoin(ctx context.Context, id uint64) ([]AliasJoinRow, err
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_alias/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/join_alias/postgresql/stdlib/go/query.sql.go
index b556736dc7..d3e907e952 100644
--- a/internal/endtoend/testdata/join_alias/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/join_alias/postgresql/stdlib/go/query.sql.go
@@ -37,9 +37,6 @@ func (q *Queries) AliasExpand(ctx context.Context, id int32) ([]AliasExpandRow,
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -72,9 +69,6 @@ func (q *Queries) AliasJoin(ctx context.Context, id int32) ([]AliasJoinRow, erro
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_alias/sqlite/go/query.sql.go b/internal/endtoend/testdata/join_alias/sqlite/go/query.sql.go
index f7c6938509..65b6594e48 100644
--- a/internal/endtoend/testdata/join_alias/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/join_alias/sqlite/go/query.sql.go
@@ -37,9 +37,6 @@ func (q *Queries) AliasExpand(ctx context.Context, id int64) ([]AliasExpandRow,
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -72,9 +69,6 @@ func (q *Queries) AliasJoin(ctx context.Context, id int64) ([]AliasJoinRow, erro
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_clauses_order/postgresql/go/query.sql.go b/internal/endtoend/testdata/join_clauses_order/postgresql/go/query.sql.go
index e433e229c0..6cf9c8a80d 100644
--- a/internal/endtoend/testdata/join_clauses_order/postgresql/go/query.sql.go
+++ b/internal/endtoend/testdata/join_clauses_order/postgresql/go/query.sql.go
@@ -37,9 +37,6 @@ func (q *Queries) TestInnerLeft(ctx context.Context) ([]TestInnerLeftRow, error)
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -83,9 +80,6 @@ func (q *Queries) TestInnerLeftInnerLeft(ctx context.Context) ([]TestInnerLeftIn
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -119,9 +113,6 @@ func (q *Queries) TestLeftInner(ctx context.Context) ([]TestLeftInnerRow, error)
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -165,9 +156,6 @@ func (q *Queries) TestLeftInnerLeftInner(ctx context.Context) ([]TestLeftInnerLe
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_from/mysql/go/query.sql.go b/internal/endtoend/testdata/join_from/mysql/go/query.sql.go
index 365fe56680..03ea52ce1d 100644
--- a/internal/endtoend/testdata/join_from/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/join_from/mysql/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) MultiFrom(ctx context.Context, login string) ([]string, error)
 		}
 		items = append(items, email)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_from/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/join_from/postgresql/stdlib/go/query.sql.go
index 101835b6b1..41443da7ca 100644
--- a/internal/endtoend/testdata/join_from/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/join_from/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) MultiFrom(ctx context.Context, login string) ([]string, error)
 		}
 		items = append(items, email)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_from/sqlite/go/query.sql.go b/internal/endtoend/testdata/join_from/sqlite/go/query.sql.go
index 365fe56680..03ea52ce1d 100644
--- a/internal/endtoend/testdata/join_from/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/join_from/sqlite/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) MultiFrom(ctx context.Context, login string) ([]string, error)
 		}
 		items = append(items, email)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_full/postgresql/go/query.sql.go b/internal/endtoend/testdata/join_full/postgresql/go/query.sql.go
index a6ac8f637a..41d60c2c3c 100644
--- a/internal/endtoend/testdata/join_full/postgresql/go/query.sql.go
+++ b/internal/endtoend/testdata/join_full/postgresql/go/query.sql.go
@@ -37,9 +37,6 @@ func (q *Queries) FullJoin(ctx context.Context, id int32) ([]FullJoinRow, error)
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_group_by_alias/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/join_group_by_alias/postgresql/stdlib/go/query.sql.go
index d69281b300..5e44f84b78 100644
--- a/internal/endtoend/testdata/join_group_by_alias/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/join_group_by_alias/postgresql/stdlib/go/query.sql.go
@@ -29,9 +29,6 @@ func (q *Queries) ColumnAsGroupBy(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_inner/postgresql/go/query.sql.go b/internal/endtoend/testdata/join_inner/postgresql/go/query.sql.go
index 553f0d29dc..fcfdbb56cb 100644
--- a/internal/endtoend/testdata/join_inner/postgresql/go/query.sql.go
+++ b/internal/endtoend/testdata/join_inner/postgresql/go/query.sql.go
@@ -32,9 +32,6 @@ func (q *Queries) SelectAllJoined(ctx context.Context, handler sql.NullString) (
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -63,9 +60,6 @@ func (q *Queries) SelectAllJoinedAlias(ctx context.Context, handler sql.NullStri
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_left/mysql/go/query.sql.go b/internal/endtoend/testdata/join_left/mysql/go/query.sql.go
index f3c66eb868..db8b7f9089 100644
--- a/internal/endtoend/testdata/join_left/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/join_left/mysql/go/query.sql.go
@@ -48,9 +48,6 @@ func (q *Queries) AllAuthors(ctx context.Context) ([]AllAuthorsRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -94,9 +91,6 @@ func (q *Queries) AllAuthorsAliases(ctx context.Context) ([]AllAuthorsAliasesRow
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -140,9 +134,6 @@ func (q *Queries) AllAuthorsAliases2(ctx context.Context) ([]AllAuthorsAliases2R
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -186,9 +177,6 @@ func (q *Queries) AllSuperAuthors(ctx context.Context) ([]AllSuperAuthorsRow, er
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -232,9 +220,6 @@ func (q *Queries) AllSuperAuthorsAliases(ctx context.Context) ([]AllSuperAuthors
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -278,9 +263,6 @@ func (q *Queries) AllSuperAuthorsAliases2(ctx context.Context) ([]AllSuperAuthor
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -315,9 +297,6 @@ func (q *Queries) GetMayors(ctx context.Context) ([]GetMayorsRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -354,9 +333,6 @@ func (q *Queries) GetMayorsOptional(ctx context.Context) ([]GetMayorsOptionalRow
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -423,9 +399,6 @@ func (q *Queries) GetSuggestedUsersByID(ctx context.Context) ([]GetSuggestedUser
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_left/postgresql/go/query.sql.go b/internal/endtoend/testdata/join_left/postgresql/go/query.sql.go
index 41e158a605..ae96776c40 100644
--- a/internal/endtoend/testdata/join_left/postgresql/go/query.sql.go
+++ b/internal/endtoend/testdata/join_left/postgresql/go/query.sql.go
@@ -50,9 +50,6 @@ func (q *Queries) AllAuthors(ctx context.Context) ([]AllAuthorsRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -96,9 +93,6 @@ func (q *Queries) AllAuthorsAliases(ctx context.Context) ([]AllAuthorsAliasesRow
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -142,9 +136,6 @@ func (q *Queries) AllAuthorsAliases2(ctx context.Context) ([]AllAuthorsAliases2R
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -188,9 +179,6 @@ func (q *Queries) AllSuperAuthors(ctx context.Context) ([]AllSuperAuthorsRow, er
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -234,9 +222,6 @@ func (q *Queries) AllSuperAuthorsAliases(ctx context.Context) ([]AllSuperAuthors
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -280,9 +265,6 @@ func (q *Queries) AllSuperAuthorsAliases2(ctx context.Context) ([]AllSuperAuthor
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -317,9 +299,6 @@ func (q *Queries) GetMayors(ctx context.Context) ([]GetMayorsRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -354,9 +333,6 @@ func (q *Queries) GetMayorsOptional(ctx context.Context) ([]GetMayorsOptionalRow
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -429,9 +405,6 @@ func (q *Queries) GetSuggestedUsersByID(ctx context.Context, arg GetSuggestedUse
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_left/sqlite/go/query.sql.go b/internal/endtoend/testdata/join_left/sqlite/go/query.sql.go
index 94d4d7df60..80e99c6cf7 100644
--- a/internal/endtoend/testdata/join_left/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/join_left/sqlite/go/query.sql.go
@@ -48,9 +48,6 @@ func (q *Queries) AllAuthors(ctx context.Context) ([]AllAuthorsRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -94,9 +91,6 @@ func (q *Queries) AllAuthorsAliases(ctx context.Context) ([]AllAuthorsAliasesRow
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -140,9 +134,6 @@ func (q *Queries) AllAuthorsAliases2(ctx context.Context) ([]AllAuthorsAliases2R
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -186,9 +177,6 @@ func (q *Queries) AllSuperAuthors(ctx context.Context) ([]AllSuperAuthorsRow, er
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -232,9 +220,6 @@ func (q *Queries) AllSuperAuthorsAliases(ctx context.Context) ([]AllSuperAuthors
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -278,9 +263,6 @@ func (q *Queries) AllSuperAuthorsAliases2(ctx context.Context) ([]AllSuperAuthor
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -315,9 +297,6 @@ func (q *Queries) GetMayors(ctx context.Context) ([]GetMayorsRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -354,9 +333,6 @@ func (q *Queries) GetMayorsOptional(ctx context.Context) ([]GetMayorsOptionalRow
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -423,9 +399,6 @@ func (q *Queries) GetSuggestedUsersByID(ctx context.Context, userID int64) ([]Ge
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -454,9 +427,6 @@ func (q *Queries) GetSuggestedUsersByID2(ctx context.Context, userID int64) ([]i
 		}
 		items = append(items, user_id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_left_same_table/mysql/go/query.sql.go b/internal/endtoend/testdata/join_left_same_table/mysql/go/query.sql.go
index 8e6f9ff165..ca28517aa0 100644
--- a/internal/endtoend/testdata/join_left_same_table/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/join_left_same_table/mysql/go/query.sql.go
@@ -46,9 +46,6 @@ func (q *Queries) AllAuthors(ctx context.Context) ([]AllAuthorsRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_left_same_table/postgres/go/query.sql.go b/internal/endtoend/testdata/join_left_same_table/postgres/go/query.sql.go
index b2bf9ab002..5ea9833a1a 100644
--- a/internal/endtoend/testdata/join_left_same_table/postgres/go/query.sql.go
+++ b/internal/endtoend/testdata/join_left_same_table/postgres/go/query.sql.go
@@ -45,9 +45,6 @@ func (q *Queries) AllAuthors(ctx context.Context) ([]AllAuthorsRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_left_same_table/sqlite/go/query.sql.go b/internal/endtoend/testdata/join_left_same_table/sqlite/go/query.sql.go
index f542f98faa..cc27318808 100644
--- a/internal/endtoend/testdata/join_left_same_table/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/join_left_same_table/sqlite/go/query.sql.go
@@ -46,9 +46,6 @@ func (q *Queries) AllAuthors(ctx context.Context) ([]AllAuthorsRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_order_by/postgresql/pgx/sqlc.yaml b/internal/endtoend/testdata/join_order_by/postgresql/pgx/sqlc.yaml
index 5dc63e3f91..7112439fdd 100644
--- a/internal/endtoend/testdata/join_order_by/postgresql/pgx/sqlc.yaml
+++ b/internal/endtoend/testdata/join_order_by/postgresql/pgx/sqlc.yaml
@@ -3,6 +3,7 @@ sql:
   - engine: "postgresql"
     schema: "schema.sql"
     queries: "query.sql"
+    strict_order_by: false
     gen:
       go:
         package: "querytest"
diff --git a/internal/endtoend/testdata/join_order_by_alias/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/join_order_by_alias/postgresql/stdlib/go/query.sql.go
index 68590026d7..1b9e16da0c 100644
--- a/internal/endtoend/testdata/join_order_by_alias/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/join_order_by_alias/postgresql/stdlib/go/query.sql.go
@@ -29,9 +29,6 @@ func (q *Queries) ColumnAsOrderBy(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_right/mysql/go/query.sql.go b/internal/endtoend/testdata/join_right/mysql/go/query.sql.go
index 501d06435b..689ff2f39a 100644
--- a/internal/endtoend/testdata/join_right/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/join_right/mysql/go/query.sql.go
@@ -37,9 +37,6 @@ func (q *Queries) RightJoin(ctx context.Context, id int32) ([]RightJoinRow, erro
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_right/postgresql/go/query.sql.go b/internal/endtoend/testdata/join_right/postgresql/go/query.sql.go
index 9f0bf7309d..e299855a35 100644
--- a/internal/endtoend/testdata/join_right/postgresql/go/query.sql.go
+++ b/internal/endtoend/testdata/join_right/postgresql/go/query.sql.go
@@ -37,9 +37,6 @@ func (q *Queries) RightJoin(ctx context.Context, id int32) ([]RightJoinRow, erro
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_two_tables/mysql/go/query.sql.go b/internal/endtoend/testdata/join_two_tables/mysql/go/query.sql.go
index eb7d7e1bb8..2399c80d75 100644
--- a/internal/endtoend/testdata/join_two_tables/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/join_two_tables/mysql/go/query.sql.go
@@ -30,9 +30,6 @@ func (q *Queries) TwoJoins(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_two_tables/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/join_two_tables/postgresql/stdlib/go/query.sql.go
index eb7d7e1bb8..2399c80d75 100644
--- a/internal/endtoend/testdata/join_two_tables/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/join_two_tables/postgresql/stdlib/go/query.sql.go
@@ -30,9 +30,6 @@ func (q *Queries) TwoJoins(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_two_tables/sqlite/go/query.sql.go b/internal/endtoend/testdata/join_two_tables/sqlite/go/query.sql.go
index eb7d7e1bb8..2399c80d75 100644
--- a/internal/endtoend/testdata/join_two_tables/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/join_two_tables/sqlite/go/query.sql.go
@@ -30,9 +30,6 @@ func (q *Queries) TwoJoins(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_where_clause/mysql/go/query.sql.go b/internal/endtoend/testdata/join_where_clause/mysql/go/query.sql.go
index 3cc7b4dfda..be63a19682 100644
--- a/internal/endtoend/testdata/join_where_clause/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/join_where_clause/mysql/go/query.sql.go
@@ -35,9 +35,6 @@ func (q *Queries) JoinNoConstraints(ctx context.Context, arg JoinNoConstraintsPa
 		}
 		items = append(items, barid)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -70,9 +67,6 @@ func (q *Queries) JoinParamWhereClause(ctx context.Context, arg JoinParamWhereCl
 		}
 		items = append(items, barid)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -100,9 +94,6 @@ func (q *Queries) JoinWhereClause(ctx context.Context, owner string) ([]uint64,
 		}
 		items = append(items, barid)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_where_clause/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/join_where_clause/postgresql/stdlib/go/query.sql.go
index 60571b0f0e..0e27195378 100644
--- a/internal/endtoend/testdata/join_where_clause/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/join_where_clause/postgresql/stdlib/go/query.sql.go
@@ -35,9 +35,6 @@ func (q *Queries) JoinNoConstraints(ctx context.Context, arg JoinNoConstraintsPa
 		}
 		items = append(items, barid)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -70,9 +67,6 @@ func (q *Queries) JoinParamWhereClause(ctx context.Context, arg JoinParamWhereCl
 		}
 		items = append(items, barid)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -100,9 +94,6 @@ func (q *Queries) JoinWhereClause(ctx context.Context, owner string) ([]int32, e
 		}
 		items = append(items, barid)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/join_where_clause/sqlite/go/query.sql.go b/internal/endtoend/testdata/join_where_clause/sqlite/go/query.sql.go
index bfd796aa5f..6a27bee9cb 100644
--- a/internal/endtoend/testdata/join_where_clause/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/join_where_clause/sqlite/go/query.sql.go
@@ -35,9 +35,6 @@ func (q *Queries) JoinNoConstraints(ctx context.Context, arg JoinNoConstraintsPa
 		}
 		items = append(items, barid)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -70,9 +67,6 @@ func (q *Queries) JoinParamWhereClause(ctx context.Context, arg JoinParamWhereCl
 		}
 		items = append(items, barid)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -100,9 +94,6 @@ func (q *Queries) JoinWhereClause(ctx context.Context, owner string) ([]int64, e
 		}
 		items = append(items, barid)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/json_param_type/postgresql/pgx/go/query.sql.go b/internal/endtoend/testdata/json_param_type/postgresql/pgx/go/query.sql.go
index 9b51c5305e..0e05d6744f 100644
--- a/internal/endtoend/testdata/json_param_type/postgresql/pgx/go/query.sql.go
+++ b/internal/endtoend/testdata/json_param_type/postgresql/pgx/go/query.sql.go
@@ -7,15 +7,13 @@ package querytest
 
 import (
 	"context"
-
-	"github.com/jackc/pgx/v5/pgtype"
 )
 
 const findByAddress = `-- name: FindByAddress :one
 SELECT id, metadata FROM "user" WHERE "metadata"->>'address1' = $1 LIMIT 1
 `
 
-func (q *Queries) FindByAddress(ctx context.Context, metadata pgtype.Text) (User, error) {
+func (q *Queries) FindByAddress(ctx context.Context, metadata []byte) (User, error) {
 	row := q.db.QueryRow(ctx, findByAddress, metadata)
 	var i User
 	err := row.Scan(&i.ID, &i.Metadata)
diff --git a/internal/endtoend/testdata/json_tags/camel_case/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/json_tags/camel_case/postgresql/stdlib/go/query.sql.go
index ac3e1088a0..82cc85709d 100644
--- a/internal/endtoend/testdata/json_tags/camel_case/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/json_tags/camel_case/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) GetAll(ctx context.Context) ([]User, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/json_tags/pascal_case/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/json_tags/pascal_case/postgresql/stdlib/go/query.sql.go
index ac3e1088a0..82cc85709d 100644
--- a/internal/endtoend/testdata/json_tags/pascal_case/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/json_tags/pascal_case/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) GetAll(ctx context.Context) ([]User, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/json_tags/snake_case/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/json_tags/snake_case/postgresql/stdlib/go/query.sql.go
index ac3e1088a0..82cc85709d 100644
--- a/internal/endtoend/testdata/json_tags/snake_case/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/json_tags/snake_case/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) GetAll(ctx context.Context) ([]User, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/limit/sqlite/go/query.sql.go b/internal/endtoend/testdata/limit/sqlite/go/query.sql.go
index e2e3fc2035..7539da6237 100644
--- a/internal/endtoend/testdata/limit/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/limit/sqlite/go/query.sql.go
@@ -36,9 +36,6 @@ func (q *Queries) LimitMe(ctx context.Context, limit int64) ([]bool, error) {
 		}
 		items = append(items, bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/limit/stdlib/go/query.sql.go b/internal/endtoend/testdata/limit/stdlib/go/query.sql.go
index df0de03090..d77d47bd1b 100644
--- a/internal/endtoend/testdata/limit/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/limit/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) LimitMe(ctx context.Context, limit int32) ([]bool, error) {
 		}
 		items = append(items, bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/lower/stdlib/go/query.sql.go b/internal/endtoend/testdata/lower/stdlib/go/query.sql.go
index 59f1b6b35a..886dacfb42 100644
--- a/internal/endtoend/testdata/lower/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/lower/stdlib/go/query.sql.go
@@ -32,9 +32,6 @@ func (q *Queries) Lower(ctx context.Context, arg LowerParams) ([]string, error)
 		}
 		items = append(items, bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/lower_switched_order/stdlib/go/query.sql.go b/internal/endtoend/testdata/lower_switched_order/stdlib/go/query.sql.go
index 8e3a0e672f..b3fc0e8903 100644
--- a/internal/endtoend/testdata/lower_switched_order/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/lower_switched_order/stdlib/go/query.sql.go
@@ -32,9 +32,6 @@ func (q *Queries) LowerSwitchedOrder(ctx context.Context, arg LowerSwitchedOrder
 		}
 		items = append(items, bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/materialized_views/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/materialized_views/postgresql/stdlib/go/query.sql.go
index 51cd9cebd9..fd2b1ba937 100644
--- a/internal/endtoend/testdata/materialized_views/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/materialized_views/postgresql/stdlib/go/query.sql.go
@@ -32,9 +32,6 @@ func (q *Queries) ListAuthors(ctx context.Context) ([]Author, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/mathmatical_operator/stdlib/go/query.sql.go b/internal/endtoend/testdata/mathmatical_operator/stdlib/go/query.sql.go
index f04ef6ae10..9e9da54fb2 100644
--- a/internal/endtoend/testdata/mathmatical_operator/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/mathmatical_operator/stdlib/go/query.sql.go
@@ -32,9 +32,6 @@ func (q *Queries) Math(ctx context.Context) ([]MathRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/min_max_date/postgresql/pgx/go/query.sql.go b/internal/endtoend/testdata/min_max_date/postgresql/pgx/go/query.sql.go
index 839e74be50..a18ebdb47c 100644
--- a/internal/endtoend/testdata/min_max_date/postgresql/pgx/go/query.sql.go
+++ b/internal/endtoend/testdata/min_max_date/postgresql/pgx/go/query.sql.go
@@ -7,8 +7,6 @@ package querytest
 
 import (
 	"context"
-
-	"github.com/jackc/pgx/v5/pgtype"
 )
 
 const activityStats = `-- name: ActivityStats :one
@@ -21,8 +19,8 @@ WHERE account_id = $1
 
 type ActivityStatsRow struct {
 	Numofactivities int64
-	Mindate         pgtype.Timestamptz
-	Maxdate         pgtype.Timestamptz
+	Mindate         interface{}
+	Maxdate         interface{}
 }
 
 func (q *Queries) ActivityStats(ctx context.Context, accountID int64) (ActivityStatsRow, error) {
diff --git a/internal/endtoend/testdata/multidimension_array/stdlib/go/query.sql.go b/internal/endtoend/testdata/multidimension_array/stdlib/go/query.sql.go
index 95aab96065..4ff3757298 100644
--- a/internal/endtoend/testdata/multidimension_array/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/multidimension_array/stdlib/go/query.sql.go
@@ -29,9 +29,6 @@ func (q *Queries) TextArray(ctx context.Context) ([][][]string, error) {
 		}
 		items = append(items, tags)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/multischema/stdlib/go/query.sql.go b/internal/endtoend/testdata/multischema/stdlib/go/query.sql.go
index 61949ad198..abb24f5506 100644
--- a/internal/endtoend/testdata/multischema/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/multischema/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) ListBar(ctx context.Context) ([]int32, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -54,9 +51,6 @@ func (q *Queries) ListFoo(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/mysql_reference_manual/aggregate_functions/go/group_concat.sql.go b/internal/endtoend/testdata/mysql_reference_manual/aggregate_functions/go/group_concat.sql.go
index 458c3cda92..20f6c7b7ea 100644
--- a/internal/endtoend/testdata/mysql_reference_manual/aggregate_functions/go/group_concat.sql.go
+++ b/internal/endtoend/testdata/mysql_reference_manual/aggregate_functions/go/group_concat.sql.go
@@ -35,9 +35,6 @@ func (q *Queries) GroupConcat(ctx context.Context) ([]GroupConcatRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -70,9 +67,6 @@ func (q *Queries) GroupConcatOrderBy(ctx context.Context) ([]GroupConcatOrderByR
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/mysql_vector/mysql/go/query.sql.go b/internal/endtoend/testdata/mysql_vector/mysql/go/query.sql.go
index 25a19f06a1..f836df2044 100644
--- a/internal/endtoend/testdata/mysql_vector/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/mysql_vector/mysql/go/query.sql.go
@@ -38,9 +38,6 @@ func (q *Queries) SelectVector(ctx context.Context) ([]int32, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/named_param/sqlite/go/query.sql.go b/internal/endtoend/testdata/named_param/sqlite/go/query.sql.go
index 7065c0a31c..f77ef3a6ad 100644
--- a/internal/endtoend/testdata/named_param/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/named_param/sqlite/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) AtParams(ctx context.Context, slug string) ([]string, error) {
 		}
 		items = append(items, name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -54,9 +51,6 @@ func (q *Queries) FuncParams(ctx context.Context, slug string) ([]string, error)
 		}
 		items = append(items, name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/named_param/stdlib/go/query.sql.go b/internal/endtoend/testdata/named_param/stdlib/go/query.sql.go
index 461c447ed2..da8abf0c2a 100644
--- a/internal/endtoend/testdata/named_param/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/named_param/stdlib/go/query.sql.go
@@ -32,9 +32,6 @@ func (q *Queries) AtParams(ctx context.Context, arg AtParamsParams) ([]string, e
 		}
 		items = append(items, name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -64,9 +61,6 @@ func (q *Queries) FuncParams(ctx context.Context, arg FuncParamsParams) ([]strin
 		}
 		items = append(items, name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/null_if_type/postgresql/pganalyzer/db/query.sql.go b/internal/endtoend/testdata/null_if_type/postgresql/pganalyzer/db/query.sql.go
index a2b2faf4d8..55d2cd3f46 100644
--- a/internal/endtoend/testdata/null_if_type/postgresql/pganalyzer/db/query.sql.go
+++ b/internal/endtoend/testdata/null_if_type/postgresql/pganalyzer/db/query.sql.go
@@ -16,9 +16,9 @@ FROM
   author
 `
 
-func (q *Queries) GetRestrictedId(ctx context.Context, id int64) (int64, error) {
+func (q *Queries) GetRestrictedId(ctx context.Context, id int64) (bool, error) {
 	row := q.db.QueryRowContext(ctx, getRestrictedId, id)
-	var restricted_id int64
+	var restricted_id bool
 	err := row.Scan(&restricted_id)
 	return restricted_id, err
 }
diff --git a/internal/endtoend/testdata/omit_sqlc_version/db/query.sql.go b/internal/endtoend/testdata/omit_sqlc_version/db/query.sql.go
index 147cb4b15c..53180441f2 100644
--- a/internal/endtoend/testdata/omit_sqlc_version/db/query.sql.go
+++ b/internal/endtoend/testdata/omit_sqlc_version/db/query.sql.go
@@ -70,9 +70,6 @@ func (q *Queries) ListAuthors(ctx context.Context) ([]Author, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/omit_unused_structs/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/omit_unused_structs/postgresql/stdlib/go/query.sql.go
index ee6cdfba17..2f291e65eb 100644
--- a/internal/endtoend/testdata/omit_unused_structs/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/omit_unused_structs/postgresql/stdlib/go/query.sql.go
@@ -66,9 +66,6 @@ func (q *Queries) query_return_full_table(ctx context.Context) ([]QueryReturnFul
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/order_by_binds/mysql/go/query.sql.go b/internal/endtoend/testdata/order_by_binds/mysql/go/query.sql.go
index 6c0d477364..e71f00dffc 100644
--- a/internal/endtoend/testdata/order_by_binds/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/order_by_binds/mysql/go/query.sql.go
@@ -34,9 +34,6 @@ func (q *Queries) ListAuthorsColumnSort(ctx context.Context, arg ListAuthorsColu
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -62,9 +59,6 @@ func (q *Queries) ListAuthorsColumnSortFnWtihArg(ctx context.Context, modArg int
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -91,9 +85,6 @@ func (q *Queries) ListAuthorsNameSort(ctx context.Context, minID int64) ([]Autho
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/order_by_binds/pganalyze/go/query.sql.go b/internal/endtoend/testdata/order_by_binds/pganalyze/go/query.sql.go
index 69b8697e12..ac16a150d8 100644
--- a/internal/endtoend/testdata/order_by_binds/pganalyze/go/query.sql.go
+++ b/internal/endtoend/testdata/order_by_binds/pganalyze/go/query.sql.go
@@ -7,7 +7,6 @@ package querytest
 
 import (
 	"context"
-	"database/sql"
 )
 
 const listAuthorsColumnSort = `-- name: ListAuthorsColumnSort :many
@@ -18,7 +17,7 @@ ORDER   BY CASE WHEN $2 = 'name' THEN name END
 
 type ListAuthorsColumnSortParams struct {
 	MinID      int64
-	SortColumn sql.NullString
+	SortColumn interface{}
 }
 
 func (q *Queries) ListAuthorsColumnSort(ctx context.Context, arg ListAuthorsColumnSortParams) ([]Author, error) {
@@ -35,9 +34,6 @@ func (q *Queries) ListAuthorsColumnSort(ctx context.Context, arg ListAuthorsColu
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -64,9 +60,6 @@ func (q *Queries) ListAuthorsNameSort(ctx context.Context, minID int64) ([]Autho
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/order_by_binds/postgresql/go/query.sql.go b/internal/endtoend/testdata/order_by_binds/postgresql/go/query.sql.go
index 61e2fb0ae1..ce3107b44c 100644
--- a/internal/endtoend/testdata/order_by_binds/postgresql/go/query.sql.go
+++ b/internal/endtoend/testdata/order_by_binds/postgresql/go/query.sql.go
@@ -34,9 +34,6 @@ func (q *Queries) ListAuthorsColumnSort(ctx context.Context, arg ListAuthorsColu
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -62,9 +59,6 @@ func (q *Queries) ListAuthorsColumnSortFnWtihArg(ctx context.Context, mod int64)
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -91,9 +85,6 @@ func (q *Queries) ListAuthorsNameSort(ctx context.Context, minID int64) ([]Autho
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/order_by_union/mysql/go/query.sql.go b/internal/endtoend/testdata/order_by_union/mysql/go/query.sql.go
index df63c9bc0d..14309bd839 100644
--- a/internal/endtoend/testdata/order_by_union/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/order_by_union/mysql/go/query.sql.go
@@ -30,9 +30,6 @@ func (q *Queries) ListAuthorsUnion(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, foo)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/order_by_union/postgresql/go/query.sql.go b/internal/endtoend/testdata/order_by_union/postgresql/go/query.sql.go
index df63c9bc0d..14309bd839 100644
--- a/internal/endtoend/testdata/order_by_union/postgresql/go/query.sql.go
+++ b/internal/endtoend/testdata/order_by_union/postgresql/go/query.sql.go
@@ -30,9 +30,6 @@ func (q *Queries) ListAuthorsUnion(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, foo)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/output_file_names/stdlib/go/query.sql.go b/internal/endtoend/testdata/output_file_names/stdlib/go/query.sql.go
index 187645db43..5aa52f8c0c 100644
--- a/internal/endtoend/testdata/output_file_names/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/output_file_names/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) User(ctx context.Context) ([]int64, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/output_files_suffix/stdlib/go/query.sql_gen.go b/internal/endtoend/testdata/output_files_suffix/stdlib/go/query.sql_gen.go
index 187645db43..5aa52f8c0c 100644
--- a/internal/endtoend/testdata/output_files_suffix/stdlib/go/query.sql_gen.go
+++ b/internal/endtoend/testdata/output_files_suffix/stdlib/go/query.sql_gen.go
@@ -27,9 +27,6 @@ func (q *Queries) User(ctx context.Context) ([]int64, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/overrides_go_types/mysql/go/query.sql.go b/internal/endtoend/testdata/overrides_go_types/mysql/go/query.sql.go
index f707ab5102..ba23f37dc1 100644
--- a/internal/endtoend/testdata/overrides_go_types/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/overrides_go_types/mysql/go/query.sql.go
@@ -40,9 +40,6 @@ func (q *Queries) TestIN(ctx context.Context, paramname []pkg.CustomType) ([]Foo
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/overrides_go_types/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/overrides_go_types/postgresql/stdlib/go/query.sql.go
index 7f2fb50778..5807af83de 100644
--- a/internal/endtoend/testdata/overrides_go_types/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/overrides_go_types/postgresql/stdlib/go/query.sql.go
@@ -36,9 +36,6 @@ func (q *Queries) LoadFoo(ctx context.Context, id uuid.UUID) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/overrides_nullable/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/overrides_nullable/postgresql/stdlib/go/query.sql.go
index 5d5b471da6..06df61aaaa 100644
--- a/internal/endtoend/testdata/overrides_nullable/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/overrides_nullable/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) ListFoo(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/overrides_unsigned/mysql/go/query.sql.go b/internal/endtoend/testdata/overrides_unsigned/mysql/go/query.sql.go
index da952c12b8..431b628cb2 100644
--- a/internal/endtoend/testdata/overrides_unsigned/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/overrides_unsigned/mysql/go/query.sql.go
@@ -81,9 +81,6 @@ func (q *Queries) ListAuthors(ctx context.Context) ([]Author, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/params_duplicate/mysql/go/query.sql.go b/internal/endtoend/testdata/params_duplicate/mysql/go/query.sql.go
index 7e5ea8571e..44a860bf05 100644
--- a/internal/endtoend/testdata/params_duplicate/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/params_duplicate/mysql/go/query.sql.go
@@ -33,9 +33,6 @@ func (q *Queries) SelectUserByID(ctx context.Context, arg SelectUserByIDParams)
 		}
 		items = append(items, first_name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -67,9 +64,6 @@ func (q *Queries) SelectUserByName(ctx context.Context, arg SelectUserByNamePara
 		}
 		items = append(items, first_name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -100,9 +94,6 @@ func (q *Queries) SelectUserQuestion(ctx context.Context, arg SelectUserQuestion
 		}
 		items = append(items, first_name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/params_duplicate/postgresql/go/query.sql.go b/internal/endtoend/testdata/params_duplicate/postgresql/go/query.sql.go
index 4f95cecc4e..2584032486 100644
--- a/internal/endtoend/testdata/params_duplicate/postgresql/go/query.sql.go
+++ b/internal/endtoend/testdata/params_duplicate/postgresql/go/query.sql.go
@@ -29,9 +29,6 @@ func (q *Queries) SelectUserByID(ctx context.Context, id int32) ([]sql.NullStrin
 		}
 		items = append(items, first_name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -59,9 +56,6 @@ func (q *Queries) SelectUserByName(ctx context.Context, name sql.NullString) ([]
 		}
 		items = append(items, first_name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -87,9 +81,6 @@ func (q *Queries) SelectUserQuestion(ctx context.Context, id int32) ([]sql.NullS
 		}
 		items = append(items, first_name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/params_in_nested_func/mysql/db/query.sql.go b/internal/endtoend/testdata/params_in_nested_func/mysql/db/query.sql.go
index f0878bec80..7dbb3a1a4b 100644
--- a/internal/endtoend/testdata/params_in_nested_func/mysql/db/query.sql.go
+++ b/internal/endtoend/testdata/params_in_nested_func/mysql/db/query.sql.go
@@ -45,9 +45,6 @@ func (q *Queries) GetGroups(ctx context.Context, arg GetGroupsParams) ([]GetGrou
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/params_in_nested_func/postgresql/db/query.sql.go b/internal/endtoend/testdata/params_in_nested_func/postgresql/db/query.sql.go
index 1372545b97..ab45eac7bd 100644
--- a/internal/endtoend/testdata/params_in_nested_func/postgresql/db/query.sql.go
+++ b/internal/endtoend/testdata/params_in_nested_func/postgresql/db/query.sql.go
@@ -45,9 +45,6 @@ func (q *Queries) GetGroups(ctx context.Context, arg GetGroupsParams) ([]GetGrou
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/params_location/mysql/go/query.sql.go b/internal/endtoend/testdata/params_location/mysql/go/query.sql.go
index 74ca615f4b..636e3a51a2 100644
--- a/internal/endtoend/testdata/params_location/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/params_location/mysql/go/query.sql.go
@@ -64,9 +64,6 @@ func (q *Queries) LimitSQLCArg(ctx context.Context, limit int32) ([]LimitSQLCArg
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -104,9 +101,6 @@ func (q *Queries) ListUserOrders(ctx context.Context, minPrice string) ([]ListUs
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -145,9 +139,6 @@ func (q *Queries) ListUserParenExpr(ctx context.Context, arg ListUserParenExprPa
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -182,9 +173,6 @@ func (q *Queries) ListUsersByFamily(ctx context.Context, arg ListUsersByFamilyPa
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -215,9 +203,6 @@ func (q *Queries) ListUsersByID(ctx context.Context, id int32) ([]ListUsersByIDR
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -247,9 +232,6 @@ func (q *Queries) ListUsersWithLimit(ctx context.Context, limit int32) ([]ListUs
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/params_location/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/params_location/postgresql/stdlib/go/query.sql.go
index 87121d1616..41a9156638 100644
--- a/internal/endtoend/testdata/params_location/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/params_location/postgresql/stdlib/go/query.sql.go
@@ -64,9 +64,6 @@ func (q *Queries) LimitSQLCArg(ctx context.Context, limit int32) ([]LimitSQLCArg
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -104,9 +101,6 @@ func (q *Queries) ListUserOrders(ctx context.Context, minPrice string) ([]ListUs
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -145,9 +139,6 @@ func (q *Queries) ListUserParenExpr(ctx context.Context, arg ListUserParenExprPa
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -182,9 +173,6 @@ func (q *Queries) ListUsersByFamily(ctx context.Context, arg ListUsersByFamilyPa
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -215,9 +203,6 @@ func (q *Queries) ListUsersByID(ctx context.Context, id int32) ([]ListUsersByIDR
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -247,9 +232,6 @@ func (q *Queries) ListUsersWithLimit(ctx context.Context, limit int32) ([]ListUs
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/params_placeholder_in_left_expr/mysql/go/query.sql.go b/internal/endtoend/testdata/params_placeholder_in_left_expr/mysql/go/query.sql.go
index e4ba2698a0..27127b89d2 100644
--- a/internal/endtoend/testdata/params_placeholder_in_left_expr/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/params_placeholder_in_left_expr/mysql/go/query.sql.go
@@ -28,9 +28,6 @@ func (q *Queries) FindByID(ctx context.Context, id int32) ([]User, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -60,9 +57,6 @@ func (q *Queries) FindByIDAndName(ctx context.Context, arg FindByIDAndNameParams
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/params_placeholder_in_left_expr/postgresql/go/query.sql.go b/internal/endtoend/testdata/params_placeholder_in_left_expr/postgresql/go/query.sql.go
index ca90d81e90..cc884123f7 100644
--- a/internal/endtoend/testdata/params_placeholder_in_left_expr/postgresql/go/query.sql.go
+++ b/internal/endtoend/testdata/params_placeholder_in_left_expr/postgresql/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) FindByID(ctx context.Context, id int32) ([]User, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -54,9 +51,6 @@ func (q *Queries) FindByIDAndName(ctx context.Context, id int32) ([]User, error)
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/params_two/mysql/go/query.sql.go b/internal/endtoend/testdata/params_two/mysql/go/query.sql.go
index 2e0e21725f..b96c63c23f 100644
--- a/internal/endtoend/testdata/params_two/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/params_two/mysql/go/query.sql.go
@@ -34,9 +34,6 @@ func (q *Queries) FooByAandB(ctx context.Context, arg FooByAandBParams) ([]Foo,
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/params_two/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/params_two/postgresql/stdlib/go/query.sql.go
index 034299708e..136acfac0e 100644
--- a/internal/endtoend/testdata/params_two/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/params_two/postgresql/stdlib/go/query.sql.go
@@ -34,9 +34,6 @@ func (q *Queries) FooByAandB(ctx context.Context, arg FooByAandBParams) ([]Foo,
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/pattern_in_expr/mysql/go/query.sql.go b/internal/endtoend/testdata/pattern_in_expr/mysql/go/query.sql.go
index de9887446c..3c23879068 100644
--- a/internal/endtoend/testdata/pattern_in_expr/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/pattern_in_expr/mysql/go/query.sql.go
@@ -28,9 +28,6 @@ func (q *Queries) FooByBarB(ctx context.Context, b sql.NullString) ([]Foo, error
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -60,9 +57,6 @@ func (q *Queries) FooByList(ctx context.Context, arg FooByListParams) ([]Foo, er
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -92,9 +86,6 @@ func (q *Queries) FooByNotList(ctx context.Context, arg FooByNotListParams) ([]F
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -119,9 +110,6 @@ func (q *Queries) FooByParamList(ctx context.Context, a sql.NullString) ([]Foo,
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/pattern_matching/mysql/go/query.sql.go b/internal/endtoend/testdata/pattern_matching/mysql/go/query.sql.go
index 98001baee2..0790786234 100644
--- a/internal/endtoend/testdata/pattern_matching/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/pattern_matching/mysql/go/query.sql.go
@@ -28,9 +28,6 @@ func (q *Queries) PetsByName(ctx context.Context, name sql.NullString) ([]sql.Nu
 		}
 		items = append(items, name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/pattern_matching/postgresql/go/query.sql.go b/internal/endtoend/testdata/pattern_matching/postgresql/go/query.sql.go
index 5a50e20c3a..f2e05a3f02 100644
--- a/internal/endtoend/testdata/pattern_matching/postgresql/go/query.sql.go
+++ b/internal/endtoend/testdata/pattern_matching/postgresql/go/query.sql.go
@@ -28,9 +28,6 @@ func (q *Queries) PetsByName(ctx context.Context, name sql.NullString) ([]sql.Nu
 		}
 		items = append(items, name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/pg_advisory_xact_lock/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/pg_advisory_xact_lock/postgresql/stdlib/go/query.sql.go
index 2d94606ccf..3a33bc9a41 100644
--- a/internal/endtoend/testdata/pg_advisory_xact_lock/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/pg_advisory_xact_lock/postgresql/stdlib/go/query.sql.go
@@ -47,9 +47,6 @@ func (q *Queries) AdvisoryUnlock(ctx context.Context, pgAdvisoryUnlock int64) ([
 		}
 		items = append(items, pg_advisory_unlock)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/pg_dump/db/query.sql.go b/internal/endtoend/testdata/pg_dump/db/query.sql.go
index dcbc867f92..c6e8540607 100644
--- a/internal/endtoend/testdata/pg_dump/db/query.sql.go
+++ b/internal/endtoend/testdata/pg_dump/db/query.sql.go
@@ -72,9 +72,6 @@ func (q *Queries) ListAuthors(ctx context.Context) ([]Author, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/pg_ext_ltree/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/pg_ext_ltree/postgresql/stdlib/go/query.sql.go
index 7d0ec571ba..df274f0e79 100644
--- a/internal/endtoend/testdata/pg_ext_ltree/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/pg_ext_ltree/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) ListFoo(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/pg_generate_series/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/pg_generate_series/postgresql/stdlib/go/query.sql.go
index 7ddb6c67dc..837fa91433 100644
--- a/internal/endtoend/testdata/pg_generate_series/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/pg_generate_series/postgresql/stdlib/go/query.sql.go
@@ -33,9 +33,6 @@ func (q *Queries) GenerateSeries(ctx context.Context, arg GenerateSeriesParams)
 		}
 		items = append(items, generate_series)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/pg_timezone_names/go_stdlib/query.sql.go b/internal/endtoend/testdata/pg_timezone_names/go_stdlib/query.sql.go
index 392fa15eaa..e04576a8b6 100644
--- a/internal/endtoend/testdata/pg_timezone_names/go_stdlib/query.sql.go
+++ b/internal/endtoend/testdata/pg_timezone_names/go_stdlib/query.sql.go
@@ -33,9 +33,6 @@ func (q *Queries) GetColumns(ctx context.Context) ([]GetColumnsRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -60,9 +57,6 @@ func (q *Queries) GetTables(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, table_name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -99,9 +93,6 @@ func (q *Queries) GetTimezones(ctx context.Context) ([]GetTimezonesRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/pg_user_table/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/pg_user_table/postgresql/stdlib/go/query.sql.go
index 187645db43..5aa52f8c0c 100644
--- a/internal/endtoend/testdata/pg_user_table/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/pg_user_table/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) User(ctx context.Context) ([]int64, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/prepared_queries/mysql/go/query.sql.go b/internal/endtoend/testdata/prepared_queries/mysql/go/query.sql.go
index c5efb687b1..98dd2dc41d 100644
--- a/internal/endtoend/testdata/prepared_queries/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/prepared_queries/mysql/go/query.sql.go
@@ -94,9 +94,6 @@ func (q *Queries) ListUsers(ctx context.Context) ([]ListUsersRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/prepared_queries/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/prepared_queries/postgresql/stdlib/go/query.sql.go
index a42e969099..b2aee0c2cf 100644
--- a/internal/endtoend/testdata/prepared_queries/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/prepared_queries/postgresql/stdlib/go/query.sql.go
@@ -94,9 +94,6 @@ func (q *Queries) ListUsers(ctx context.Context) ([]ListUsersRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/query_parameter_limit_to_two/postgresql/go/query.sql.go b/internal/endtoend/testdata/query_parameter_limit_to_two/postgresql/go/query.sql.go
index 8eea2486a1..29f83f06ef 100644
--- a/internal/endtoend/testdata/query_parameter_limit_to_two/postgresql/go/query.sql.go
+++ b/internal/endtoend/testdata/query_parameter_limit_to_two/postgresql/go/query.sql.go
@@ -154,9 +154,6 @@ func (q *Queries) ListAuthors(ctx context.Context) ([]Author, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/query_parameter_limit_to_zero/postgresql/go/query.sql.go b/internal/endtoend/testdata/query_parameter_limit_to_zero/postgresql/go/query.sql.go
index 114b92ee8f..5e611aa8f4 100644
--- a/internal/endtoend/testdata/query_parameter_limit_to_zero/postgresql/go/query.sql.go
+++ b/internal/endtoend/testdata/query_parameter_limit_to_zero/postgresql/go/query.sql.go
@@ -97,9 +97,6 @@ func (q *Queries) ListAuthors(ctx context.Context) ([]Author, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/quoted_colname/sqlite/go/query.sql.go b/internal/endtoend/testdata/quoted_colname/sqlite/go/query.sql.go
index d040073155..feb06e818c 100644
--- a/internal/endtoend/testdata/quoted_colname/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/quoted_colname/sqlite/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) TestList(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/quoted_tablename/sqlite/go/query.sql.go b/internal/endtoend/testdata/quoted_tablename/sqlite/go/query.sql.go
index 029cde8d40..fee95b5dba 100644
--- a/internal/endtoend/testdata/quoted_tablename/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/quoted_tablename/sqlite/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) TestList(ctx context.Context) ([]string, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/rename/v1/stdlib/go/query.sql.go b/internal/endtoend/testdata/rename/v1/stdlib/go/query.sql.go
index 1763b16b5e..02adc18f2c 100644
--- a/internal/endtoend/testdata/rename/v1/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/rename/v1/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) ListBar(ctx context.Context) ([]BarNew, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -66,9 +63,6 @@ func (q *Queries) ListFoo(ctx context.Context, arg ListFooParams) ([]ListFooRow,
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/rename/v2/stdlib/go/query.sql.go b/internal/endtoend/testdata/rename/v2/stdlib/go/query.sql.go
index 1763b16b5e..02adc18f2c 100644
--- a/internal/endtoend/testdata/rename/v2/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/rename/v2/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) ListBar(ctx context.Context) ([]BarNew, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -66,9 +63,6 @@ func (q *Queries) ListFoo(ctx context.Context, arg ListFooParams) ([]ListFooRow,
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/schema_scoped_enum/stdlib/go/query.sql.go b/internal/endtoend/testdata/schema_scoped_enum/stdlib/go/query.sql.go
index 7741d98c1e..5c37827271 100644
--- a/internal/endtoend/testdata/schema_scoped_enum/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/schema_scoped_enum/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) ListUsersByRole(ctx context.Context, role NullFooTypeUserRole)
 		}
 		items = append(items, role)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/schema_scoped_filter/mysql/go/query.sql.go b/internal/endtoend/testdata/schema_scoped_filter/mysql/go/query.sql.go
index 9ae25778bc..8351067774 100644
--- a/internal/endtoend/testdata/schema_scoped_filter/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/schema_scoped_filter/mysql/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) SchemaScopedFilter(ctx context.Context, id uint64) ([]uint64,
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/schema_scoped_filter/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/schema_scoped_filter/postgresql/stdlib/go/query.sql.go
index 49ed5b78d8..a6a528179c 100644
--- a/internal/endtoend/testdata/schema_scoped_filter/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/schema_scoped_filter/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) SchemaScopedFilter(ctx context.Context, id int32) ([]int32, er
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/schema_scoped_list/mysql/go/query.sql.go b/internal/endtoend/testdata/schema_scoped_list/mysql/go/query.sql.go
index dc4b014634..934189c0ea 100644
--- a/internal/endtoend/testdata/schema_scoped_list/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/schema_scoped_list/mysql/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) SchemaScopedColList(ctx context.Context) ([]uint64, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -54,9 +51,6 @@ func (q *Queries) SchemaScopedList(ctx context.Context) ([]uint64, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/schema_scoped_list/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/schema_scoped_list/postgresql/stdlib/go/query.sql.go
index 3b17e0ef04..fbc9405a1d 100644
--- a/internal/endtoend/testdata/schema_scoped_list/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/schema_scoped_list/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) SchemaScopedColList(ctx context.Context) ([]int32, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -54,9 +51,6 @@ func (q *Queries) SchemaScopedList(ctx context.Context) ([]int32, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/select_column_cast/mysql/go/query.sql.go b/internal/endtoend/testdata/select_column_cast/mysql/go/query.sql.go
index 84fd34074b..f4f203940c 100644
--- a/internal/endtoend/testdata/select_column_cast/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/select_column_cast/mysql/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) SelectColumnCast(ctx context.Context) ([]int64, error) {
 		}
 		items = append(items, bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/select_column_cast/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/select_column_cast/postgresql/stdlib/go/query.sql.go
index 749414cc73..c0fe5fdd94 100644
--- a/internal/endtoend/testdata/select_column_cast/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/select_column_cast/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) SelectColumnCast(ctx context.Context) ([]int32, error) {
 		}
 		items = append(items, bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/select_column_cast/sqlite/go/query.sql.go b/internal/endtoend/testdata/select_column_cast/sqlite/go/query.sql.go
index f2cfcc70d3..ec343f1a72 100644
--- a/internal/endtoend/testdata/select_column_cast/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/select_column_cast/sqlite/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) SelectColumnCast(ctx context.Context) ([][]byte, error) {
 		}
 		items = append(items, bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/select_cte/sqlite/go/query.sql.go b/internal/endtoend/testdata/select_cte/sqlite/go/query.sql.go
index 54938460e2..49b81984dd 100644
--- a/internal/endtoend/testdata/select_cte/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/select_cte/sqlite/go/query.sql.go
@@ -30,9 +30,6 @@ func (q *Queries) ListAuthors(ctx context.Context) ([]int64, error) {
 		}
 		items = append(items, n)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/select_distinct/stdlib/go/query.sql.go b/internal/endtoend/testdata/select_distinct/stdlib/go/query.sql.go
index df44e5edf3..189f2fc012 100644
--- a/internal/endtoend/testdata/select_distinct/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/select_distinct/stdlib/go/query.sql.go
@@ -28,9 +28,6 @@ func (q *Queries) GetBars(ctx context.Context) ([]Bar, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/select_empty_column_list/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/select_empty_column_list/postgresql/stdlib/go/query.sql.go
index 47562ff006..3c2c749b50 100644
--- a/internal/endtoend/testdata/select_empty_column_list/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/select_empty_column_list/postgresql/stdlib/go/query.sql.go
@@ -30,9 +30,6 @@ func (q *Queries) GetBars(ctx context.Context) ([]GetBarsRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/select_limit/mysql/go/query.sql.go b/internal/endtoend/testdata/select_limit/mysql/go/query.sql.go
index b17a416245..d52bda86f0 100644
--- a/internal/endtoend/testdata/select_limit/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/select_limit/mysql/go/query.sql.go
@@ -29,9 +29,6 @@ func (q *Queries) FooLimit(ctx context.Context, limit int32) ([]sql.NullString,
 		}
 		items = append(items, a)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -62,9 +59,6 @@ func (q *Queries) FooLimitOffset(ctx context.Context, arg FooLimitOffsetParams)
 		}
 		items = append(items, a)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/select_limit/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/select_limit/postgresql/stdlib/go/query.sql.go
index 284a2d690f..f2b6bbda88 100644
--- a/internal/endtoend/testdata/select_limit/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/select_limit/postgresql/stdlib/go/query.sql.go
@@ -29,9 +29,6 @@ func (q *Queries) FooLimit(ctx context.Context, limit int32) ([]sql.NullString,
 		}
 		items = append(items, a)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -62,9 +59,6 @@ func (q *Queries) FooLimitOffset(ctx context.Context, arg FooLimitOffsetParams)
 		}
 		items = append(items, a)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/select_limit/sqlite/go/query.sql.go b/internal/endtoend/testdata/select_limit/sqlite/go/query.sql.go
index 478071452d..a163cc790d 100644
--- a/internal/endtoend/testdata/select_limit/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/select_limit/sqlite/go/query.sql.go
@@ -29,9 +29,6 @@ func (q *Queries) FooLimit(ctx context.Context, limit int64) ([]sql.NullString,
 		}
 		items = append(items, a)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -62,9 +59,6 @@ func (q *Queries) FooLimitOffset(ctx context.Context, arg FooLimitOffsetParams)
 		}
 		items = append(items, a)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/select_nested_count/mysql/go/query.sql.go b/internal/endtoend/testdata/select_nested_count/mysql/go/query.sql.go
index 73c4cf91be..151e12275a 100644
--- a/internal/endtoend/testdata/select_nested_count/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/select_nested_count/mysql/go/query.sql.go
@@ -44,9 +44,6 @@ func (q *Queries) GetAuthorsWithBooksCount(ctx context.Context) ([]GetAuthorsWit
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/select_nested_count/postgresql/go/query.sql.go b/internal/endtoend/testdata/select_nested_count/postgresql/go/query.sql.go
index 73c4cf91be..151e12275a 100644
--- a/internal/endtoend/testdata/select_nested_count/postgresql/go/query.sql.go
+++ b/internal/endtoend/testdata/select_nested_count/postgresql/go/query.sql.go
@@ -44,9 +44,6 @@ func (q *Queries) GetAuthorsWithBooksCount(ctx context.Context) ([]GetAuthorsWit
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/select_nested_count/sqlite/go/query.sql.go b/internal/endtoend/testdata/select_nested_count/sqlite/go/query.sql.go
index 73c4cf91be..151e12275a 100644
--- a/internal/endtoend/testdata/select_nested_count/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/select_nested_count/sqlite/go/query.sql.go
@@ -44,9 +44,6 @@ func (q *Queries) GetAuthorsWithBooksCount(ctx context.Context) ([]GetAuthorsWit
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/select_star/mysql/go/query.sql.go b/internal/endtoend/testdata/select_star/mysql/go/query.sql.go
index 9c63efa958..d21c1b5865 100644
--- a/internal/endtoend/testdata/select_star/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/select_star/mysql/go/query.sql.go
@@ -32,9 +32,6 @@ func (q *Queries) GetAll(ctx context.Context) ([]User, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -59,9 +56,6 @@ func (q *Queries) GetIDAll(ctx context.Context) ([]int32, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/select_star/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/select_star/postgresql/stdlib/go/query.sql.go
index 9c63efa958..d21c1b5865 100644
--- a/internal/endtoend/testdata/select_star/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/select_star/postgresql/stdlib/go/query.sql.go
@@ -32,9 +32,6 @@ func (q *Queries) GetAll(ctx context.Context) ([]User, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -59,9 +56,6 @@ func (q *Queries) GetIDAll(ctx context.Context) ([]int32, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/select_star/sqlite/go/query.sql.go b/internal/endtoend/testdata/select_star/sqlite/go/query.sql.go
index 8cdae2905f..6c73c39e38 100644
--- a/internal/endtoend/testdata/select_star/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/select_star/sqlite/go/query.sql.go
@@ -32,9 +32,6 @@ func (q *Queries) GetAll(ctx context.Context) ([]User, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -59,9 +56,6 @@ func (q *Queries) GetIDAll(ctx context.Context) ([]int64, error) {
 		}
 		items = append(items, id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/select_star_quoted/mysql/go/query.sql.go b/internal/endtoend/testdata/select_star_quoted/mysql/go/query.sql.go
index e1f81c0454..e94a3cadb9 100644
--- a/internal/endtoend/testdata/select_star_quoted/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/select_star_quoted/mysql/go/query.sql.go
@@ -28,9 +28,6 @@ func (q *Queries) GetAll(ctx context.Context) ([]sql.NullString, error) {
 		}
 		items = append(items, camelcase)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/select_star_quoted/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/select_star_quoted/postgresql/stdlib/go/query.sql.go
index f95a99a4c2..68dd8518a8 100644
--- a/internal/endtoend/testdata/select_star_quoted/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/select_star_quoted/postgresql/stdlib/go/query.sql.go
@@ -28,9 +28,6 @@ func (q *Queries) GetAll(ctx context.Context) ([]sql.NullString, error) {
 		}
 		items = append(items, CamelCase)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/select_text_array/stdlib/go/query.sql.go b/internal/endtoend/testdata/select_text_array/stdlib/go/query.sql.go
index f1884cc5f1..6bf3589b1b 100644
--- a/internal/endtoend/testdata/select_text_array/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/select_text_array/stdlib/go/query.sql.go
@@ -29,9 +29,6 @@ func (q *Queries) SelectTextArray(ctx context.Context, dollar_1 []string) ([][]s
 		}
 		items = append(items, column_1)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/select_union/mysql/go/query.sql.go b/internal/endtoend/testdata/select_union/mysql/go/query.sql.go
index ad72ccec06..61f8963bfd 100644
--- a/internal/endtoend/testdata/select_union/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/select_union/mysql/go/query.sql.go
@@ -29,9 +29,6 @@ func (q *Queries) SelectExcept(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -58,9 +55,6 @@ func (q *Queries) SelectIntersect(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -87,9 +81,6 @@ func (q *Queries) SelectUnion(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -116,9 +107,6 @@ func (q *Queries) SelectUnionOther(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -151,9 +139,6 @@ func (q *Queries) SelectUnionWithLimit(ctx context.Context, arg SelectUnionWithL
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/select_union/postgres/stdlib/go/query.sql.go b/internal/endtoend/testdata/select_union/postgres/stdlib/go/query.sql.go
index 94fe8a1f58..e77729e4ca 100644
--- a/internal/endtoend/testdata/select_union/postgres/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/select_union/postgres/stdlib/go/query.sql.go
@@ -29,9 +29,6 @@ func (q *Queries) SelectExcept(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -58,9 +55,6 @@ func (q *Queries) SelectIntersect(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -87,9 +81,6 @@ func (q *Queries) SelectUnion(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -116,9 +107,6 @@ func (q *Queries) SelectUnionOther(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -151,9 +139,6 @@ func (q *Queries) SelectUnionWithLimit(ctx context.Context, arg SelectUnionWithL
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/select_union/sqlite/go/query.sql.go b/internal/endtoend/testdata/select_union/sqlite/go/query.sql.go
index e2d2bcd9eb..ebfdf5f88c 100644
--- a/internal/endtoend/testdata/select_union/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/select_union/sqlite/go/query.sql.go
@@ -29,9 +29,6 @@ func (q *Queries) SelectExcept(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -58,9 +55,6 @@ func (q *Queries) SelectIntersect(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -87,9 +81,6 @@ func (q *Queries) SelectUnion(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -116,9 +107,6 @@ func (q *Queries) SelectUnionOther(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -151,9 +139,6 @@ func (q *Queries) SelectUnionWithLimit(ctx context.Context, arg SelectUnionWithL
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/select_union_subquery/mysql/go/query.sql.go b/internal/endtoend/testdata/select_union_subquery/mysql/go/query.sql.go
index 9cf87158d8..c2521c1d0a 100644
--- a/internal/endtoend/testdata/select_union_subquery/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/select_union_subquery/mysql/go/query.sql.go
@@ -31,9 +31,6 @@ func (q *Queries) TestSubqueryUnion(ctx context.Context) ([]Author, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/show_warnings/mysql/go/query.sql.go b/internal/endtoend/testdata/show_warnings/mysql/go/query.sql.go
index c1f50f7846..38d240a13a 100644
--- a/internal/endtoend/testdata/show_warnings/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/show_warnings/mysql/go/query.sql.go
@@ -33,9 +33,6 @@ func (q *Queries) ShowWarnings(ctx context.Context) ([]ShowWarningsRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/sqlc_arg/mysql/go/query.sql.go b/internal/endtoend/testdata/sqlc_arg/mysql/go/query.sql.go
index 332564b59a..a452af2d73 100644
--- a/internal/endtoend/testdata/sqlc_arg/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/sqlc_arg/mysql/go/query.sql.go
@@ -32,9 +32,6 @@ func (q *Queries) Complicated(ctx context.Context, arg ComplicatedParams) ([]str
 		}
 		items = append(items, name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -59,9 +56,6 @@ func (q *Queries) FuncParamIdent(ctx context.Context, slug string) ([]string, er
 		}
 		items = append(items, name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -86,9 +80,6 @@ func (q *Queries) FuncParamString(ctx context.Context, slug string) ([]string, e
 		}
 		items = append(items, name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/sqlc_arg/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/sqlc_arg/postgresql/stdlib/go/query.sql.go
index 5068c15039..cae454f399 100644
--- a/internal/endtoend/testdata/sqlc_arg/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/sqlc_arg/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) FuncParamIdent(ctx context.Context, slug string) ([]string, er
 		}
 		items = append(items, name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -54,9 +51,6 @@ func (q *Queries) FuncParamString(ctx context.Context, slug string) ([]string, e
 		}
 		items = append(items, name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/sqlc_arg/sqlite/go/query.sql.go b/internal/endtoend/testdata/sqlc_arg/sqlite/go/query.sql.go
index d57a953044..f9dbad94e1 100644
--- a/internal/endtoend/testdata/sqlc_arg/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/sqlc_arg/sqlite/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) FuncParamIdent(ctx context.Context, slug string) ([]string, er
 		}
 		items = append(items, name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -54,9 +51,6 @@ func (q *Queries) FuncParamString(ctx context.Context, slug string) ([]string, e
 		}
 		items = append(items, name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/sqlc_embed/mysql/go/query.sql.go b/internal/endtoend/testdata/sqlc_embed/mysql/go/query.sql.go
index 7672eae0d0..eb183cbbf0 100644
--- a/internal/endtoend/testdata/sqlc_embed/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/sqlc_embed/mysql/go/query.sql.go
@@ -141,9 +141,6 @@ func (q *Queries) WithCrossSchema(ctx context.Context) ([]WithCrossSchemaRow, er
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -193,9 +190,6 @@ func (q *Queries) WithSubquery(ctx context.Context) ([]WithSubqueryRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/sqlc_embed/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/sqlc_embed/postgresql/stdlib/go/query.sql.go
index ea1e6be0c0..0658182339 100644
--- a/internal/endtoend/testdata/sqlc_embed/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/sqlc_embed/postgresql/stdlib/go/query.sql.go
@@ -144,9 +144,6 @@ func (q *Queries) WithCrossSchema(ctx context.Context) ([]WithCrossSchemaRow, er
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -196,9 +193,6 @@ func (q *Queries) WithSubquery(ctx context.Context) ([]WithSubqueryRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/sqlc_embed/sqlite/go/query.sql.go b/internal/endtoend/testdata/sqlc_embed/sqlite/go/query.sql.go
index 0b5469aa17..2605ddd2f3 100644
--- a/internal/endtoend/testdata/sqlc_embed/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/sqlc_embed/sqlite/go/query.sql.go
@@ -141,9 +141,6 @@ func (q *Queries) WithCrossSchema(ctx context.Context) ([]WithCrossSchemaRow, er
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -193,9 +190,6 @@ func (q *Queries) WithSubquery(ctx context.Context) ([]WithSubqueryRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/sqlc_narg/mysql/go/query.sql.go b/internal/endtoend/testdata/sqlc_narg/mysql/go/query.sql.go
index 510b6b532f..27bfc258b9 100644
--- a/internal/endtoend/testdata/sqlc_narg/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/sqlc_narg/mysql/go/query.sql.go
@@ -28,9 +28,6 @@ func (q *Queries) IdentOnNonNullable(ctx context.Context, bar sql.NullString) ([
 		}
 		items = append(items, bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -55,9 +52,6 @@ func (q *Queries) IdentOnNullable(ctx context.Context, maybeBar sql.NullString)
 		}
 		items = append(items, maybe_bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -82,9 +76,6 @@ func (q *Queries) StringOnNonNullable(ctx context.Context, bar sql.NullString) (
 		}
 		items = append(items, bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -109,9 +100,6 @@ func (q *Queries) StringOnNullable(ctx context.Context, maybeBar sql.NullString)
 		}
 		items = append(items, maybe_bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/sqlc_narg/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/sqlc_narg/postgresql/stdlib/go/query.sql.go
index cb9983330c..6df2b1f5b3 100644
--- a/internal/endtoend/testdata/sqlc_narg/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/sqlc_narg/postgresql/stdlib/go/query.sql.go
@@ -28,9 +28,6 @@ func (q *Queries) IdentOnNonNullable(ctx context.Context, bar sql.NullString) ([
 		}
 		items = append(items, bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -55,9 +52,6 @@ func (q *Queries) IdentOnNullable(ctx context.Context, maybeBar sql.NullString)
 		}
 		items = append(items, maybe_bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -82,9 +76,6 @@ func (q *Queries) StringOnNonNullable(ctx context.Context, bar sql.NullString) (
 		}
 		items = append(items, bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -109,9 +100,6 @@ func (q *Queries) StringOnNullable(ctx context.Context, maybeBar sql.NullString)
 		}
 		items = append(items, maybe_bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/sqlc_narg/postgresql/stdlib/go_strict/query.sql.go b/internal/endtoend/testdata/sqlc_narg/postgresql/stdlib/go_strict/query.sql.go
index 515d2b53bc..e5ac7dbd6a 100644
--- a/internal/endtoend/testdata/sqlc_narg/postgresql/stdlib/go_strict/query.sql.go
+++ b/internal/endtoend/testdata/sqlc_narg/postgresql/stdlib/go_strict/query.sql.go
@@ -28,9 +28,6 @@ func (q *Queries) IdentOnNonNullable(ctx context.Context, bar sql.NullString) ([
 		}
 		items = append(items, bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -55,9 +52,6 @@ func (q *Queries) IdentOnNullable(ctx context.Context, maybeBar sql.NullString)
 		}
 		items = append(items, maybe_bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -82,9 +76,6 @@ func (q *Queries) StringOnNonNullable(ctx context.Context, bar sql.NullString) (
 		}
 		items = append(items, bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -109,9 +100,6 @@ func (q *Queries) StringOnNullable(ctx context.Context, maybeBar sql.NullString)
 		}
 		items = append(items, maybe_bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/sqlc_narg/sqlite/go/query.sql.go b/internal/endtoend/testdata/sqlc_narg/sqlite/go/query.sql.go
index f96d139342..8339e6b33a 100644
--- a/internal/endtoend/testdata/sqlc_narg/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/sqlc_narg/sqlite/go/query.sql.go
@@ -28,9 +28,6 @@ func (q *Queries) IdentOnNonNullable(ctx context.Context, bar sql.NullString) ([
 		}
 		items = append(items, bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -55,9 +52,6 @@ func (q *Queries) IdentOnNullable(ctx context.Context, maybeBar sql.NullString)
 		}
 		items = append(items, maybe_bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -82,9 +76,6 @@ func (q *Queries) StringOnNonNullable(ctx context.Context, bar sql.NullString) (
 		}
 		items = append(items, bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -109,9 +100,6 @@ func (q *Queries) StringOnNullable(ctx context.Context, maybeBar sql.NullString)
 		}
 		items = append(items, maybe_bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/sqlc_slice/mysql/go/query.sql.go b/internal/endtoend/testdata/sqlc_slice/mysql/go/query.sql.go
index 16b25cfefd..ea2c0f49ff 100644
--- a/internal/endtoend/testdata/sqlc_slice/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/sqlc_slice/mysql/go/query.sql.go
@@ -42,9 +42,6 @@ func (q *Queries) FuncNullable(ctx context.Context, favourites []int32) ([]sql.N
 		}
 		items = append(items, bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -80,9 +77,6 @@ func (q *Queries) FuncNullableNot(ctx context.Context, favourites []int32) ([]sq
 		}
 		items = append(items, bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -125,9 +119,6 @@ func (q *Queries) FuncParamIdent(ctx context.Context, arg FuncParamIdentParams)
 		}
 		items = append(items, name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -163,9 +154,6 @@ func (q *Queries) FuncParamSoloArg(ctx context.Context, favourites []int32) ([]s
 		}
 		items = append(items, name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -208,9 +196,6 @@ func (q *Queries) FuncParamString(ctx context.Context, arg FuncParamStringParams
 		}
 		items = append(items, name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -272,9 +257,6 @@ func (q *Queries) TypedMyStr(ctx context.Context, mystr []mysql.ID) ([]sql.NullS
 		}
 		items = append(items, bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/sqlc_slice/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/sqlc_slice/postgresql/stdlib/go/query.sql.go
index dea29583c9..504a671f5b 100644
--- a/internal/endtoend/testdata/sqlc_slice/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/sqlc_slice/postgresql/stdlib/go/query.sql.go
@@ -46,9 +46,6 @@ func (q *Queries) FuncParamIdent(ctx context.Context, arg FuncParamIdentParams)
 		}
 		items = append(items, name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -91,9 +88,6 @@ func (q *Queries) FuncParamString(ctx context.Context, arg FuncParamStringParams
 		}
 		items = append(items, name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/sqlc_slice/sqlite/go/query.sql.go b/internal/endtoend/testdata/sqlc_slice/sqlite/go/query.sql.go
index fc9db892e3..c467da0c5f 100644
--- a/internal/endtoend/testdata/sqlc_slice/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/sqlc_slice/sqlite/go/query.sql.go
@@ -40,9 +40,6 @@ func (q *Queries) FuncNullable(ctx context.Context, favourites []int64) ([]sql.N
 		}
 		items = append(items, bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -78,9 +75,6 @@ func (q *Queries) FuncNullableNot(ctx context.Context, favourites []int64) ([]sq
 		}
 		items = append(items, bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -123,9 +117,6 @@ func (q *Queries) FuncParamIdent(ctx context.Context, arg FuncParamIdentParams)
 		}
 		items = append(items, name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -161,9 +152,6 @@ func (q *Queries) FuncParamSoloArg(ctx context.Context, favourites []int64) ([]s
 		}
 		items = append(items, name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -206,9 +194,6 @@ func (q *Queries) FuncParamString(ctx context.Context, arg FuncParamStringParams
 		}
 		items = append(items, name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/sqlc_slice_prepared/sqlite/go/query.sql.go b/internal/endtoend/testdata/sqlc_slice_prepared/sqlite/go/query.sql.go
index 465a08ac31..abb9528bcd 100644
--- a/internal/endtoend/testdata/sqlc_slice_prepared/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/sqlc_slice_prepared/sqlite/go/query.sql.go
@@ -46,9 +46,6 @@ func (q *Queries) FuncParamIdent(ctx context.Context, arg FuncParamIdentParams)
 		}
 		items = append(items, name)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/sqlite_skip_todo/db/query.sql.go b/internal/endtoend/testdata/sqlite_skip_todo/db/query.sql.go
index ddd7ec01fd..ef8d23621b 100644
--- a/internal/endtoend/testdata/sqlite_skip_todo/db/query.sql.go
+++ b/internal/endtoend/testdata/sqlite_skip_todo/db/query.sql.go
@@ -29,9 +29,6 @@ func (q *Queries) GetFoo(ctx context.Context, bar sql.NullString) ([]sql.NullStr
 		}
 		items = append(items, bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -56,9 +53,6 @@ func (q *Queries) ListFoo(ctx context.Context) ([]sql.NullString, error) {
 		}
 		items = append(items, bar)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/star_expansion/mysql/go/query.sql.go b/internal/endtoend/testdata/star_expansion/mysql/go/query.sql.go
index 685860071d..ac85a8a2d8 100644
--- a/internal/endtoend/testdata/star_expansion/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/star_expansion/mysql/go/query.sql.go
@@ -44,9 +44,6 @@ func (q *Queries) StarExpansion(ctx context.Context) ([]StarExpansionRow, error)
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -71,9 +68,6 @@ func (q *Queries) StarQuotedExpansion(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/star_expansion/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/star_expansion/postgresql/stdlib/go/query.sql.go
index d94c1e3b65..cc8ba44c7a 100644
--- a/internal/endtoend/testdata/star_expansion/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/star_expansion/postgresql/stdlib/go/query.sql.go
@@ -44,9 +44,6 @@ func (q *Queries) StarExpansion(ctx context.Context) ([]StarExpansionRow, error)
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -71,9 +68,6 @@ func (q *Queries) StarQuotedExpansion(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/star_expansion/sqlite/go/query.sql.go b/internal/endtoend/testdata/star_expansion/sqlite/go/query.sql.go
index d94c1e3b65..cc8ba44c7a 100644
--- a/internal/endtoend/testdata/star_expansion/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/star_expansion/sqlite/go/query.sql.go
@@ -44,9 +44,6 @@ func (q *Queries) StarExpansion(ctx context.Context) ([]StarExpansionRow, error)
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -71,9 +68,6 @@ func (q *Queries) StarQuotedExpansion(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/star_expansion_cte/stdlib/go/query.sql.go b/internal/endtoend/testdata/star_expansion_cte/stdlib/go/query.sql.go
index 3911e8400a..dd752d3835 100644
--- a/internal/endtoend/testdata/star_expansion_cte/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/star_expansion_cte/stdlib/go/query.sql.go
@@ -28,9 +28,6 @@ func (q *Queries) StarExpansionCTE(ctx context.Context) ([]Bar, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -64,9 +61,6 @@ func (q *Queries) StarExpansionTwoCTE(ctx context.Context) ([]StarExpansionTwoCT
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/star_expansion_from_cte/stdlib/go/query.sql.go b/internal/endtoend/testdata/star_expansion_from_cte/stdlib/go/query.sql.go
index d1460ba922..c5391ba011 100644
--- a/internal/endtoend/testdata/star_expansion_from_cte/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/star_expansion_from_cte/stdlib/go/query.sql.go
@@ -33,9 +33,6 @@ func (q *Queries) StarExpansionCTE(ctx context.Context) ([]StarExpansionCTERow,
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/star_expansion_join/mysql/go/query.sql.go b/internal/endtoend/testdata/star_expansion_join/mysql/go/query.sql.go
index 74154b8cab..8c6c818791 100644
--- a/internal/endtoend/testdata/star_expansion_join/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/star_expansion_join/mysql/go/query.sql.go
@@ -40,9 +40,6 @@ func (q *Queries) StarExpansionJoin(ctx context.Context) ([]StarExpansionJoinRow
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/star_expansion_join/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/star_expansion_join/postgresql/stdlib/go/query.sql.go
index 74154b8cab..8c6c818791 100644
--- a/internal/endtoend/testdata/star_expansion_join/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/star_expansion_join/postgresql/stdlib/go/query.sql.go
@@ -40,9 +40,6 @@ func (q *Queries) StarExpansionJoin(ctx context.Context) ([]StarExpansionJoinRow
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/star_expansion_reserved/mysql/go/query.sql.go b/internal/endtoend/testdata/star_expansion_reserved/mysql/go/query.sql.go
index 72508d74f3..8f85d0500d 100644
--- a/internal/endtoend/testdata/star_expansion_reserved/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/star_expansion_reserved/mysql/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) StarExpansionReserved(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/star_expansion_reserved/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/star_expansion_reserved/postgresql/stdlib/go/query.sql.go
index 9263e92ca1..11770d0608 100644
--- a/internal/endtoend/testdata/star_expansion_reserved/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/star_expansion_reserved/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) StarExpansionReserved(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/star_expansion_subquery/mysql/go/query.sql.go b/internal/endtoend/testdata/star_expansion_subquery/mysql/go/query.sql.go
index 079dd70547..9378346c90 100644
--- a/internal/endtoend/testdata/star_expansion_subquery/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/star_expansion_subquery/mysql/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) StarExpansionSubquery(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/star_expansion_subquery/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/star_expansion_subquery/postgresql/stdlib/go/query.sql.go
index 079dd70547..9378346c90 100644
--- a/internal/endtoend/testdata/star_expansion_subquery/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/star_expansion_subquery/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) StarExpansionSubquery(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/subquery_calculated_column/mysql/go/query.sql.go b/internal/endtoend/testdata/subquery_calculated_column/mysql/go/query.sql.go
index 916d37f7b0..fab2dcdad0 100644
--- a/internal/endtoend/testdata/subquery_calculated_column/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/subquery_calculated_column/mysql/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) SubqueryCalcColumn(ctx context.Context) ([]int32, error) {
 		}
 		items = append(items, sum)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/subquery_calculated_column/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/subquery_calculated_column/postgresql/stdlib/go/query.sql.go
index 916d37f7b0..fab2dcdad0 100644
--- a/internal/endtoend/testdata/subquery_calculated_column/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/subquery_calculated_column/postgresql/stdlib/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) SubqueryCalcColumn(ctx context.Context) ([]int32, error) {
 		}
 		items = append(items, sum)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/subquery_calculated_column/sqlite/go/query.sql.go b/internal/endtoend/testdata/subquery_calculated_column/sqlite/go/query.sql.go
index 70bcdb099a..4967d2fa2b 100644
--- a/internal/endtoend/testdata/subquery_calculated_column/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/subquery_calculated_column/sqlite/go/query.sql.go
@@ -27,9 +27,6 @@ func (q *Queries) SubqueryCalcColumn(ctx context.Context) ([]int64, error) {
 		}
 		items = append(items, sum)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/sum_type/postgresql/pgx/go/query.sql.go b/internal/endtoend/testdata/sum_type/postgresql/pgx/go/query.sql.go
index 5e0e063987..5572035b45 100644
--- a/internal/endtoend/testdata/sum_type/postgresql/pgx/go/query.sql.go
+++ b/internal/endtoend/testdata/sum_type/postgresql/pgx/go/query.sql.go
@@ -7,17 +7,15 @@ package querytest
 
 import (
 	"context"
-
-	"github.com/jackc/pgx/v5/pgtype"
 )
 
 const sumOrder = `-- name: SumOrder :one
 SELECT SUM(quantity) FROM orders
 `
 
-func (q *Queries) SumOrder(ctx context.Context) (pgtype.Numeric, error) {
+func (q *Queries) SumOrder(ctx context.Context) (int64, error) {
 	row := q.db.QueryRow(ctx, sumOrder)
-	var sum pgtype.Numeric
+	var sum int64
 	err := row.Scan(&sum)
 	return sum, err
 }
diff --git a/internal/endtoend/testdata/table_function/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/table_function/postgresql/stdlib/go/query.sql.go
index 2a0c7e2b5f..5ede6f41c8 100644
--- a/internal/endtoend/testdata/table_function/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/table_function/postgresql/stdlib/go/query.sql.go
@@ -48,9 +48,6 @@ func (q *Queries) GetTransaction(ctx context.Context, arg GetTransactionParams)
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/table_function/sqlite/go/query.sql.go b/internal/endtoend/testdata/table_function/sqlite/go/query.sql.go
index a09ac672e9..00a14a8656 100644
--- a/internal/endtoend/testdata/table_function/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/table_function/sqlite/go/query.sql.go
@@ -49,9 +49,6 @@ func (q *Queries) GetTransaction(ctx context.Context, arg GetTransactionParams)
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/types_uuid/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/types_uuid/postgresql/stdlib/go/query.sql.go
index 6e6e34fb50..15a7e36c91 100644
--- a/internal/endtoend/testdata/types_uuid/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/types_uuid/postgresql/stdlib/go/query.sql.go
@@ -40,9 +40,6 @@ func (q *Queries) List(ctx context.Context) ([]Foo, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/unnest/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/unnest/postgresql/stdlib/go/query.sql.go
index 9d20299b4f..6fd91f9343 100644
--- a/internal/endtoend/testdata/unnest/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/unnest/postgresql/stdlib/go/query.sql.go
@@ -39,9 +39,6 @@ func (q *Queries) CreateMemories(ctx context.Context, vampireID []uuid.UUID) ([]
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -66,9 +63,6 @@ func (q *Queries) GetVampireIDs(ctx context.Context, vampireID []uuid.UUID) ([]u
 		}
 		items = append(items, vampires_id)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/unnest_star/postgresql/pgx/go/query.sql.go b/internal/endtoend/testdata/unnest_star/postgresql/pgx/go/query.sql.go
index 75f7c286e7..06e0578679 100644
--- a/internal/endtoend/testdata/unnest_star/postgresql/pgx/go/query.sql.go
+++ b/internal/endtoend/testdata/unnest_star/postgresql/pgx/go/query.sql.go
@@ -7,8 +7,6 @@ package querytest
 
 import (
 	"context"
-
-	"github.com/jackc/pgx/v5/pgtype"
 )
 
 const getPlanItems = `-- name: GetPlanItems :many
@@ -27,8 +25,8 @@ LATERAL (
 
 type GetPlanItemsParams struct {
 	Ids        []int64
-	After      pgtype.Int4
-	LimitCount int64
+	After      interface{}
+	LimitCount int32
 }
 
 type GetPlanItemsRow struct {
diff --git a/internal/endtoend/testdata/unnest_with_ordinality/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/unnest_with_ordinality/postgresql/stdlib/go/query.sql.go
index b8feab6598..b78184b2b9 100644
--- a/internal/endtoend/testdata/unnest_with_ordinality/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/unnest_with_ordinality/postgresql/stdlib/go/query.sql.go
@@ -34,9 +34,6 @@ func (q *Queries) GetValues(ctx context.Context) ([]GetValuesRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/update_array_index/postgresql/pgx/go/query.sql.go b/internal/endtoend/testdata/update_array_index/postgresql/pgx/go/query.sql.go
index d82d438266..6709b8158f 100644
--- a/internal/endtoend/testdata/update_array_index/postgresql/pgx/go/query.sql.go
+++ b/internal/endtoend/testdata/update_array_index/postgresql/pgx/go/query.sql.go
@@ -17,8 +17,8 @@ RETURNING id, names
 `
 
 type UpdateAuthorParams struct {
-	Names   int32
-	Names_2 string
+	Names   []string
+	Names_2 []string
 	ID      int64
 }
 
diff --git a/internal/endtoend/testdata/valid_group_by_reference/mysql/go/query.sql.go b/internal/endtoend/testdata/valid_group_by_reference/mysql/go/query.sql.go
index dcbbe61d1f..065ee7e746 100644
--- a/internal/endtoend/testdata/valid_group_by_reference/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/valid_group_by_reference/mysql/go/query.sql.go
@@ -36,9 +36,6 @@ func (q *Queries) ListAuthors(ctx context.Context) ([]ListAuthorsRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -65,9 +62,6 @@ func (q *Queries) ListAuthorsIdenticalAlias(ctx context.Context) ([]Author, erro
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -102,9 +96,6 @@ func (q *Queries) ListMetrics(ctx context.Context) ([]ListMetricsRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/valid_group_by_reference/pganalyzer/go/query.sql.go b/internal/endtoend/testdata/valid_group_by_reference/pganalyzer/go/query.sql.go
index cb610fc00c..cb291299a0 100644
--- a/internal/endtoend/testdata/valid_group_by_reference/pganalyzer/go/query.sql.go
+++ b/internal/endtoend/testdata/valid_group_by_reference/pganalyzer/go/query.sql.go
@@ -8,7 +8,6 @@ package querytest
 import (
 	"context"
 	"database/sql"
-	"time"
 )
 
 const listAuthors = `-- name: ListAuthors :many
@@ -30,9 +29,6 @@ func (q *Queries) ListAuthors(ctx context.Context) ([]Author, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -58,9 +54,6 @@ func (q *Queries) ListAuthorsIdenticalAlias(ctx context.Context) ([]Author, erro
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -76,7 +69,7 @@ ORDER BY bucket DESC
 `
 
 type ListMetricsRow struct {
-	Bucket   time.Time
+	Bucket   int64
 	CityName sql.NullString
 	Avg      float64
 }
@@ -95,9 +88,6 @@ func (q *Queries) ListMetrics(ctx context.Context) ([]ListMetricsRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/valid_group_by_reference/postgresql/go/query.sql.go b/internal/endtoend/testdata/valid_group_by_reference/postgresql/go/query.sql.go
index bff0180c6d..cb291299a0 100644
--- a/internal/endtoend/testdata/valid_group_by_reference/postgresql/go/query.sql.go
+++ b/internal/endtoend/testdata/valid_group_by_reference/postgresql/go/query.sql.go
@@ -29,9 +29,6 @@ func (q *Queries) ListAuthors(ctx context.Context) ([]Author, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -57,9 +54,6 @@ func (q *Queries) ListAuthorsIdenticalAlias(ctx context.Context) ([]Author, erro
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -94,9 +88,6 @@ func (q *Queries) ListMetrics(ctx context.Context) ([]ListMetricsRow, error) {
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
diff --git a/internal/endtoend/testdata/virtual_table/sqlite/go/query.sql.go b/internal/endtoend/testdata/virtual_table/sqlite/go/query.sql.go
index 903d99641f..0e43f755c5 100644
--- a/internal/endtoend/testdata/virtual_table/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/virtual_table/sqlite/go/query.sql.go
@@ -51,9 +51,6 @@ func (q *Queries) SelectAllColsFt(ctx context.Context, b string) ([]string, erro
 		}
 		items = append(items, b)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -79,9 +76,6 @@ func (q *Queries) SelectAllColsTblFt(ctx context.Context, b string) ([]TblFt, er
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -113,9 +107,6 @@ func (q *Queries) SelectBm25Func(ctx context.Context, b string) ([]SelectBm25Fun
 		}
 		items = append(items, i)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -141,9 +132,6 @@ func (q *Queries) SelectHightlighFunc(ctx context.Context, b string) ([]string,
 		}
 		items = append(items, highlight)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -169,9 +157,6 @@ func (q *Queries) SelectOneColFt(ctx context.Context, b string) ([]string, error
 		}
 		items = append(items, b)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -197,9 +182,6 @@ func (q *Queries) SelectOneColTblFt(ctx context.Context, b string) ([]string, er
 		}
 		items = append(items, c)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
@@ -224,9 +206,6 @@ func (q *Queries) SelectSnippetFunc(ctx context.Context, snippet int64) ([]strin
 		}
 		items = append(items, snippet)
 	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}