[Firebird-odbc-devel] More little fixes

[Carlos G.A. <car...@ho...>]

Hello:

More little fixes:

Note: SQL

1. InfoItems.h

Change

	UITEM (SQL_CURSOR_SENSITIVITY, 0)
	UITEM (SQL_MAX_USER_NAME_LEN, 0)
	UITEM (SQL_MAX_COLUMNS_IN_TABLE, 0)
	UITEM (SQL_MAX_INDEX_SIZE, 0)
	UITEM (SQL_MAX_SCHEMA_NAME_LEN, 0)
	UITEM (SQL_MAX_CATALOG_NAME_LEN, 0)
	UITEM (SQL_MAX_ROW_SIZE, 0)
	UITEM (SQL_MAX_ROW_SIZE_INCLUDES_LONG, 0)
	UITEM (SQL_MAX_TABLES_IN_SELECT, 0)


The next definitions are changed because the driver crash when an 
application calls SQLGetInfo with it, all will return 0 in this moment, if 
any knows the correct values please say to me.

	UITEM (SQL_MAX_BINARY_LITERAL_LEN, 0)
	UITEM (SQL_MAX_CHAR_LITERAL_LEN, 0)
	UITEM (SQL_MAX_IDENTIFIER_LEN, 0)
	UITEM (SQL_MAX_COLUMNS_IN_GROUP_BY, 0)
	UITEM (SQL_MAX_COLUMNS_IN_ORDER_BY, 0)
	UITEM (SQL_MAX_COLUMNS_IN_INDEX, 0)
	UITEM (SQL_MAX_COLUMNS_IN_SELECT, 0)

for

	SITEM (SQL_CURSOR_SENSITIVITY, SQL_UNSPECIFIED)
	SITEM (SQL_MAX_USER_NAME_LEN, 0)
	NITEM (SQL_MAX_COLUMNS_IN_TABLE, 0)
	SITEM (SQL_MAX_INDEX_SIZE, 0)
	SITEM (SQL_MAX_SCHEMA_NAME_LEN, 0)
	SITEM (SQL_MAX_CATALOG_NAME_LEN, 0)
	NITEM (SQL_MAX_ROW_SIZE, 0)
	CITEM (SQL_MAX_ROW_SIZE_INCLUDES_LONG, 0)
	SITEM (SQL_MAX_TABLES_IN_SELECT, 0)

	NITEM (SQL_MAX_BINARY_LITERAL_LEN, 0)
	SITEM (SQL_MAX_CHAR_LITERAL_LEN, 0)
	SITEM (SQL_MAX_IDENTIFIER_LEN, 0)
	SITEM (SQL_MAX_COLUMNS_IN_GROUP_BY, 0)
	SITEM (SQL_MAX_COLUMNS_IN_ORDER_BY, 0)
	SITEM (SQL_MAX_COLUMNS_IN_INDEX, 0)
	SITEM (SQL_MAX_COLUMNS_IN_SELECT, 0)


2. OdbcConnection.cpp

Add to SQLGetInfo this:
	case SQL_MAX_USER_NAME_LEN:
	case SQL_MAX_OWNER_NAME_LEN:
		value = metaData->getMaxUserNameLength();
		break;

	case SQL_MAX_COLUMNS_IN_INDEX:
		value = metaData->getMaxColumnsInIndex();
		break;

	case SQL_MAX_COLUMNS_IN_TABLE:
		value = metaData->getMaxColumnsInTable();
		break;

	case SQL_MAX_INDEX_SIZE:
		value = metaData->getMaxIndexLength();
		break;

	case SQL_MAX_SCHEMA_NAME_LEN:
		value = metaData->getMaxSchemaNameLength();
		break;

	case SQL_MAX_CATALOG_NAME_LEN:
		value = metaData->getMaxCatalogNameLength();
		break;

	case SQL_MAX_ROW_SIZE:
		value = metaData->getMaxRowSize();
		break;

	case SQL_MAX_ROW_SIZE_INCLUDES_LONG:
		string = metaData->doesMaxRowSizeIncludeBlobs() ? "Y" : "N";
		break;

	case SQL_MAX_TABLES_IN_SELECT:
		value = metaData->getMaxTablesInSelect();
		break;

	case SQL_MAX_DRIVER_CONNECTIONS:
		value = metaData->getMaxConnections();
		break;

3. OdbcStatement.cpp

OdbcStatement::sqlColAttribute

Change

	case SQL_DESC_NAME:
		string = metaData->getColumnName (column);
		break;

for

	case SQL_DESC_BASE_COLUMN_NAME:
	case SQL_DESC_NAME:
		string = metaData->getColumnName (column);
		break;

Best Regards
Carlos Guzmán Álvarez
Vigo-España

_________________________________________________________________
MSN. Más Útil cada Día. http://www.msn.es/intmap/