diff --git a/internal/endtoend/testdata/having/mysql/go/db.go b/internal/endtoend/testdata/having/mysql/go/db.go
new file mode 100644
index 0000000000..5f69347d4b
--- /dev/null
+++ b/internal/endtoend/testdata/having/mysql/go/db.go
@@ -0,0 +1,31 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.15.0
+
+package querytest
+
+import (
+	"context"
+	"database/sql"
+)
+
+type DBTX interface {
+	ExecContext(context.Context, string, ...interface{}) (sql.Result, error)
+	PrepareContext(context.Context, string) (*sql.Stmt, error)
+	QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
+	QueryRowContext(context.Context, string, ...interface{}) *sql.Row
+}
+
+func New(db DBTX) *Queries {
+	return &Queries{db: db}
+}
+
+type Queries struct {
+	db DBTX
+}
+
+func (q *Queries) WithTx(tx *sql.Tx) *Queries {
+	return &Queries{
+		db: tx,
+	}
+}
diff --git a/internal/endtoend/testdata/having/mysql/go/models.go b/internal/endtoend/testdata/having/mysql/go/models.go
new file mode 100644
index 0000000000..973efc0e56
--- /dev/null
+++ b/internal/endtoend/testdata/having/mysql/go/models.go
@@ -0,0 +1,12 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.15.0
+
+package querytest
+
+import ()
+
+type Weather struct {
+	City   string
+	TempLo int32
+}
diff --git a/internal/endtoend/testdata/having/mysql/go/query.sql.go b/internal/endtoend/testdata/having/mysql/go/query.sql.go
new file mode 100644
index 0000000000..a9bcecad64
--- /dev/null
+++ b/internal/endtoend/testdata/having/mysql/go/query.sql.go
@@ -0,0 +1,40 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.15.0
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+)
+
+const coldCities = `-- name: ColdCities :many
+SELECT city
+FROM weather
+GROUP BY city
+HAVING max(temp_lo) < ?
+`
+
+func (q *Queries) ColdCities(ctx context.Context, tempLo int32) ([]string, error) {
+	rows, err := q.db.QueryContext(ctx, coldCities, tempLo)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []string
+	for rows.Next() {
+		var city string
+		if err := rows.Scan(&city); err != nil {
+			return nil, err
+		}
+		items = append(items, city)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
diff --git a/internal/endtoend/testdata/having/mysql/query.sql b/internal/endtoend/testdata/having/mysql/query.sql
new file mode 100644
index 0000000000..fd0dfe0694
--- /dev/null
+++ b/internal/endtoend/testdata/having/mysql/query.sql
@@ -0,0 +1,10 @@
+CREATE TABLE weather (
+  city     text    NOT NULL,
+  temp_lo  integer NOT NULL
+);
+
+-- name: ColdCities :many
+SELECT city
+FROM weather
+GROUP BY city
+HAVING max(temp_lo) < ?;
diff --git a/internal/endtoend/testdata/having/mysql/sqlc.json b/internal/endtoend/testdata/having/mysql/sqlc.json
new file mode 100644
index 0000000000..534b7e24e9
--- /dev/null
+++ b/internal/endtoend/testdata/having/mysql/sqlc.json
@@ -0,0 +1,12 @@
+{
+	"version": "1",
+	"packages": [
+		{
+			"path": "go",
+			"engine": "mysql",
+			"name": "querytest",
+			"schema": "query.sql",
+			"queries": "query.sql"
+		}
+	]
+}
diff --git a/internal/endtoend/testdata/having/postgresql/go/db.go b/internal/endtoend/testdata/having/postgresql/go/db.go
new file mode 100644
index 0000000000..5f69347d4b
--- /dev/null
+++ b/internal/endtoend/testdata/having/postgresql/go/db.go
@@ -0,0 +1,31 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.15.0
+
+package querytest
+
+import (
+	"context"
+	"database/sql"
+)
+
+type DBTX interface {
+	ExecContext(context.Context, string, ...interface{}) (sql.Result, error)
+	PrepareContext(context.Context, string) (*sql.Stmt, error)
+	QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
+	QueryRowContext(context.Context, string, ...interface{}) *sql.Row
+}
+
+func New(db DBTX) *Queries {
+	return &Queries{db: db}
+}
+
+type Queries struct {
+	db DBTX
+}
+
+func (q *Queries) WithTx(tx *sql.Tx) *Queries {
+	return &Queries{
+		db: tx,
+	}
+}
diff --git a/internal/endtoend/testdata/having/postgresql/go/models.go b/internal/endtoend/testdata/having/postgresql/go/models.go
new file mode 100644
index 0000000000..973efc0e56
--- /dev/null
+++ b/internal/endtoend/testdata/having/postgresql/go/models.go
@@ -0,0 +1,12 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.15.0
+
+package querytest
+
+import ()
+
+type Weather struct {
+	City   string
+	TempLo int32
+}
diff --git a/internal/endtoend/testdata/having/postgresql/go/query.sql.go b/internal/endtoend/testdata/having/postgresql/go/query.sql.go
new file mode 100644
index 0000000000..e5ae471d2e
--- /dev/null
+++ b/internal/endtoend/testdata/having/postgresql/go/query.sql.go
@@ -0,0 +1,40 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.15.0
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+)
+
+const coldCities = `-- name: ColdCities :many
+SELECT city
+FROM weather
+GROUP BY city
+HAVING max(temp_lo) < $1
+`
+
+func (q *Queries) ColdCities(ctx context.Context, tempLo int32) ([]string, error) {
+	rows, err := q.db.QueryContext(ctx, coldCities, tempLo)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []string
+	for rows.Next() {
+		var city string
+		if err := rows.Scan(&city); err != nil {
+			return nil, err
+		}
+		items = append(items, city)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
diff --git a/internal/endtoend/testdata/having/postgresql/query.sql b/internal/endtoend/testdata/having/postgresql/query.sql
new file mode 100644
index 0000000000..9e079fd2fe
--- /dev/null
+++ b/internal/endtoend/testdata/having/postgresql/query.sql
@@ -0,0 +1,10 @@
+CREATE TABLE weather (
+  city     text    NOT NULL,
+  temp_lo  integer NOT NULL
+);
+
+-- name: ColdCities :many
+SELECT city
+FROM weather
+GROUP BY city
+HAVING max(temp_lo) < $1;
diff --git a/internal/endtoend/testdata/having/postgresql/sqlc.json b/internal/endtoend/testdata/having/postgresql/sqlc.json
new file mode 100644
index 0000000000..af57681f66
--- /dev/null
+++ b/internal/endtoend/testdata/having/postgresql/sqlc.json
@@ -0,0 +1,12 @@
+{
+	"version": "1",
+	"packages": [
+		{
+			"path": "go",
+			"engine": "postgresql",
+			"name": "querytest",
+			"schema": "query.sql",
+			"queries": "query.sql"
+		}
+	]
+}
diff --git a/internal/engine/dolphin/convert.go b/internal/engine/dolphin/convert.go
index c2b3464f98..96f1b1ac77 100644
--- a/internal/engine/dolphin/convert.go
+++ b/internal/engine/dolphin/convert.go
@@ -497,6 +497,7 @@ func (c *cc) convertSelectStmt(n *pcast.SelectStmt) *ast.SelectStmt {
 		TargetList:   c.convertFieldList(n.Fields),
 		FromClause:   c.convertTableRefsClause(n.From),
 		GroupClause:  c.convertGroupByClause(n.GroupBy),
+		HavingClause: c.convertHavingClause(n.Having),
 		WhereClause:  c.convert(n.Where),
 		WithClause:   c.convertWithClause(n.With),
 		WindowClause: windowClause,
@@ -904,7 +905,10 @@ func (c *cc) convertGroupByClause(n *pcast.GroupByClause) *ast.List {
 }
 
 func (c *cc) convertHavingClause(n *pcast.HavingClause) ast.Node {
-	return todo(n)
+	if n == nil {
+		return nil
+	}
+	return c.convert(n.Expr)
 }
 
 func (c *cc) convertIndexAdviseStmt(n *pcast.IndexAdviseStmt) ast.Node {