From c8a237e87e909bb9fc8105fcad01317901f08c45 Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane Date: Sat, 14 Dec 2013 06:00:18 +0100 Subject: [PATCH 066/109] odbc DBMetaData: NULL pattern equivalent to "%", not "%foo" Change-Id: Ief475a1bf6e65b4786e8ee9c025b204f143a30e0 Reviewed-on: https://gerrit.libreoffice.org/7080 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna --- .../drivers/odbcbase/ODatabaseMetaDataResultSet.cxx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx index fbb1b59..7b524cc 100644 --- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx @@ -849,7 +849,7 @@ void ODatabaseMetaDataResultSet::openTables(const Any& catalog, const OUString& OString aPKQ,aPKO,aPKN,aCOL; const OUString *pSchemaPat = NULL; - if(schemaPattern.toChar() != '%') + if(schemaPattern != "%") pSchemaPat = &schemaPattern; else pSchemaPat = NULL; @@ -946,7 +946,7 @@ void ODatabaseMetaDataResultSet::openColumnPrivileges( const Any& catalog, cons { const OUString *pSchemaPat = NULL; - if(schema.toChar() != '%') + if(schema != "%") pSchemaPat = &schema; else pSchemaPat = NULL; @@ -981,7 +981,7 @@ void ODatabaseMetaDataResultSet::openColumns( const Any& catalog, { const OUString *pSchemaPat = NULL; - if(schemaPattern.toChar() != '%') + if(schemaPattern != "%") pSchemaPat = &schemaPattern; else pSchemaPat = NULL; @@ -1049,7 +1049,7 @@ void ODatabaseMetaDataResultSet::openProcedureColumns( const Any& catalog, { const OUString *pSchemaPat = NULL; - if(schemaPattern.toChar() != '%') + if(schemaPattern != "%") pSchemaPat = &schemaPattern; else pSchemaPat = NULL; @@ -1083,7 +1083,7 @@ void ODatabaseMetaDataResultSet::openProcedures(const Any& catalog, const OUStri { const OUString *pSchemaPat = NULL; - if(schemaPattern.toChar() != '%') + if(schemaPattern != "%") pSchemaPat = &schemaPattern; else pSchemaPat = NULL; @@ -1127,7 +1127,7 @@ void ODatabaseMetaDataResultSet::openSpecialColumns(sal_Bool _bRowVer,const Any& const OUString *pSchemaPat = NULL; - if(schema.toChar() != '%') + if(schema != "%") pSchemaPat = &schema; else pSchemaPat = NULL; @@ -1214,7 +1214,7 @@ void ODatabaseMetaDataResultSet::openPrimaryKeys(const Any& catalog, const OUStr { const OUString *pSchemaPat = NULL; - if(schema.toChar() != '%') + if(schema != "%") pSchemaPat = &schema; else pSchemaPat = NULL; @@ -1243,7 +1243,7 @@ void ODatabaseMetaDataResultSet::openTablePrivileges(const Any& catalog, const O { const OUString *pSchemaPat = NULL; - if(schemaPattern.toChar() != '%') + if(schemaPattern != "%") pSchemaPat = &schemaPattern; else pSchemaPat = NULL; @@ -1273,7 +1273,7 @@ void ODatabaseMetaDataResultSet::openIndexInfo( const Any& catalog, const OUStri { const OUString *pSchemaPat = NULL; - if(schema.toChar() != '%') + if(schema != "%") pSchemaPat = &schema; else pSchemaPat = NULL; -- 1.8.4.2