Changeset: a43b2d1aca27 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a43b2d1aca27
Modified Files:
clients/odbc/tests/ODBCmetadata.c
Branch: default
Log Message:
Improve returned SQL data type names.
diffs (63 lines):
diff --git a/clients/odbc/tests/ODBCmetadata.c
b/clients/odbc/tests/ODBCmetadata.c
--- a/clients/odbc/tests/ODBCmetadata.c
+++ b/clients/odbc/tests/ODBCmetadata.c
@@ -97,7 +97,7 @@ nameofSQLtype(SQLSMALLINT dataType)
switch (dataType) {
case SQL_CHAR: return "CHAR";
case SQL_VARCHAR: return "VARCHAR";
- case SQL_LONGVARCHAR: return "LONGVARCHAR";
+ case SQL_LONGVARCHAR: return "LONG VARCHAR";
case SQL_WCHAR: return "WCHAR";
case SQL_WVARCHAR: return "WVARCHAR";
case SQL_WLONGVARCHAR: return "WLONGVARCHAR";
@@ -108,31 +108,31 @@ nameofSQLtype(SQLSMALLINT dataType)
case SQL_REAL: return "REAL";
case SQL_FLOAT: return "FLOAT";
case SQL_DOUBLE: return "DOUBLE";
- case SQL_BIT: return "BIT";
+ case SQL_BIT: return "BOOLEAN"; /* MonetDB boolean type
is mapped to SQL_BIT in ODBC (see msql_types[] in SQLExecute.c) */
case SQL_TINYINT: return "TINYINT";
case SQL_BIGINT: return "BIGINT";
case SQL_BINARY: return "BINARY";
case SQL_VARBINARY: return "VARBINARY";
- case SQL_LONGVARBINARY: return "LONGVARBINARY";
+ case SQL_LONGVARBINARY: return "LONG VARBINARY";
case SQL_DATETIME: return "DATETIME";
- case SQL_TYPE_DATE: return "TYPE_DATE";
- case SQL_TYPE_TIME: return "TYPE_TIME";
- case SQL_TYPE_TIMESTAMP: return "TYPE_TIMESTAMP";
- case SQL_INTERVAL_MONTH: return "INTERVAL_MONTH";
- case SQL_INTERVAL_YEAR: return "INTERVAL_YEAR";
- case SQL_INTERVAL_YEAR_TO_MONTH: return "SQL_INTERVAL_YEAR_TO_MONTH";
- case SQL_INTERVAL_DAY: return "INTERVAL_DAY";
- case SQL_INTERVAL_HOUR: return "INTERVAL_HOUR";
- case SQL_INTERVAL_MINUTE: return "INTERVAL_MINUTE";
- case SQL_INTERVAL_SECOND: return "INTERVAL_SECOND";
- case SQL_INTERVAL_DAY_TO_HOUR: return "INTERVAL_DAY_TO_HOUR";
- case SQL_INTERVAL_DAY_TO_MINUTE: return "INTERVAL_DAY_TO_MINUTE";
- case SQL_INTERVAL_DAY_TO_SECOND: return "INTERVAL_DAY_TO_SECOND";
- case SQL_INTERVAL_HOUR_TO_MINUTE: return
"INTERVAL_HOUR_TO_MINUTE";
- case SQL_INTERVAL_HOUR_TO_SECOND: return
"INTERVAL_HOUR_TO_SECOND";
- case SQL_INTERVAL_MINUTE_TO_SECOND: return
"INTERVAL_MINUTE_TO_SECOND";
+ case SQL_TYPE_DATE: return "DATE";
+ case SQL_TYPE_TIME: return "TIME";
+ case SQL_TYPE_TIMESTAMP: return "TIMESTAMP";
+ case SQL_INTERVAL_MONTH: return "INTERVAL MONTH";
+ case SQL_INTERVAL_YEAR: return "INTERVAL YEAR";
+ case SQL_INTERVAL_YEAR_TO_MONTH: return "INTERVAL YEAR TO MONTH";
+ case SQL_INTERVAL_DAY: return "INTERVAL DAY";
+ case SQL_INTERVAL_HOUR: return "INTERVAL HOUR";
+ case SQL_INTERVAL_MINUTE: return "INTERVAL MINUTE";
+ case SQL_INTERVAL_SECOND: return "INTERVAL SECOND";
+ case SQL_INTERVAL_DAY_TO_HOUR: return "INTERVAL DAY TO HOUR";
+ case SQL_INTERVAL_DAY_TO_MINUTE: return "INTERVAL DAY TO MINUTE";
+ case SQL_INTERVAL_DAY_TO_SECOND: return "INTERVAL DAY TO SECOND";
+ case SQL_INTERVAL_HOUR_TO_MINUTE: return "INTERVAL HOUR TO
MINUTE";
+ case SQL_INTERVAL_HOUR_TO_SECOND: return "INTERVAL HOUR TO
SECOND";
+ case SQL_INTERVAL_MINUTE_TO_SECOND: return "INTERVAL MINUTE TO
SECOND";
case SQL_GUID: return "GUID";
- default: return "UNDEFINED";
+ default: return "Undefined";
}
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
