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