diff options
author | Lionel Elie Mamane <lionel@mamane.lu> | 2012-12-11 11:04:22 +0100 |
---|---|---|
committer | Lionel Elie Mamane <lionel@mamane.lu> | 2012-12-11 11:08:53 +0100 |
commit | c9a40d21fa4f657ae52d2765d284d12ccbe51c4f (patch) | |
tree | 1aa613c98c6ccb96ad30cd6af7a8c2919d382bae /connectivity/inc | |
parent | fix include guard (diff) | |
download | core-c9a40d21fa4f657ae52d2765d284d12ccbe51c4f.tar.gz core-c9a40d21fa4f657ae52d2765d284d12ccbe51c4f.zip |
When parsing does not give a table name, take it from the column
Change-Id: Ie8a2c7e473d717cc22c51205dd8cdc59934de8b1
Diffstat (limited to 'connectivity/inc')
-rw-r--r-- | connectivity/inc/connectivity/sqliterator.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/connectivity/inc/connectivity/sqliterator.hxx b/connectivity/inc/connectivity/sqliterator.hxx index 82f850501ca0..5da60c28c90a 100644 --- a/connectivity/inc/connectivity/sqliterator.hxx +++ b/connectivity/inc/connectivity/sqliterator.hxx @@ -69,7 +69,7 @@ namespace connectivity ::std::auto_ptr< OSQLParseTreeIteratorImpl > m_pImpl; - void traverseParameter(const OSQLParseNode* _pParseNode,const OSQLParseNode* _pColumnRef,const ::rtl::OUString& _aColumnName,const ::rtl::OUString& _aTableRange, const ::rtl::OUString& _rColumnAlias); + void traverseParameter(const OSQLParseNode* _pParseNode,const OSQLParseNode* _pColumnRef,const ::rtl::OUString& _aColumnName, ::rtl::OUString& _aTableRange, const ::rtl::OUString& _rColumnAlias); // inserts a table into the map void traverseOneTableName( OSQLTables& _rTables,const OSQLParseNode * pTableName, const ::rtl::OUString & rTableRange ); void traverseORCriteria(OSQLParseNode * pSearchCondition); @@ -92,25 +92,25 @@ namespace connectivity @param rColumnName the column name to look for @param rTableRange - the table alias name + the table alias name; if empty, look in all tables @return the desired column object, or <NULL/> if no such column could be found */ static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > findColumn( - const OSQLTables& _rTables, const ::rtl::OUString & rColumnName, const ::rtl::OUString & rTableRange ); + const OSQLTables& _rTables, const ::rtl::OUString & rColumnName, ::rtl::OUString & rTableRange ); /** finds a column with a given name, belonging to a given table @param rColumnName the column name to look for @param rTableRange - the table alias name + the table alias name; if empty, look in all tables @param _bLookInSubTables <TRUE/> if and only if not only our direct tables, but also our sub tables (from sub selects) should be searched @return */ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > findColumn( - const ::rtl::OUString & rColumnName, const ::rtl::OUString & rTableRange, bool _bLookInSubTables ); + const ::rtl::OUString & rColumnName, ::rtl::OUString & rTableRange, bool _bLookInSubTables ); protected: void setSelectColumnName(::rtl::Reference<OSQLColumns>& _rColumns,const ::rtl::OUString & rColumnName,const ::rtl::OUString & rColumnAlias, const ::rtl::OUString & rTableRange,sal_Bool bFkt=sal_False,sal_Int32 _nType = com::sun::star::sdbc::DataType::VARCHAR,sal_Bool bAggFkt=sal_False); @@ -320,8 +320,8 @@ namespace connectivity */ void impl_getQueryParameterColumns( const OSQLTable& _rQuery ); - void setOrderByColumnName(const ::rtl::OUString & rColumnName, const ::rtl::OUString & rTableRange, sal_Bool bAscending); - void setGroupByColumnName(const ::rtl::OUString & rColumnName, const ::rtl::OUString & rTableRange); + void setOrderByColumnName(const ::rtl::OUString & rColumnName, ::rtl::OUString & rTableRange, sal_Bool bAscending); + void setGroupByColumnName(const ::rtl::OUString & rColumnName, ::rtl::OUString & rTableRange); private: /** appends an SQLException corresponding to the given error code to our error collection |