[ODBC-73]Fix and testcase. The connector relied on the field's BINARY_FLAG flag to establish the fact whether the field it binary or not.

But that flag would be set if any binary collation is selected for any
char field. And that is not right. The patch changing that to check only
if field's charset is binary charset(63)

Author: lawrinn

ma_helper.c

@@ -19,6 +19,7 @@
 #include <ma_odbc.h>
 #include <stdint.h>
 
+#define MADB_FIELD_IS_BINARY(_field) ((_field).charsetnr == BINARY_CHARSETNR)
 
 void CloseMultiStatements(MADB_Stmt *Stmt)
 {
@@ -363,23 +364,23 @@ char *MADB_GetTypeName(MYSQL_FIELD Field)
     return "date";
   case MYSQL_TYPE_VARCHAR:
   case MYSQL_TYPE_VAR_STRING:
-    return (Field.flags & BINARY_FLAG) ? "varbinary" : "varchar";
+    return MADB_FIELD_IS_BINARY(Field) ? "varbinary" : "varchar";
   case MYSQL_TYPE_BIT:
     return "bit";
   case MYSQL_TYPE_ENUM:
     return "enum";
   case MYSQL_TYPE_SET:
     return "set";
   case MYSQL_TYPE_TINY_BLOB:
-    return (Field.flags & BINARY_FLAG) ? "tinyblob" : "tinytext";
+    return MADB_FIELD_IS_BINARY(Field) ? "tinyblob" : "tinytext";
   case MYSQL_TYPE_MEDIUM_BLOB:
-    return (Field.flags & BINARY_FLAG) ? "mediumblob" : "mediumtext";
+    return MADB_FIELD_IS_BINARY(Field) ? "mediumblob" : "mediumtext";
   case MYSQL_TYPE_LONG_BLOB:
-    return (Field.flags & BINARY_FLAG) ? "longblob" : "longtext";
+    return MADB_FIELD_IS_BINARY(Field) ? "longblob" : "longtext";
   case MYSQL_TYPE_BLOB:
-    return (Field.flags & BINARY_FLAG) ? "blob" : "text";
+    return MADB_FIELD_IS_BINARY(Field) ? "blob" : "text";
   case MYSQL_TYPE_STRING:
-    return (Field.flags & BINARY_FLAG) ? "binary" : "char";
+    return MADB_FIELD_IS_BINARY(Field) ? "binary" : "char";
   case MYSQL_TYPE_GEOMETRY:
     return "geometry";
   default:
@@ -467,8 +468,7 @@ size_t MADB_GetDataSize(MADB_DescRecord *Record, MYSQL_FIELD Field, CHARSET_INFO
     return Field.length;
   default:
     {
-      if (Field.flags & BINARY_FLAG || Field.charsetnr == BINARY_CHARSETNR
-        || charset == NULL || charset->char_maxlen < 2/*i.e.0||1*/)
+      if (MADB_FIELD_IS_BINARY(Field) || charset == NULL || charset->char_maxlen < 2/*i.e.0||1*/)
       {
         return Field.length;
       }
@@ -526,7 +526,7 @@ size_t MADB_GetDisplaySize(MYSQL_FIELD Field, CHARSET_INFO *charset)
   case MYSQL_TYPE_VARCHAR:
   case MYSQL_TYPE_VAR_STRING:
   {
-    if (Field.flags & BINARY_FLAG || Field.charsetnr == BINARY_CHARSETNR)
+    if (MADB_FIELD_IS_BINARY(Field))
     {
       return Field.length*2; /* ODBC specs says we should give 2 characters per byte to display binaray data in hex form */
     }
@@ -688,13 +688,13 @@ SQLSMALLINT MADB_GetODBCType(MYSQL_FIELD *field)
     case MYSQL_TYPE_BLOB:
     case MYSQL_TYPE_MEDIUM_BLOB:
     case MYSQL_TYPE_LONG_BLOB:
-      return field->flags & BINARY_FLAG ? SQL_LONGVARBINARY : SQL_LONGVARCHAR;
+      return MADB_FIELD_IS_BINARY(*field) ? SQL_LONGVARBINARY : SQL_LONGVARCHAR;
     case MYSQL_TYPE_LONGLONG:
       return SQL_BIGINT;
-     case MYSQL_TYPE_STRING:
-      return field->flags & BINARY_FLAG ? SQL_BINARY : SQL_CHAR;
+    case MYSQL_TYPE_STRING:
+      return MADB_FIELD_IS_BINARY(*field) ? SQL_BINARY : SQL_CHAR;
     case MYSQL_TYPE_VAR_STRING:
-      return field->flags & BINARY_FLAG ? SQL_VARBINARY : SQL_VARCHAR;
+      return MADB_FIELD_IS_BINARY(*field) ? SQL_VARBINARY : SQL_VARCHAR;
     case MYSQL_TYPE_SET:
     case MYSQL_TYPE_ENUM:
       return SQL_CHAR;

test/info.c

@@ -584,7 +584,7 @@ MA_ODBC_TESTS my_tests[]=
   { t_bug30626, "t_bug30626", NORMAL },
   { t_bug43855, "t_bug43855", NORMAL },
   { t_bug46910, "t_bug46910", NORMAL },
-  { t_bug11749093, "t_bug11749093", TO_FIX },
+  { t_bug11749093, "t_bug11749093", NORMAL },
   { bug_odbc15, "odbc15", NORMAL },
   { test_need_long_data_len, "test_need_long_data_len", NORMAL },
   { t_odbc61, "odbc61_SQL_FILE_USAGE", NORMAL },

test/result2.c

@@ -1104,6 +1104,28 @@ ODBC_TEST(t_odbc78)
 }
 
 
+ODBC_TEST(t_odbc73)
+{
+  SQLSMALLINT data_type;
+
+  OK_SIMPLE_STMT(Stmt, "DROP table if exists t_odbc73");
+
+  OK_SIMPLE_STMT(Stmt, "CREATE TABLE t_odbc73 (binvc VARCHAR(64) COLLATE utf8_bin)");
+
+  OK_SIMPLE_STMT(Stmt, "SELECT binvc FROM t_odbc73");
+
+  CHECK_STMT_RC(Stmt, SQLDescribeCol(Stmt, 1, NULL, 0, NULL, &data_type, NULL, NULL, NULL));
+
+  FAIL_IF(data_type == SQL_VARBINARY || data_type == SQL_BINARY || data_type == SQL_LONGVARBINARY,
+          "The field shouldn't be described as binary");
+
+  CHECK_STMT_RC(Stmt, SQLFreeStmt(Stmt, SQL_CLOSE));
+
+  OK_SIMPLE_STMT(Stmt, "DROP table if exists t_odbc73");
+
+  return OK;
+}
+
 MA_ODBC_TESTS my_tests[]=
 {
   {t_bug32420, "t_bug32420"},
@@ -1127,6 +1149,7 @@ MA_ODBC_TESTS my_tests[]=
   {t_odbc58, "t_odbc-58-numeric_after_blob"},
   {t_odbc77, "t_odbc-77-analyze_table"},
   {t_odbc78, "t_odbc-78-sql_no_data"},
+  {t_odbc73, "t_odbc-73-bin_collation"},
   {NULL, NULL}
 };