[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - connectivity/source

[Lionel Elie Mamane]

 connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit cb859a727dd796f5c9d47deb860df8b25b17fe97
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Thu Jul 25 15:32:09 2013 +0200

    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
    Reviewed-on: https://gerrit.libreoffice.org/5100
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
index 8a8845f..15bbc5c 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;
             }
         }
     }