diff options
| author | Ocke Janssen [oj] <Ocke.Janssen@oracle.com> | 2011-01-10 14:23:31 +0100 |
|---|---|---|
| committer | Ocke Janssen [oj] <Ocke.Janssen@oracle.com> | 2011-01-10 14:23:31 +0100 |
| commit | 1fb18041e274a49222b37bdf34a1659890c29264 (patch) | |
| tree | 6768c7b40e7d835ee36952e7f8136adfbf93739a /connectivity/source/parse | |
| parent | dba34c: merge (diff) | |
| parent | dba34c: #i108415# handle structed filter handling (diff) | |
| download | core-1fb18041e274a49222b37bdf34a1659890c29264.tar.gz core-1fb18041e274a49222b37bdf34a1659890c29264.zip | |
Automated merge with ssh://hg.services.openoffice.org/cws/dba34c
Diffstat (limited to 'connectivity/source/parse')
| -rw-r--r-- | connectivity/source/parse/PColumn.cxx | 16 | ||||
| -rw-r--r-- | connectivity/source/parse/sqlbison.y | 9 |
2 files changed, 16 insertions, 9 deletions
diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx index 10f4b5b4bdcf..8f3014908b10 100644 --- a/connectivity/source/parse/PColumn.cxx +++ b/connectivity/source/parse/PColumn.cxx @@ -155,13 +155,15 @@ OParseColumn* OParseColumn::createColumnForResultSet( const Reference< XResultSe _rxResMetaData->isCurrency( _nColumnPos ), _rxDBMetaData->supportsMixedCaseQuotedIdentifiers() ); - pColumn->setTableName( ::dbtools::composeTableName( _rxDBMetaData, - _rxResMetaData->getCatalogName( _nColumnPos ), - _rxResMetaData->getSchemaName( _nColumnPos ), - _rxResMetaData->getTableName( _nColumnPos ), - sal_False, - eComplete - ) ); + const ::rtl::OUString sTableName = _rxResMetaData->getTableName( _nColumnPos ); + if ( sTableName.getLength() ) + pColumn->setTableName( ::dbtools::composeTableName( _rxDBMetaData, + _rxResMetaData->getCatalogName( _nColumnPos ), + _rxResMetaData->getSchemaName( _nColumnPos ), + sTableName, + sal_False, + eComplete + ) ); pColumn->setIsSearchable( _rxResMetaData->isSearchable( _nColumnPos ) ); pColumn->setRealName(_rxResMetaData->getColumnName( _nColumnPos )); pColumn->setLabel(sLabel); diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y index bfea82a25c7c..ad271e855e20 100644 --- a/connectivity/source/parse/sqlbison.y +++ b/connectivity/source/parse/sqlbison.y @@ -2447,11 +2447,16 @@ odbc_fct_spec: $$->append($1); $$->append($2); } + | SQL_TOKEN_FN set_fct_spec + { + $$ = SQL_NEW_RULE; + $$->append($1); + $$->append($2); + } ; odbc_fct_type: - SQL_TOKEN_FN - | SQL_TOKEN_D + SQL_TOKEN_D | SQL_TOKEN_T | SQL_TOKEN_TS ; |