[Libreoffice-commits] core.git: connectivity/source

[Stephan Bergmann]

 connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit bb6277394c03f0bbb2906a0e262127e8c7942495
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jun 27 17:10:20 2017 +0200

    In DatabaseMetaData::getIndexInfo, isPrimary has always been ignored
    
    ...ever since the code's introduction with
    e28033fdfad9750ebe96885b9514adee629acf88 "Apply sdbc-postgresql.diff"
    
    Change-Id: Ia0a1581c0284d96c73367ac6ea52fb0bab8e3c88
    Reviewed-on: https://gerrit.libreoffice.org/39310
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 554635ec0ed9..14d725fde1e0 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -2409,7 +2409,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getIndexInfo(
     static const sal_Int32 C_INDEXNAME = 3;
     static const sal_Int32 C_IS_CLUSTERED = 4;
     static const sal_Int32 C_IS_UNIQUE = 5;
-    static const sal_Int32 C_IS_PRIMARY = 6;
+    // C_IS_PRIMARY = 6
     static const sal_Int32 C_COLUMNS = 7;
 
     static const sal_Int32 R_TABLE_SCHEM = 1;
@@ -2454,8 +2454,6 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getIndexInfo(
         OUString currentTable = xRow->getString( C_TABLENAME );
         OUString currentIndexName = xRow->getString( C_INDEXNAME );
         bool isNonUnique = ! xRow->getBoolean( C_IS_UNIQUE );
-        bool isPrimary = xRow->getBoolean( C_IS_PRIMARY );
-        (void)isPrimary;
         sal_Int32 indexType =  xRow->getBoolean( C_IS_CLUSTERED ) ?
             css::sdbc::IndexType::CLUSTERED :
             css::sdbc::IndexType::HASHED;