WIP odbc: Try to convert BCP data better

Author: freddy77

src/odbc/bcp.c

@@ -527,6 +527,8 @@ _tdsodbc_dbconvert(TDS_DBC *dbc, int srctype, const TDS_CHAR * src, SQLLEN src_l
 		break;
 	case SYBCHAR:
 	case SYBVARCHAR:
+	case XSYBCHAR:
+	case XSYBVARCHAR:
 	case SYBTEXT:
 		ret = (TDS_INT) _bcp_iconv_helper(dbc, bindcol, dres.c, len, (char *) dest, destlen);
 		free(dres.c);
@@ -605,7 +607,7 @@ _bcp_get_col_data(TDSBCPINFO *bcpinfo, TDSCOLUMN *bindcol, int offset TDS_UNUSED
 			col_len = bindcol->column_bindlen;
 	}
 
-	desttype = tds_get_conversion_type(bindcol->column_type, bindcol->column_size);
+	desttype = tds_get_conversion_type(bindcol->on_server.column_type, bindcol->on_server.column_size);
 
 	/* Fixed Length data - this overrides anything else specified */
 	coltype = bindcol->column_bindtype == 0 ? desttype : (TDS_SERVER_TYPE) bindcol->column_bindtype;