From bfc21be50062d392f23ac2aa974ad53c79d920f8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 28 May 2026 11:16:57 +0000
Subject: [PATCH] chore(2.x): release 2.18.0

---
 .github/.release-please-manifest.json | 2 +-
 CHANGELOG.md                          | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 6846c98b..4a27304c 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-    ".": "2.17.0"
+    ".": "2.18.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c0cd082..43aec910 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [2.18.0](https://github.com/cycle/database/compare/2.17.0...2.18.0) (2026-05-28)
+
+
+### Features
+
+* Add `InsertQuery::onConflict()` method ([#249](https://github.com/cycle/database/issues/249)) ([395a7ff](https://github.com/cycle/database/commit/395a7ff42116c1d4978d5cb20f4e66786c10b906))
+* Add `SelectQuery::wrapWhere()` to group WHERE conditions ([#250](https://github.com/cycle/database/issues/250)) ([8f7c03a](https://github.com/cycle/database/commit/8f7c03a589260716d0211202e9969c4c3d0d285c))
+
 ## [2.17.0](https://github.com/cycle/database/compare/2.16.0...2.17.0) (2026-05-14)