Fix for Bug #29525077 REPORTED TYPE OF INTS IN RESULT SET TOO GENERAL

Author: Bogdan Degtyariov

cdk/include/mysql/cdk/codec.h

@@ -77,7 +77,7 @@ class Format<TYPE_INTEGER> : public Format_base
   }
 
   bool is_unsigned() const { return UINT == m_fmt; }
-  size_t length() { return m_length; }
+  size_t length() const { return m_length; }
 
 protected:
 

devapi/result.cc

@@ -110,11 +110,26 @@ Type get_api_type(cdk::Type_info type, const common::Format_info &fmt)
   }
 
   case cdk::TYPE_INTEGER:
-    /*
-      TODO: Report more precise DevAPI type (TINYINT etc) based
-      on CDK type and encoding format information.
-    */
-    return Type::INT;
+  {
+    const common::Format_descr<cdk::TYPE_INTEGER> &fd
+      = fmt.get<cdk::TYPE_INTEGER>();
+
+    size_t f_len = fd.m_format.length();
+
+    if (f_len < 5)
+      return Type::TINYINT;
+
+    if (f_len < 8)
+      return Type::SMALLINT;
+
+    if (f_len < 10)
+      return Type::MEDIUMINT;
+
+    if (f_len < 20)
+      return Type::INT;
+
+    return Type::BIGINT;
+  }
 
   case cdk::TYPE_FLOAT:
   {

devapi/tests/bugs-t.cc

@@ -579,3 +579,67 @@ TEST_F(Bugs, not_accumulate)
   tbl_remove.orderBy("doc->$.age ASC");
   EXPECT_EQ(2, tbl_remove.execute().getAffectedItemsCount());
 }
+
+
+TEST_F(Bugs, bug29525077)
+{
+  SKIP_IF_NO_XPLUGIN;
+
+  mysqlx::Session &sess = get_sess();
+  sess.dropSchema("bug29525077_int_types");
+  sess.createSchema("bug29525077_int_types");
+
+  sess.sql(
+    "CREATE TABLE bug29525077_int_types.int_types ("
+    "c1 TINYINT, c2 SMALLINT, c3 MEDIUMINT,"
+    "c4 INT, c5 BIGINT,"
+    "c6 TINYINT UNSIGNED, c7 SMALLINT UNSIGNED,"
+    "c8 MEDIUMINT UNSIGNED, c9 INT UNSIGNED,"
+    "c10 BIGINT UNSIGNED)"
+  ).execute();
+  sess.sql(
+    "INSERT INTO bug29525077_int_types.int_types "
+    "VALUES (1, 2, 3, 4, 5, 6, 7, 8, 9, 10)"
+  ).execute();
+  mysqlx::Table tab = sess.getSchema("bug29525077_int_types").
+                  getTable("int_types");
+
+  auto res = tab.select().execute();
+  auto columns = &res.getColumns();
+  col_count_t num_columns = res.getColumnCount();
+  EXPECT_EQ(10, num_columns);
+  while (Row r = res.fetchOne())
+  {
+    for (col_count_t i = 0; i < num_columns; ++i)
+    {
+      auto col_type = (*columns)[i].getType();
+      switch (i)
+      {
+      case 0:
+      case 5:
+        EXPECT_EQ(Type::TINYINT, col_type);
+        break;
+      case 1:
+      case 6:
+        EXPECT_EQ(Type::SMALLINT, col_type);
+        break;
+      case 2:
+      case 7:
+        EXPECT_EQ(Type::MEDIUMINT, col_type);
+        break;
+      case 3:
+      case 8:
+        EXPECT_EQ(Type::INT, col_type);
+        break;
+      case 4:
+      case 9:
+        EXPECT_EQ(Type::BIGINT, col_type);
+        break;
+      default:
+        break;
+      }
+    }
+  }
+  sess.dropSchema("bug29525077_int_types");
+
+}

devapi/tests/session-t.cc

@@ -2036,7 +2036,7 @@ TEST_F(Sess, settings_iterator)
       else if(set.first == SessionOption::SSL_MODE)
         EXPECT_EQ(static_cast<int>(SSLMode::DISABLED), set.second.get<int>());
       else if(set.first == SessionOption::USER)
-        EXPECT_EQ(std::string(get_user()), set.second.get<std::string>());
+        EXPECT_EQ(std::string(get_user() ? get_user() : ""), set.second.get<std::string>());
       else if(set.first == SessionOption::PWD)
       {
         if (get_password())
@@ -2091,7 +2091,7 @@ TEST_F(Sess, settings_iterator)
       else if(set.first == SessionOption::SSL_MODE)
         EXPECT_EQ(static_cast<int>(SSLMode::DISABLED), set.second.get<int>());
       else if(set.first == SessionOption::USER)
-        EXPECT_EQ(std::string(get_user()), set.second.get<std::string>());
+        EXPECT_EQ(std::string(get_user() ? get_user() : ""), set.second.get<std::string>());
       else if(set.first == SessionOption::PWD)
       {
         if (get_password())