diff --git a/info.c b/info.c
index 6c7eb350..d5adb8a4 100644
--- a/info.c
+++ b/info.c
@@ -2328,6 +2328,21 @@ add_tuple_for_oid_or_xmin(TupleField *tuple, int ordinal, const char *colname, O
 	set_tuplefield_int4(&tuple[COLUMNS_TABLE_INFO], table_info);
 }
 
+/*
+ * Set COLUMN_SIZE, BUFFER_LENGTH or CHAR_OCTET_LENGTH in a SQLColumns row.
+ * These are sizes, so SQL_NO_TOTAL (a length/indicator value) is not valid
+ * there, and applications such as MSDASQL bind them as SQL_C_ULONG, where a
+ * negative value fails with 22003.  -1 means the size does not apply to the
+ * type and becomes NULL; SQL_NO_TOTAL becomes the largest representable size.
+ */
+static void
+set_columns_size(TupleField *field, Int4 size)
+{
+	if (SQL_NO_TOTAL == size)
+		size = INT_MAX;
+	set_nullfield_int4(field, size);
+}
+
 RETCODE		SQL_API
 PGAPI_Columns(HSTMT hstmt,
 			  const SQLCHAR * szTableQualifier, /* OA X*/
@@ -2847,8 +2862,8 @@ MYLOG(0, " and the data=%s\n", attdef);
 				if (mod_length >= 4)
 					mod_length -= 4;
 		}
-		set_tuplefield_int4(&tuple[COLUMNS_PRECISION], PGTYPE_ATTR_COLUMN_SIZE(conn, field_type, mod_length));
-		set_tuplefield_int4(&tuple[COLUMNS_LENGTH], PGTYPE_ATTR_BUFFER_LENGTH(conn, field_type, mod_length));
+		set_columns_size(&tuple[COLUMNS_PRECISION], PGTYPE_ATTR_COLUMN_SIZE(conn, field_type, mod_length));
+		set_columns_size(&tuple[COLUMNS_LENGTH], PGTYPE_ATTR_BUFFER_LENGTH(conn, field_type, mod_length));
 		set_tuplefield_int4(&tuple[COLUMNS_DISPLAY_SIZE], PGTYPE_ATTR_DISPLAY_SIZE(conn, field_type, mod_length));
 		set_nullfield_int2(&tuple[COLUMNS_SCALE], PGTYPE_ATTR_DECIMAL_DIGITS(conn, field_type, mod_length));
 
@@ -2866,7 +2881,7 @@ MYLOG(0, " and the data=%s\n", attdef);
 			set_tuplefield_string(&tuple[COLUMNS_COLUMN_DEF], attdef);
 		set_tuplefield_int2(&tuple[COLUMNS_SQL_DATA_TYPE], concise_type);
 		set_nullfield_int2(&tuple[COLUMNS_SQL_DATETIME_SUB], pgtype_attr_to_datetime_sub(conn, field_type, mod_length));
-		set_tuplefield_int4(&tuple[COLUMNS_CHAR_OCTET_LENGTH], PGTYPE_ATTR_TRANSFER_OCTET_LENGTH(conn, field_type, mod_length));
+		set_columns_size(&tuple[COLUMNS_CHAR_OCTET_LENGTH], PGTYPE_ATTR_TRANSFER_OCTET_LENGTH(conn, field_type, mod_length));
 		set_tuplefield_int4(&tuple[COLUMNS_ORDINAL_POSITION], ordinal);
 		set_tuplefield_null(&tuple[COLUMNS_IS_NULLABLE]);
 		set_tuplefield_int4(&tuple[COLUMNS_FIELD_TYPE], field_type);
