Kaydet (Commit) 79eae295 authored tarafından Andrzej J.R. Hunt's avatar Andrzej J.R. Hunt

Comment out unused parameters instead of (void) cast. (firebird-sdbc)

Firebird doesn't support catalogs or schemas hence these parameters
are unused in the various get[...] methods. Previously these were (void)
casted however commenting out the parameters seems more correct and reduces
the amount of code.

(This was omitted for as-of-yet unimplemented methods since they will still
 be looked at in detail.)

Change-Id: Ic6566ff0b3e873b802deec79d5497efdd21e577d
üst cf9a6e84
...@@ -1031,15 +1031,12 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo() ...@@ -1031,15 +1031,12 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
} }
uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
const Any& aCatalog, const Any& /*aCatalog*/,
const OUString& sSchema, const OUString& /*sSchema*/,
const OUString& sTable, const OUString& sTable,
const OUString& sColumnNamePattern) const OUString& sColumnNamePattern)
throw(SQLException, RuntimeException) throw(SQLException, RuntimeException)
{ {
(void) aCatalog;
(void) sSchema;
SAL_INFO("connectivity.firebird", "getColumnPrivileges() with " SAL_INFO("connectivity.firebird", "getColumnPrivileges() with "
"Table: " << sTable "Table: " << sTable
<< " & ColumnNamePattern: " << sColumnNamePattern); << " & ColumnNamePattern: " << sColumnNamePattern);
...@@ -1109,14 +1106,12 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( ...@@ -1109,14 +1106,12 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
} }
uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
const Any& catalog, const Any& /*catalog*/,
const OUString& schemaPattern, const OUString& /*schemaPattern*/,
const OUString& tableNamePattern, const OUString& tableNamePattern,
const OUString& columnNamePattern) const OUString& columnNamePattern)
throw(SQLException, RuntimeException) throw(SQLException, RuntimeException)
{ {
(void) catalog; // Unsupported in firebird
(void) schemaPattern; // Unsupported in firebird
SAL_INFO("connectivity.firebird", "getColumns() with " SAL_INFO("connectivity.firebird", "getColumns() with "
"TableNamePattern: " << tableNamePattern << "TableNamePattern: " << tableNamePattern <<
" & ColumnNamePattern: " << columnNamePattern); " & ColumnNamePattern: " << columnNamePattern);
...@@ -1298,15 +1293,12 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( ...@@ -1298,15 +1293,12 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
} }
uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
const Any& catalog, const Any& /*catalog*/,
const OUString& schemaPattern, const OUString& /*schemaPattern*/,
const OUString& tableNamePattern, const OUString& tableNamePattern,
const Sequence< OUString >& types) const Sequence< OUString >& types)
throw(SQLException, RuntimeException) throw(SQLException, RuntimeException)
{ {
(void) catalog;
(void) schemaPattern;
SAL_INFO("connectivity.firebird", "getTables() with " SAL_INFO("connectivity.firebird", "getTables() with "
"TableNamePattern: " << tableNamePattern); "TableNamePattern: " << tableNamePattern);
...@@ -1488,13 +1480,11 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( ...@@ -1488,13 +1480,11 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
} }
uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
const Any& aCatalog, const Any& /*aCatalog*/,
const OUString& sSchema, const OUString& /*sSchema*/,
const OUString& sTable) const OUString& sTable)
throw(SQLException, RuntimeException) throw(SQLException, RuntimeException)
{ {
(void) aCatalog;
(void) sSchema;
SAL_INFO("connectivity.firebird", "getPrimaryKeys() with " SAL_INFO("connectivity.firebird", "getPrimaryKeys() with "
"Table: " << sTable); "Table: " << sTable);
...@@ -1551,17 +1541,16 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( ...@@ -1551,17 +1541,16 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
} }
uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
const Any& aCatalog, const OUString& sSchema, const OUString& sTable, const Any& /*aCatalog*/,
sal_Bool bIsUnique, sal_Bool bIsApproximate) const OUString& /*sSchema*/,
const OUString& sTable,
sal_Bool bIsUnique,
sal_Bool bIsApproximate)
throw(SQLException, RuntimeException) throw(SQLException, RuntimeException)
{ {
(void) aCatalog;
(void) sSchema;
// Apparently this method can also return a "tableIndexStatistic" // Apparently this method can also return a "tableIndexStatistic"
// However this is only mentioned in XDatabaseMetaData.idl (whose comments // However this is only mentioned in XDatabaseMetaData.idl (whose comments
// are duplicated in the postgresql driver), and is otherwise undocumented. // are duplicated in the postgresql driver), and is otherwise undocumented.
SAL_INFO("connectivity.firebird", "getPrimaryKeys() with " SAL_INFO("connectivity.firebird", "getPrimaryKeys() with "
"Table: " << sTable); "Table: " << sTable);
...@@ -1658,14 +1647,11 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier( ...@@ -1658,14 +1647,11 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
} }
uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
const Any& aCatalog, const Any& /*aCatalog*/,
const OUString& sSchemaPattern, const OUString& /*sSchemaPattern*/,
const OUString& sTableNamePattern) const OUString& sTableNamePattern)
throw(SQLException, RuntimeException) throw(SQLException, RuntimeException)
{ {
(void) aCatalog;
(void) sSchemaPattern;
SAL_INFO("connectivity.firebird", "getTablePrivileges() with " SAL_INFO("connectivity.firebird", "getTablePrivileges() with "
"TableNamePattern: " << sTableNamePattern); "TableNamePattern: " << sTableNamePattern);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment