WL15081: Add connector version macros

Change-Id: Ic1457b9b9178647ca17ce21ca39058b20063aa30

Author: silvakid

VersionInfo.cmake.in

@@ -1,4 +1,4 @@
-# Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -27,6 +27,8 @@
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 
+SET(CONCPP_VERSION "@CONCPP_VERSION@")
+SET(CONCPP_VERSION_NUMBER @CONCPP_VERSION_NUMBER@)
 SET(CONNECTOR_MAJOR "@CONCPP_VERSION_MAJOR@")
 SET(CONNECTOR_MINOR "@CONCPP_VERSION_MINOR@")
 SET(CONNECTOR_PATCH "@CONCPP_VERSION_MICRO@")
@@ -36,18 +38,6 @@ SET(CONNECTOR_QUALITY "GA")
 # Bump this every time we change the API/ABI
 SET(MYSQLCPPCONN_SOVERSION "@JDBC_ABI_VERSION_MAJOR@")
 
-IF(CONNECTOR_MINOR LESS 10)
-        SET(CONNECTOR_MINOR_PADDED "0${CONNECTOR_MINOR}")
-ELSE(CONNECTOR_MINOR LESS 10)
-        SET(CONNECTOR_MINOR_PADDED "${CONNECTOR_MINOR}")
-ENDIF(CONNECTOR_MINOR LESS 10)
-
-# If driver survives 100th patch this has to be changed
-IF(CONNECTOR_PATCH LESS 10)
-        SET(CONNECTOR_PATCH_PADDED "000${CONNECTOR_PATCH}")
-ELSE(CONNECTOR_PATCH LESS 10)
-        SET(CONNECTOR_PATCH_PADDED "00${CONNECTOR_PATCH}")
-ENDIF(CONNECTOR_PATCH LESS 10)
 
 SET(CONNECTOR_BASE_VERSION    "${CONNECTOR_MAJOR}.${CONNECTOR_MINOR}")
 SET(CONNECTOR_BASE_PREVIOUS   "1.0")

cppconn/version_info.h.cmake

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2.0, as
@@ -34,8 +34,14 @@
 #define MYCPPCONN_DM_MINOR_VERSION @CONNECTOR_MINOR@
 #define MYCPPCONN_DM_PATCH_VERSION @CONNECTOR_PATCH@
 
-#define MYCPPCONN_DM_VERSION     "@CONNECTOR_MAJOR@.@CONNECTOR_MINOR_PADDED@.@CONNECTOR_PATCH_PADDED@"
-#define MYCPPCONN_DM_VERSION_ID  @CONNECTOR_MAJOR@@CONNECTOR_MINOR_PADDED@@CONNECTOR_PATCH_PADDED@
+#define MYCPPCONN_DM_VERSION     "@CONCPP_VERSION@"
+#define MYCPPCONN_DM_VERSION_ID  @CONCPP_VERSION_NUMBER@
+
+#define MYSQL_CONCPP_VERSION_MAJOR   @CONNECTOR_MAJOR@
+#define MYSQL_CONCPP_VERSION_MINOR   @CONNECTOR_MINOR@
+#define MYSQL_CONCPP_VERSION_MICRO   @CONNECTOR_PATCH@
+
+#define MYSQL_CONCPP_VERSION_NUMBER  @CONCPP_VERSION_NUMBER@
 
 
 /* Driver version info */

test/unit/classes/connection.cpp

@@ -4254,7 +4254,41 @@ void connection::normalize_ssl_options()
 
 }
 
+void connection::macro_version()
+{/*
+  Check if version is set and correct
+*/
+#if !defined(MYSQL_CONCPP_VERSION_NUMBER)
+  SKIP("MYSQL_CONCPP_VERSION_NUMBER macro not defined");
+#else
+
+#if !defined(MYSQL_CONCPP_VERSION_MAJOR)
+  FAIL("MYSQL_CONCPP_VERSION_MAJOR macro not defined");
+#elif !defined(MYSQL_CONCPP_VERSION_MINOR)
+  FAIL("MYSQL_CONCPP_VERSION_MINOR macro not defined");
+#elif !defined(MYSQL_CONCPP_VERSION_MICRO)
+  FAIL("MYSQL_CONCPP_VERSION_MICRO macro not defined");
+#endif
+
+  ASSERT_EQUALS(MYSQL_CONCPP_VERSION_NUMBER, MYCPPCONN_DM_VERSION_ID);
+
+  std::stringstream version_orig, version_generated, version_old;
+
+  version_orig << std::setfill('0')
+               << MYSQL_CONCPP_VERSION_MAJOR
+               << std::setw(2) << MYSQL_CONCPP_VERSION_MINOR
+               << std::setw(4) << MYSQL_CONCPP_VERSION_MICRO;
 
+  version_generated << MYSQL_CONCPP_VERSION_NUMBER;
+
+  version_old << MYCPPCONN_DM_VERSION_ID;
+
+  ASSERT_EQUALS(version_orig.str(), version_generated.str());
+
+  ASSERT_EQUALS(version_orig.str(), version_old.str());
+
+#endif
+}
 
 } /* namespace connection */
 } /* namespace testsuite */

test/unit/classes/connection.h

@@ -98,6 +98,7 @@ class connection : public unit_fixture
   TEST_CASE(tls_deprecation);
   TEST_CASE(fido_test);
   TEST_CASE(normalize_ssl_options);
+  TEST_CASE(macro_version);
   }
 
   /**
@@ -307,16 +308,20 @@ class connection : public unit_fixture
    *
    */
   void normalize_ssl_options();
-  
+
   /*
    * Test for checking fido connection.
    *
    */
   void fido_test();
 
+  /*
+   * Test version macros.
+   *
+   */
+  void macro_version();
 };
 
-
 REGISTER_FIXTURE(connection);
 } /* namespace classes */
 } /* namespace testsuite */