diff options
| -rw-r--r-- | connectivity/source/drivers/postgresql/pq_statement.cxx | 2 | ||||
| -rw-r--r-- | connectivity/source/drivers/postgresql/pq_tools.cxx | 14 | ||||
| -rw-r--r-- | sal/inc/sal/log-areas.dox | 1 |
3 files changed, 14 insertions, 3 deletions
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx index 6326da34ec2a..cfbbd9fc7a6a 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.cxx +++ b/connectivity/source/drivers/postgresql/pq_statement.cxx @@ -648,7 +648,7 @@ bool executePostgresCommand( const OString & cmd, struct CommandData *data ) } } - else if( sourceTable.getLength() && -1 != sourceTable.indexOf( '.' ) ) + else if( sourceTable.getLength() > 0) { splitConcatenatedIdentifier( sourceTable, &schema, &table ); } diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx index 5ac5626e99e6..ccce76f018c1 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.cxx +++ b/connectivity/source/drivers/postgresql/pq_tools.cxx @@ -670,10 +670,20 @@ void splitConcatenatedIdentifier( const OUString & source, OUString *first, OUSt { OStringVector vec; tokenizeSQL( OUStringToOString( source, RTL_TEXTENCODING_UTF8 ), vec ); - if( vec.size() == 3 ) + switch (vec.size()) { - *first = OStringToOUString( vec[0] , RTL_TEXTENCODING_UTF8 ); + case 1: + *first = OUString(); + *second = OStringToOUString( vec[0], RTL_TEXTENCODING_UTF8 ); + break; + case 3: + *first = OStringToOUString( vec[0], RTL_TEXTENCODING_UTF8 ); *second = OStringToOUString( vec[2], RTL_TEXTENCODING_UTF8 ); + break; + default: + SAL_WARN("connectivity.postgresql", + "pq_tools::splitConcatenatedIdentifier unexpected number of tokens in identifier: " + << vec.size()); } } diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox index 98adef8df3e1..d21f14388d96 100644 --- a/sal/inc/sal/log-areas.dox +++ b/sal/inc/sal/log-areas.dox @@ -55,6 +55,7 @@ certain functionality. @li @c connectivity.commontools @li @c connectivity.mork @li @c connectivity.parse +@li @c connectivity.postgresql @section cui |