mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce verbosity of getTables. (firebird-sdbc)

Browse Source 
Change-Id: Ief8d962d39b27acfb19adaee5e470417ee98b371
This commit is contained in:
Andrzej J.R. Hunt
2013-08-10 12:58:32 +01:00
parent d12ddee812
commit e6ae90b072
1 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
connectivity/source/drivers/firebird/DatabaseMetaData.cxx
View File

@@ -1378,58 +1378,63 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
uno::Reference< XResultSet > rs = statement->executeQuery(query.getStr()); uno::Reference< XResultSet > rs = statement->executeQuery(query.getStr());
uno::Reference< XRow > xRow( rs, UNO_QUERY_THROW ); uno::Reference< XRow > xRow( rs, UNO_QUERY_THROW );
ODatabaseMetaDataResultSet::ORows aRows; ODatabaseMetaDataResultSet::ORows aResults;
ODatabaseMetaDataResultSet::ORow aCurrentRow(6);
aCurrentRow[0] = new ORowSetValueDecorator(); // 0. Unused
aCurrentRow[1] = new ORowSetValueDecorator(); // 1. Table_Cat Unsupported
aCurrentRow[2] = new ORowSetValueDecorator(); // 2. Table_Schem Unsupported
while( rs->next() ) while( rs->next() )
{ {
ODatabaseMetaDataResultSet::ORow aCurrentRow(3); // 3. TABLE_NAME
OUString sTableName = xRow->getString(1);
sanitizeIdentifier(sTableName);
sal_Int16 systemFlag = xRow->getShort(2);
sal_Int16 tableType = xRow->getShort(3);
uno::Reference< XBlob > xBlob = xRow->getBlob(4);
OUString aDescription;
if (xBlob.is())
{ {
sal_Int32 aBlobLength = (sal_Int32) xBlob->length(); OUString sTableName = xRow->getString(1);
aDescription = OUString((char*) xBlob->getBytes(0, aBlobLength).getArray(), sanitizeIdentifier(sTableName);
aBlobLength, aCurrentRow[3] = new ORowSetValueDecorator(sTableName);
RTL_TEXTENCODING_UTF8);
} }
// 4. TABLE_TYPE
OUString aTableType;
if( 1 == systemFlag )
{ {
aTableType = OUString::createFromAscii("SYSTEM TABLE"); sal_Int16 nSystemFlag = xRow->getShort(2);
sal_Int16 nTableType = xRow->getShort(3);
OUString sTableType;
} if (nSystemFlag == 1)
else
{
if( 0 == tableType )
{ {
aTableType = OUString::createFromAscii("TABLE"); sTableType = "SYSTEM TABLE";
} }
else else
{ {
aTableType = OUString::createFromAscii("VIEW"); if (nTableType == 0)
sTableType = "TABLE";
else
sTableType = "VIEW";
} }
aCurrentRow[4] = new ORowSetValueDecorator(sTableType);
}
// 5. REMARKS
{
uno::Reference< XBlob > xBlob = xRow->getBlob(4);
OUString sDescription;
if (xBlob.is())
{
// TODO: we should actually be using CLOB here instead.
// However we haven't implemented CLOB yet, so use BLOB.
sal_Int32 aBlobLength = (sal_Int32) xBlob->length();
sDescription = OUString((char*) xBlob->getBytes(0, aBlobLength).getArray(),
aBlobLength,
RTL_TEXTENCODING_UTF8);
}
aCurrentRow[5] = new ORowSetValueDecorator(sDescription);
} }
// TABLE_CAT (catalog) may be null -- thus we omit it. aResults.push_back(aCurrentRow);
// TABLE_SCHEM (schema) may be null -- thus we omit it.
// TABLE_NAME
aCurrentRow.push_back(new ORowSetValueDecorator(sTableName));
// TABLE_TYPE
aCurrentRow.push_back(new ORowSetValueDecorator(aTableType));
// REMARKS
aCurrentRow.push_back(new ORowSetValueDecorator(aDescription));
aRows.push_back(aCurrentRow);
} }
pResultSet->setRows( aRows ); pResultSet->setRows( aResults );
return xResultSet; return xResultSet;
} }