Merge branch 'develop'

zussel · Jan 14, 2024 · a147d4a · a147d4a
2 parents 3b6273c + 650e534
commit a147d4a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,7 @@ STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER)
 
 SET(APP_MAJOR_VERSION 0)
 SET(APP_MINOR_VERSION 9)
-SET(APP_PATCH_LEVEL 1)
+SET(APP_PATCH_LEVEL 2)
 SET(APP_VERSION "${APP_MAJOR_VERSION}.${APP_MINOR_VERSION}.${APP_PATCH_LEVEL}")
 
 MESSAGE(STATUS "${PROJECT_NAME_UPPER} ${APP_VERSION}")

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,12 @@
+## matador 0.9.2 "Homerian"
+
+This is a bugfix release. The following issues will be addressed
+- Raise exception if a specific column value is null (mysql query) [#156](https://github.com/zussel/matador/issues/156)
+
+  Will fix an additional bug concerning prepared statements for mysql. 
+
+Look [here](https://en.wikipedia.org/wiki/Homerian) to find out what Homerian is.
+
 ## matador 0.9.1 "Sheinwoodian"
 
 This is a bugfix release. The following issues will be addressed

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ matador
 
 Take your database by the horns.
 
-[![Version 0.9.1](https://badge.fury.io/gh/zussel%2Fmatador.svg)](https://badge.fury.io/gh/zussel%2Fmatador)
+[![Version 0.9.2](https://badge.fury.io/gh/zussel%2Fmatador.svg)](https://badge.fury.io/gh/zussel%2Fmatador)
 [![GPLv3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://raw.githubusercontent.com/zussel/matador/develop/License)
 [![C++14](https://img.shields.io/badge/language-C%2B%2B14-yellow.svg)](https://en.wikipedia.org/wiki/C%2B%2B14)
 

diff --git a/test/object/ObjectStoreTestUnit.cpp b/test/object/ObjectStoreTestUnit.cpp
@@ -101,13 +101,13 @@ struct item_counter
 
 void ObjectStoreTestUnit::test_version()
 {
-  const std::string version("0.9.1");
+  const std::string version("0.9.2");
 
   UNIT_ASSERT_EQUAL(matador::version::str, version);
 
   UNIT_ASSERT_EQUAL(matador::version::major, 0);
   UNIT_ASSERT_EQUAL(matador::version::minor, 9);
-  UNIT_ASSERT_EQUAL(matador::version::patch_level, 1);
+  UNIT_ASSERT_EQUAL(matador::version::patch_level, 2);
 }