fix: tests

examples/tracing/main.go

@@ -39,12 +39,12 @@ func main() {
 	stmt := pgkit.RawQuery("SELECT * FROM accounts WHERE name IN (?,?)")
 	q := stmt.Build("user-1", "user-2")
 
-	_, err = dbClient.Query.Exec(context.Background(), q)
+	_, err = dbClient.Query().Exec(context.Background(), q)
 	if err != nil {
 		log.Fatal(fmt.Errorf("failed to execute query: %w", err))
 	}
 
 	// example with incorrect sql query
 	stmt = pgkit.RawQuery("SELECT * FROM non_existent_table")
-	_, _ = dbClient.Query.Exec(context.Background(), stmt.Build())
+	_, _ = dbClient.Query().Exec(context.Background(), stmt.Build())
 }

pgkit.go

@@ -37,7 +37,7 @@ func (d *DB) Query() *Querier {
 
 // TxQuery returns a new Querier that uses the given pgx.Tx
 func (d *DB) TxQuery(tx pgx.Tx) *Querier {
-	return &Querier{tx: tx, SQL: d.sqlBuilder, pool: d.conn, Scan: d.query.Scan}
+	return &Querier{tx: tx, SQL: d.sqlBuilder, pool: d.conn, Scan: d.Query().Scan}
 }
 
 // TxQueryFromContext returns a new Querier that uses the pgx.Tx in the given context
@@ -122,7 +122,7 @@ func ConnectWithPGX(appName string, pgxConfig *pgxpool.Config) (*DB, error) {
 		return nil, wrapErr(err)
 	}
 
-	db.query = &Querier{pool: db.conn, Scan: pgxScanAPI, SQL: db.sqlBuilder}
+	db.query = &Querier{pool: DB.Conn(), Scan: pgxScanAPI, SQL: db.sqlBuilder}
 
 	return db, nil
 }

querier.go

@@ -327,7 +327,7 @@ func (r RawStatement) Err() error {
 }
 
 func (r RawStatement) GetQuery() string {
-	return r.query.Query
+	return r.Query().Query
 }
 
 func (r RawStatement) NumArgs() int {
@@ -338,7 +338,7 @@ func (r RawStatement) Build(args ...interface{}) Sqlizer {
 	if len(args) != r.numArgs {
 		return RawSQL{err: fmt.Errorf("pgkit: invalid arguments passed to statement, expecting %d args but received %d", r.numArgs, len(args))}
 	}
-	return RawSQL{Query: r.query.Query, Args: args, statement: true}
+	return RawSQL{Query: r.Query().Query, Args: args, statement: true}
 }
 
 func RawQuery(query string) RawStatement {

tests/helpers_test.go

@@ -18,7 +18,7 @@ func truncateAllTables(t *testing.T) {
 }
 
 func truncateTable(t *testing.T, tableName string) {
-	_, err := DB.Conn.Exec(context.Background(), fmt.Sprintf(`TRUNCATE TABLE %q CASCADE`, tableName))
+	_, err := DB.Conn().Exec(context.Background(), fmt.Sprintf(`TRUNCATE TABLE %q CASCADE`, tableName))
 	assert.NoError(t, err)
 }