#6577 SQL Server: COLUMNPROPERTY is optional

plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerDataSource.java

@@ -131,7 +131,7 @@ public class SQLServerDataSource extends JDBCDataSource implements DBSObjectSele
 
             try {
                 JDBCUtils.queryString(session, "SELECT COLUMNPROPERTY(0, NULL, NULL)");
-                this.supportsColumnProperty = false;
+                this.supportsColumnProperty = true;
             } catch (Exception e) {
                 this.supportsColumnProperty = false;
             }

plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerSchema.java

@@ -336,7 +336,7 @@ public class SQLServerSchema implements DBSSchema, DBPSaveableObject, DBPQualifi
             StringBuilder sql = new StringBuilder();
             sql.append("SELECT c.*,t.name as table_name,t.schema_id");
             if (owner.getDataSource().supportsColumnProperty()) {
-                sql.append(", COLUMNPROPERTY(c.object_id, c.name, 'charmaxlen') as char_max_length, ");
+                sql.append(", COLUMNPROPERTY(c.object_id, c.name, 'charmaxlen') as char_max_length");
             }
             sql.append(", dc.definition as default_definition,ep.value as description\nFROM ")
                 .append(SQLServerUtils.getSystemTableName(owner.getDatabase(), "all_columns")).append(" c")