diff --git a/test/expected/columns-sizes.out b/test/expected/columns-sizes.out
new file mode 100644
index 00000000..efadd21c
--- /dev/null
+++ b/test/expected/columns-sizes.out
@@ -0,0 +1,6 @@
+connected
+i: COLUMN_SIZE=10 BUFFER_LENGTH=4 CHAR_OCTET_LENGTH=NULL
+v: COLUMN_SIZE=set BUFFER_LENGTH=set CHAR_OCTET_LENGTH=set
+b: COLUMN_SIZE=INT_MAX BUFFER_LENGTH=INT_MAX CHAR_OCTET_LENGTH=INT_MAX
+f: COLUMN_SIZE=set BUFFER_LENGTH=set CHAR_OCTET_LENGTH=NULL
+disconnecting
diff --git a/test/src/columns-sizes-test.c b/test/src/columns-sizes-test.c
new file mode 100644
index 00000000..dae62185
--- /dev/null
+++ b/test/src/columns-sizes-test.c
@@ -0,0 +1,89 @@
+/*
+ * Test that SQLColumns never returns a negative COLUMN_SIZE, BUFFER_LENGTH or
+ * CHAR_OCTET_LENGTH.  MSDASQL binds them as SQL_C_ULONG, where a negative
+ * value fails with 22003 (issue #228).  CHAR_OCTET_LENGTH is NULL for types
+ * that are not character or binary, and SQL_NO_TOTAL is reported as INT_MAX.
+ *
+ * The sizes of the character columns depend on the platform and the driver,
+ * so for those the test only shows whether a value was returned.
+ */
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "common.h"
+
+static void
+show_size(const char *label, SQLUINTEGER value, SQLLEN ind, int exact)
+{
+	if (SQL_NULL_DATA == ind)
+		printf(" %s=NULL", label);
+	else if (!exact)
+		printf(" %s=%s", label, value > 0 ? "set" : "zero");
+	else if (INT_MAX == value)
+		printf(" %s=INT_MAX", label);
+	else
+		printf(" %s=%lu", label, (unsigned long) value);
+}
+
+int main(int argc, char **argv)
+{
+	SQLRETURN	rc;
+	HSTMT		hstmt = SQL_NULL_HSTMT;
+	SQLCHAR		name[129];
+	SQLLEN		nameInd, sizeInd, lengthInd, octetInd;
+	SQLUINTEGER	size, length, octet;
+	int			exact;
+
+	/* boolean is reported as a character type with BoolsAsChar=1 */
+	test_connect_ext("BoolsAsChar=1");
+
+	rc = SQLAllocHandle(SQL_HANDLE_STMT, conn, &hstmt);
+	CHECK_CONN_RESULT(rc, "failed to allocate stmt handle", conn);
+
+	rc = SQLExecDirect(hstmt, (SQLCHAR *) "DROP TABLE IF EXISTS columns_sizes", SQL_NTS);
+	CHECK_STMT_RESULT(rc, "DROP TABLE failed", hstmt);
+	rc = SQLExecDirect(hstmt, (SQLCHAR *)
+		"CREATE TABLE columns_sizes "
+		"(i integer, v varchar(10), b bytea, f boolean)", SQL_NTS);
+	CHECK_STMT_RESULT(rc, "CREATE TABLE failed", hstmt);
+	SQLFreeStmt(hstmt, SQL_CLOSE);
+
+	rc = SQLColumns(hstmt, NULL, 0, NULL, 0,
+					(SQLCHAR *) "columns_sizes", SQL_NTS, NULL, 0);
+	CHECK_STMT_RESULT(rc, "SQLColumns failed", hstmt);
+
+	SQLBindCol(hstmt, 4, SQL_C_CHAR, name, sizeof(name), &nameInd);
+	SQLBindCol(hstmt, 7, SQL_C_ULONG, &size, 0, &sizeInd);
+	SQLBindCol(hstmt, 8, SQL_C_ULONG, &length, 0, &lengthInd);
+	SQLBindCol(hstmt, 16, SQL_C_ULONG, &octet, 0, &octetInd);
+
+	while ((rc = SQLFetch(hstmt)) != SQL_NO_DATA)
+	{
+		if (!SQL_SUCCEEDED(rc))
+		{
+			print_diag("SQLFetch failed", SQL_HANDLE_STMT, hstmt);
+			exit(1);
+		}
+		/* integer and bytea sizes are the same on every platform */
+		exact = (0 == strcmp((char *) name, "i") || 0 == strcmp((char *) name, "b"));
+		printf("%s:", name);
+		show_size("COLUMN_SIZE", size, sizeInd, exact);
+		show_size("BUFFER_LENGTH", length, lengthInd, exact);
+		show_size("CHAR_OCTET_LENGTH", octet, octetInd, exact);
+		printf("\n");
+	}
+
+	SQLFreeStmt(hstmt, SQL_CLOSE);
+	SQLFreeStmt(hstmt, SQL_UNBIND);
+	rc = SQLExecDirect(hstmt, (SQLCHAR *) "DROP TABLE columns_sizes", SQL_NTS);
+	CHECK_STMT_RESULT(rc, "DROP TABLE failed", hstmt);
+
+	rc = SQLFreeHandle(SQL_HANDLE_STMT, hstmt);
+	CHECK_STMT_RESULT(rc, "SQLFreeHandle failed", hstmt);
+
+	test_disconnect();
+
+	return 0;
+}
diff --git a/test/tests b/test/tests
index fd0fcdac..f89eb541 100644
--- a/test/tests
+++ b/test/tests
@@ -74,4 +74,5 @@ TESTBINS = exe/connect-test \
 	exe/dbms-version-test \
 	exe/surrogate-pair-test \
 	exe/many-params-test \
-	exe/keyset-overflow-test
+	exe/keyset-overflow-test \
+	exe/columns-sizes-test
