mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#84710# set realname for parameter too

Browse Source
This commit is contained in:
Ocke Janssen
2001-03-13 07:24:04 +00:00
parent c2eb60137a
commit 696baf8ea1
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
connectivity/source/parse/sqlbison.y
View File

@@ -1,7 +1,7 @@
%{ %{
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// //
// $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/connectivity/source/parse/sqlbison.y,v 1.19 2001-03-12 18:20:35 fs Exp $ // $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/connectivity/source/parse/sqlbison.y,v 1.20 2001-03-13 08:24:04 oj Exp $
// //
// Copyright 2000 Sun Microsystems, Inc. All Rights Reserved. // Copyright 2000 Sun Microsystems, Inc. All Rights Reserved.
// //
@@ -9,7 +9,7 @@
// OJ // OJ
// //
// Last change: // Last change:
// $Author: fs $ $Date: 2001-03-12 18:20:35 $ $Revision: 1.19 $ // $Author: oj $ $Date: 2001-03-13 08:24:04 $ $Revision: 1.20 $
// //
// Description: // Description:
// //
@@ -3723,7 +3723,7 @@ sal_Int16 OSQLParser::buildNode_STR_NUM(OSQLParseNode*& pAppend,OSQLParseNode*&
m_nFormatKey, rtl::OUString::createFromAscii("Decimals")); m_nFormatKey, rtl::OUString::createFromAscii("Decimals"));
aValue >>= nScale; aValue >>= nScale;
} }
catch ( ... ) catch( Exception& )
{ {
} }
@@ -3817,7 +3817,7 @@ sal_Int16 OSQLParser::buildLikeRule(OSQLParseNode*& pAppend, OSQLParseNode*& pLi
aValue >>= nType; aValue >>= nType;
} }
} }
catch ( ... ) catch( Exception& )
{ {
return nErg; return nErg;
} }
@@ -3851,7 +3851,7 @@ sal_Int16 OSQLParser::buildLikeRule(OSQLParseNode*& pAppend, OSQLParseNode*& pLi
m_nFormatKey, rtl::OUString::createFromAscii("Decimals")); m_nFormatKey, rtl::OUString::createFromAscii("Decimals"));
aValue >>= nScale; aValue >>= nScale;
} }
catch ( ... ) catch( Exception& )
{ {
} }
@@ -3931,7 +3931,7 @@ sal_Int16 OSQLParser::buildComparsionRule(OSQLParseNode*& pAppend,OSQLParseNode*
aValue >>= nType; aValue >>= nType;
} }
} }
catch ( ... ) catch( Exception& )
{ {
return nErg; return nErg;
} }
@@ -3972,7 +3972,7 @@ sal_Int16 OSQLParser::buildComparsionRule(OSQLParseNode*& pAppend,OSQLParseNode*
double fValue = m_xFormatter->convertStringToNumber(m_nFormatKey, pLiteral->getTokenValue().getStr()); double fValue = m_xFormatter->convertStringToNumber(m_nFormatKey, pLiteral->getTokenValue().getStr());
nErg = buildNode_Date(fValue, nType, pAppend,pLiteral,pCompare); nErg = buildNode_Date(fValue, nType, pAppend,pLiteral,pCompare);
} }
catch ( ... ) catch( Exception& )
{ {
try try
{ {
@@ -3992,7 +3992,7 @@ sal_Int16 OSQLParser::buildComparsionRule(OSQLParseNode*& pAppend,OSQLParseNode*
} }
} }
catch ( ... ) catch( Exception& )
{ {
nErg = -1; nErg = -1;
m_sErrorMessage = m_pContext->getErrorMessage(OParseContext::ERROR_INVALID_DATE_COMPARE); m_sErrorMessage = m_pContext->getErrorMessage(OParseContext::ERROR_INVALID_DATE_COMPARE);
@@ -4021,7 +4021,7 @@ sal_Int16 OSQLParser::buildComparsionRule(OSQLParseNode*& pAppend,OSQLParseNode*
double fValue = m_xFormatter->convertStringToNumber(m_nFormatKey, pLiteral->getTokenValue().getStr()); double fValue = m_xFormatter->convertStringToNumber(m_nFormatKey, pLiteral->getTokenValue().getStr());
nErg = buildNode_Date(fValue, nType, pAppend,pLiteral,pCompare); nErg = buildNode_Date(fValue, nType, pAppend,pLiteral,pCompare);
} }
catch ( ... ) catch( Exception& )
{ {
try try
{ {
@@ -4040,7 +4040,7 @@ sal_Int16 OSQLParser::buildComparsionRule(OSQLParseNode*& pAppend,OSQLParseNode*
m_sErrorMessage = m_pContext->getErrorMessage(OParseContext::ERROR_INVALID_DATE_COMPARE); m_sErrorMessage = m_pContext->getErrorMessage(OParseContext::ERROR_INVALID_DATE_COMPARE);
} }
} }
catch ( ... ) catch( Exception& )
{ {
nErg = -1; nErg = -1;
m_sErrorMessage = m_pContext->getErrorMessage(OParseContext::ERROR_INVALID_DATE_COMPARE); m_sErrorMessage = m_pContext->getErrorMessage(OParseContext::ERROR_INVALID_DATE_COMPARE);

6
connectivity/source/parse/sqliterator.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: sqliterator.cxx,v $ * $RCSfile: sqliterator.cxx,v $
* *
* $Revision: 1.15 $ * $Revision: 1.16 $
* *
* last change: $Author: oj $ $Date: 2001-03-01 11:02:19 $ * last change: $Author: oj $ $Date: 2001-03-13 08:24:04 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -1040,6 +1040,7 @@ void OSQLParseTreeIterator::traverseOnePredicate(
{ {
OParseColumn* pNewColumn = new OParseColumn(*aIter,m_aCaseEqual.isCaseSensitive()); OParseColumn* pNewColumn = new OParseColumn(*aIter,m_aCaseEqual.isCaseSensitive());
pNewColumn->setName(rValue); pNewColumn->setName(rValue);
pNewColumn->setRealName(rValue);
m_aParameters->push_back(pNewColumn); m_aParameters->push_back(pNewColumn);
} }
else // search in the tables for the right one else // search in the tables for the right one
@@ -1061,6 +1062,7 @@ void OSQLParseTreeIterator::traverseOnePredicate(
xColumns->getByName(aColumnName) >>= xColumn; xColumns->getByName(aColumnName) >>= xColumn;
OParseColumn* pNewColumn = new OParseColumn(xColumn,m_aCaseEqual.isCaseSensitive()); OParseColumn* pNewColumn = new OParseColumn(xColumn,m_aCaseEqual.isCaseSensitive());
pNewColumn->setName(rValue); pNewColumn->setName(rValue);
pNewColumn->setRealName(rValue);
m_aParameters->push_back(pNewColumn); m_aParameters->push_back(pNewColumn);
break; break;
} }

10
connectivity/source/parse/sqlnode.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: sqlnode.cxx,v $ * $RCSfile: sqlnode.cxx,v $
* *
* $Revision: 1.11 $ * $Revision: 1.12 $
* *
* last change: $Author: oj $ $Date: 2001-02-14 10:29:29 $ * last change: $Author: oj $ $Date: 2001-03-13 08:24:04 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -513,11 +513,9 @@ void OSQLParseNode::parseNodeToStr(::rtl::OUString& rString, const SQLParseNodeP
try try
{ {
// retrieve the fields name // retrieve the fields name
rtl::OUString aString; rParam.xField->getPropertyValue(::rtl::OUString::createFromAscii("Name")) >>= aFieldName;
rParam.xField->getPropertyValue(::rtl::OUString::createFromAscii("Name")) >>= aString;
aFieldName = aString.getStr();
} }
catch ( ... ) catch ( Exception& )
{ {
} }