Kaydet (Commit) fe294e92 authored tarafından Lionel Elie Mamane's avatar Lionel Elie Mamane

pgsql-sdbc: set tablename even if we do not know the schema

Change-Id: I74c04e1262cc413696a12aca9af603beded7b07f
üst b8361945
...@@ -648,7 +648,7 @@ bool executePostgresCommand( const OString & cmd, struct CommandData *data ) ...@@ -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 ); splitConcatenatedIdentifier( sourceTable, &schema, &table );
} }
......
...@@ -670,10 +670,20 @@ void splitConcatenatedIdentifier( const OUString & source, OUString *first, OUSt ...@@ -670,10 +670,20 @@ void splitConcatenatedIdentifier( const OUString & source, OUString *first, OUSt
{ {
OStringVector vec; OStringVector vec;
tokenizeSQL( OUStringToOString( source, RTL_TEXTENCODING_UTF8 ), 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 ); *second = OStringToOUString( vec[2], RTL_TEXTENCODING_UTF8 );
break;
default:
SAL_WARN("connectivity.postgresql",
"pq_tools::splitConcatenatedIdentifier unexpected number of tokens in identifier: "
<< vec.size());
} }
} }
......
...@@ -55,6 +55,7 @@ certain functionality. ...@@ -55,6 +55,7 @@ certain functionality.
@li @c connectivity.commontools @li @c connectivity.commontools
@li @c connectivity.mork @li @c connectivity.mork
@li @c connectivity.parse @li @c connectivity.parse
@li @c connectivity.postgresql
@section cui @section cui
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment