fix col size for string columns

ClickHouse · Sep 13, 2017 · d3d9f65 · d3d9f65
1 parent 526c4a4
commit d3d9f65
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/driver/odbc.cpp b/driver/odbc.cpp
@@ -203,6 +203,7 @@ SQLColAttribute(HSTMT statement_handle, SQLUSMALLINT column_number, SQLUSMALLINT
                 num_value = statement.result.getNumColumns();
                 break;
             case SQL_DESC_DISPLAY_SIZE:
+                // TODO (artpaul) https://docs.microsoft.com/en-us/sql/odbc/reference/appendixes/display-size
                 num_value = column_info.display_size;
                 break;
             case SQL_DESC_FIXED_PREC_SCALE:
@@ -212,15 +213,15 @@ SQLColAttribute(HSTMT statement_handle, SQLUSMALLINT column_number, SQLUSMALLINT
                 str_value = column_info.name;
                 break;
             case SQL_DESC_LENGTH:
-                if (type_info.sql_type == SQL_VARCHAR)
+                if (type_info.IsStringType())
                 {
                     if (column_info.fixed_size)
                     {
                         num_value = column_info.fixed_size;
                     }
                     else
                     {
-                        num_value = type_info.octet_length;
+                        num_value = column_info.display_size;
                     }
                 }
                 break;
@@ -242,7 +243,7 @@ SQLColAttribute(HSTMT statement_handle, SQLUSMALLINT column_number, SQLUSMALLINT
                     if (column_info.fixed_size)
                         num_value = column_info.fixed_size * SIZEOF_CHAR;
                     else
-                        num_value = type_info.octet_length * SIZEOF_CHAR;
+                        num_value = column_info.display_size * SIZEOF_CHAR;
                 }
                 else
                 {