From 2a39fbb444888bbba9139c7f7ab84f2aa28509ee Mon Sep 17 00:00:00 2001
From: Sven Klemm <sven@timescale.com>
Date: Thu, 19 Oct 2023 11:04:19 +0200
Subject: [PATCH] Release 2.12.2

This release contains bug fixes since the 2.12.1 release.
We recommend that you upgrade at the next available opportunity.

**Bugfixes**
* #6155 Align gapfill bucket generation with time_bucket
* #6181 Ensure fixed_schedule field is populated
* #6210 Fix EXPLAIN ANALYZE for compressed DML
---
 .unreleased/PR_6155            |  1 -
 .unreleased/pr_6210            |  1 -
 CHANGELOG.md                   | 10 ++++++++++
 sql/CMakeLists.txt             |  8 +++++---
 sql/updates/2.12.1--2.12.2.sql |  0
 sql/updates/2.12.2--2.12.1.sql |  0
 version.config                 |  6 +++---
 7 files changed, 18 insertions(+), 8 deletions(-)
 delete mode 100644 .unreleased/PR_6155
 delete mode 100644 .unreleased/pr_6210
 create mode 100644 sql/updates/2.12.1--2.12.2.sql
 create mode 100644 sql/updates/2.12.2--2.12.1.sql

diff --git a/.unreleased/PR_6155 b/.unreleased/PR_6155
deleted file mode 100644
index 634d6558d83..00000000000
--- a/.unreleased/PR_6155
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: #6155 Align gapfill bucket generation with time_bucket
diff --git a/.unreleased/pr_6210 b/.unreleased/pr_6210
deleted file mode 100644
index 204739901fc..00000000000
--- a/.unreleased/pr_6210
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: #6210 Fix EXPLAIN ANALYZE for compressed DML
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7c5d30003b..1f9a309cb7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,16 @@
 `psql` with the `-X` flag to prevent any `.psqlrc` commands from
 accidentally triggering the load of a previous DB version.**
 
+## 2.12.2 (2023-10-19)
+
+This release contains bug fixes since the 2.12.1 release.
+We recommend that you upgrade at the next available opportunity.
+
+**Bugfixes**
+* #6155 Align gapfill bucket generation with time_bucket
+* #6181 Ensure fixed_schedule field is populated
+* #6210 Fix EXPLAIN ANALYZE for compressed DML
+
 ## 2.12.1 (2023-10-12)
 
 This release contains bug fixes since the 2.12.0 release.
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 44c4c13c114..d49e68c505d 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -39,11 +39,12 @@ set(MOD_FILES
     updates/2.11.0--2.11.1.sql
     updates/2.11.1--2.11.2.sql
     updates/2.11.2--2.12.0.sql
-    updates/2.12.0--2.12.1.sql)
+    updates/2.12.0--2.12.1.sql
+    updates/2.12.1--2.12.2.sql)
 
 # The downgrade file to generate a downgrade script for the current version, as
 # specified in version.config
-set(CURRENT_REV_FILE 2.12.1--2.12.0.sql)
+set(CURRENT_REV_FILE 2.12.2--2.12.1.sql)
 # Files for generating old downgrade scripts. This should only include files for
 # downgrade from one version to its previous version since we do not support
 # skipping versions when downgrading.
@@ -74,7 +75,8 @@ set(OLD_REV_FILES
     2.11.1--2.11.0.sql
     2.11.2--2.11.1.sql
     2.12.0--2.11.2.sql
-    2.12.1--2.12.0.sql)
+    2.12.1--2.12.0.sql
+    2.12.2--2.12.1.sql)
 
 set(MODULE_PATHNAME "$libdir/timescaledb-${PROJECT_VERSION_MOD}")
 set(LOADER_PATHNAME "$libdir/timescaledb")
diff --git a/sql/updates/2.12.1--2.12.2.sql b/sql/updates/2.12.1--2.12.2.sql
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/sql/updates/2.12.2--2.12.1.sql b/sql/updates/2.12.2--2.12.1.sql
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/version.config b/version.config
index ea2bf48664d..b819a05fc3b 100644
--- a/version.config
+++ b/version.config
@@ -1,3 +1,3 @@
-version = 2.12.1
-update_from_version = 2.12.0
-downgrade_to_version = 2.12.0
+version = 2.12.2
+update_from_version = 2.12.1
+downgrade_to_version = 2.12.1