summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2013-07-25 15:32:09 +0200
committerLionel Elie Mamane <lionel@mamane.lu>2013-07-25 15:35:29 +0200
commitfc1b46e03f9b93a6b9ad6f9cc25bf8066715088f (patch)
tree6f46a3f0ce0321447e02c7da116fca83065a3968
parent129a0d8c6f5da9cd536971507d0a7df056acccc6 (diff)
fdo#67269 adapt checkTable to getTableName change
getTableName used to return schema.table; now it returns just table But tables are indexed by schema.table in getTables(), so reconstruct that for the lookup. Change-Id: I53da1e43762b3a470e34b5dfdb0e1bb3dc914780
-rw-r--r--connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
index 8a8845f07dea..15bbc5c6eb48 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
@@ -213,9 +213,10 @@ void ResultSetMetaData::checkTable()
}
if( tables.is() )
{
- OUString name = getTableName( 1 );
-// if( tables->hasByName( name ) )
- tables->getByName( name ) >>= m_table;
+ const OUString name (getTableName ( 1 ));
+ const OUString schema (getSchemaName( 1 ));
+ const OUString composedName( schema.isEmpty() ? name : (schema + "." + name) );
+ tables->getByName( composedName ) >>= m_table;
}
}
}