Merge branch 'wl15425' into trunk

Change-Id: I6207dc536927132f60d8e3950baf7bbb005e5aed

Author: silvakid

common/CMakeLists.txt

@@ -43,18 +43,6 @@ if(CLANG)
   )
 endif()
 
-#
-#  Generate version info
-#
-
-set(CLIENT_VERSION ${CONCPP_VERSION})
-
-if(EXTRA_NAME_SUFFIX STREQUAL "-commercial")
-  SET(CONCPP_LICENSE "COMMERCIAL")
-else()
-  SET(CONCPP_LICENSE "GPL-2.0")
-endif()
-
 #
 # Note: generated version_info.h is placed in the build location
 # and the common target is configured to include it before the

jdbc/cppconn/version_info.h.cmake

@@ -36,6 +36,7 @@
 
 #define MYCPPCONN_DM_VERSION     "@CONCPP_VERSION@"
 #define MYCPPCONN_DM_VERSION_ID  @CONCPP_VERSION_NUMBER@
+#define MYSQL_CONCPP_LICENSE     "@CONCPP_LICENSE@"
 
 #define MYSQL_CONCPP_VERSION_MAJOR   @CONNECTOR_MAJOR@
 #define MYSQL_CONCPP_VERSION_MINOR   @CONNECTOR_MINOR@

jdbc/driver/mysql_connection.cpp

@@ -522,6 +522,18 @@ void MySQL_Connection::init(ConnectOptionsMap & properties)
   bool secure_auth= true;
 #endif
 
+  /*
+    Add default connector connection attributes
+  */
+  std::map<sql::SQLString, sql::SQLString> default_attr = {
+      {"_connector_name", "mysql-connector-cpp"},
+      {"_connector_version", MYCPPCONN_DM_VERSION},
+      {"_connector_license", MYSQL_CONCPP_LICENSE}};
+
+  for (auto &el : default_attr) {
+    proxy->options(sql::mysql::MYSQL_OPT_CONNECT_ATTR_ADD, el.first, el.second);
+  }
+
   sql::ConnectOptionsMap::const_iterator it;
 
   /* Port from options must be set as default for all hosts where port
@@ -951,7 +963,11 @@ void MySQL_Connection::init(ConnectOptionsMap & properties)
       std::map< sql::SQLString, sql::SQLString >::const_iterator conn_attr_it;
       for (conn_attr_it = conVal->begin(); conn_attr_it != conVal->end(); conn_attr_it++) {
         try {
-          proxy->options(sql::mysql::MYSQL_OPT_CONNECT_ATTR_ADD, conn_attr_it->first, conn_attr_it->second);
+          //Skip default values
+          if (default_attr.find(conn_attr_it->first) != default_attr.end())
+            continue;
+          proxy->options(sql::mysql::MYSQL_OPT_CONNECT_ATTR_ADD,
+                         conn_attr_it->first, conn_attr_it->second);
         } catch (sql::InvalidArgumentException& e) {
           std::string errorOption("MYSQL_OPT_CONNECT_ATTR_ADD");
           throw ::sql::SQLUnsupportedOptionException(e.what(), errorOption);
@@ -966,12 +982,15 @@ void MySQL_Connection::init(ConnectOptionsMap & properties)
       }
       std::list< sql::SQLString >::const_iterator conn_attr_it;
       for (conn_attr_it = conVal->begin(); conn_attr_it != conVal->end(); conn_attr_it++) {
+        // Skip default values
+        if (default_attr.find(*conn_attr_it) != default_attr.end())
+          continue;
         try {
           proxy->options(MYSQL_OPT_CONNECT_ATTR_DELETE, *conn_attr_it);
-        } catch (sql::InvalidArgumentException& e) {
-          std::string errorOption("MYSQL_OPT_CONNECT_ATTR_DELETE");
-          throw ::sql::SQLUnsupportedOptionException(e.what(), errorOption);
-        }
+          } catch (sql::InvalidArgumentException &e) {
+            std::string errorOption("MYSQL_OPT_CONNECT_ATTR_DELETE");
+            throw ::sql::SQLUnsupportedOptionException(e.what(), errorOption);
+          }
       }
     } else if (!it->first.compare(OPT_CONNECT_ATTR_RESET)) {
       proxy->options(MYSQL_OPT_CONNECT_ATTR_RESET, 0);

jdbc/test/unit/classes/connection.cpp

@@ -2382,9 +2382,68 @@ void connection::enableClearTextAuth()
   stmt->executeUpdate("DROP USER 't_ct_user'@'%'");
 }
 
+void connection::default_connector_attributes() {
+  logMsg(
+      "connection::default_connector_attributes - Check if default attributes "
+      "are set");
+
+  sql::SQLString query =
+      "SELECT ATTR_NAME, ATTR_VALUE FROM "
+      "performance_schema.session_account_connect_attrs WHERE ATTR_NAME LIKE "
+      "'_connector_%' AND PROCESSLIST_ID = connection_id() ORDER BY ATTR_NAME "
+      "ASC;";
+
+  std::map<sql::SQLString, sql::SQLString> attributes = {
+      {"_connector_version", MYCPPCONN_DM_VERSION},
+      {"_connector_license", MYSQL_CONCPP_LICENSE},
+      {"_connector_name", "mysql-connector-cpp"}};
+
+  auto check_attr = [&attributes](ResultSet &res) {
+    ASSERT_EQUALS(attributes.size(), res->rowsCount());
+    while (res->next()) {
+      ASSERT_EQUALS(attributes[res->getString("ATTR_NAME")],
+                    res->getString("ATTR_VALUE"));
+    }
+  };
 
-void connection::connectAttrAdd()
-{
+  res.reset(stmt->executeQuery(query));
+
+  check_attr(res);
+
+  {
+    testsuite::Connection conn1;
+    sql::ConnectOptionsMap opts;
+    std::map<sql::SQLString, sql::SQLString> connectAttrMap = {
+        {"_connector_version", "1.1.1"},
+        {"_connector_license", "MIT"},
+        {"_connector_name", "mysql-connector-cpp-modified"}};
+
+    opts[OPT_CONNECT_ATTR_ADD] = connectAttrMap;
+
+    conn1.reset(getConnection(&opts));
+    stmt.reset(conn1->createStatement());
+    res.reset(stmt->executeQuery(query));
+
+    check_attr(res);
+  }
+
+  {
+    testsuite::Connection conn1;
+    sql::ConnectOptionsMap opts;
+    std::list<sql::SQLString> connectAttrMapDelete = {
+        "_connector_version", "_connector_license", "_connector_name"};
+
+    opts[OPT_CONNECT_ATTR_DELETE] = connectAttrMapDelete;
+
+    conn1.reset(getConnection(&opts));
+    stmt.reset(conn1->createStatement());
+    res.reset(stmt->executeQuery(query));
+
+    check_attr(res);
+  }
+}
+
+void connection::connectAttrAdd() {
   logMsg("connection::connectAttr - MYSQL_OPT_CONNECT_ATTR_ADD|MYSQL_OPT_CONNECT_ATTR_DELETE");
 
   int serverVersion=getMySQLVersion(con);

jdbc/test/unit/classes/connection.h

@@ -80,6 +80,7 @@ class connection : public unit_fixture
     TEST_CASE(loadSameLibraryTwice);
 #endif
   TEST_CASE(enableClearTextAuth);
+  TEST_CASE(default_connector_attributes);
   TEST_CASE(connectAttrAdd);
   TEST_CASE(connectAttrReset);
   TEST_CASE(connectCharsetDir);
@@ -213,6 +214,11 @@ class connection : public unit_fixture
 
   void enableClearTextAuth();
 
+  /*
+    Test to check if connector default attributes are set
+   */
+  void default_connector_attributes();
+
   /*
    * Test for Connection attributes options MYSQL_OPT_CONNECT_ATTR_ADD
    * | MYSQL_OPT_CONNECT_ATTR_DELETE

version.cmake

@@ -47,6 +47,16 @@ set(CONCPP_VERSION_NUMBER
   CACHE INTERNAL "version info"
 )
 
+#
+#  Generate version info
+#
+
+if(EXTRA_NAME_SUFFIX STREQUAL "-commercial")
+  SET(CONCPP_LICENSE "COMMERCIAL" CACHE INTERNAL "license info")
+else()
+  SET(CONCPP_LICENSE "GPL-2.0" CACHE INTERNAL "license info")
+endif()
+
 #
 #  ABI versions
 #