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

CWS-TOOLING: integrate CWS evoab2def

Browse Source 
2009-05-28 16:00:19 +0200 fs  r272412 : don't use createFalse - Evo 2.22 simply hangs when ask for all contacts without a first name. Instead, in the WHERE 0=1 case, simply create an empty result set
2009-05-22 14:25:51 +0200 fs  r272193 : #i10000#
2009-05-22 14:25:37 +0200 fs  r272192 : oops, ENABLE_EVOAB2 for some platforms only, not generically
2009-05-22 14:19:00 +0200 fs  r272191 : #i10000#
2009-05-22 12:42:38 +0200 fs  r272183 : when sorting, properly use a syslocale collator, instead of comparing the numerical values of the string's UTF-16 code points
2009-05-20 15:09:00 +0200 fs  r272131 : clear/getWarnings: also allowed without cache
2009-05-20 14:11:19 +0200 fs  r272128 : removed debug traces
2009-05-20 14:03:31 +0200 fs  r272126 : #i55701# +STR_SORT_BY_COL_ONLY
2009-05-20 14:02:29 +0200 fs  r272125 : implement sorting
2009-05-20 10:10:19 +0200 fs  r272107 : #i10000#
2009-05-19 16:02:17 +0200 fs  r272089 : #i10000#
2009-05-19 16:02:02 +0200 fs  r272088 : #i55701# strings for new error condition DATA_CANNOT_SELECT_UNFILTERED
2009-05-19 16:01:31 +0200 fs  r272087 : #i55701# use DATA_CANNOT_SELECT_UNFILTERED as standardized error code
2009-05-19 15:59:59 +0200 fs  r272086 : #i55701# +DATA_CANNOT_SELECT_UNFILTERED
2009-05-19 15:46:12 +0200 fs  r272084 : #i55701# recognize the DATA_CANNOT_SELECT_UNFILTERED error condition, and allow filtering in this case, even when the result set is empty
2009-05-19 09:06:50 +0200 fs  r272059 : merging changes from CWS dba32b, to prevent future conflicts with upcoming local changes
2009-05-18 21:48:58 +0200 fs  r272054 : accessing a non-local unfiltered address book now returns an empty result set, and reports a warning, instead of ungracefully failing
2009-05-18 21:48:42 +0200 fs  r272053 : accessing a non-local unfiltered address book now returns an empty result set, and reports a warning, instead of ungracefully failing
2009-05-18 21:47:41 +0200 fs  r272052 : +setExternalWarnings
2009-05-18 21:47:12 +0200 fs  r272051 : #i55701# when re/loading the form, display any possible warnings
2009-05-18 21:43:26 +0200 fs  r272050 : #i55701# implement XWarningsSupplier, exposing the warnings of our result set
2009-05-18 21:42:51 +0200 fs  r272049 : #i55701# implement XWarningsSupplier, exposing the warnings of our aggregate RowSet
2009-05-18 17:53:59 +0200 fs  r272041 : #i55701# moved the (I)WarningsContainer from dbaccess to connectivity, to be able to use it in the latter module, too
2009-05-18 17:24:10 +0200 fs  r272040 : #i55701# properly enable the various Evolution types
2009-05-18 14:52:19 +0200 fs  r272024 : #i55701# properly enable the Evolution types
2009-05-18 13:57:10 +0200 fs  r272018 : fixed/extended whereAnalysis (column searching still not enabled, as neither LIKE nor = seem to work with my (somewhat older) Evolution version)
2009-05-18 13:56:08 +0200 fs  r272017 : extended showParseTree
2009-05-18 13:55:25 +0200 fs  r272016 : extended showParseTree
2009-05-18 11:40:16 +0200 fs  r272008 : #i55701#
2009-05-18 11:39:02 +0200 fs  r272006 : let the PreparedStatement return proper meta data, too
2009-05-18 10:05:37 +0200 fs  r271999 : moved the XStatement interface to from OCommonStatement to OStatement - the former class is also the base for other classes which should not have this interface
2009-05-15 21:53:22 +0200 fs  r271973 : collectColumnInformation: report invalid meta data as assertion
2009-05-15 21:51:40 +0200 fs  r271972 : showParseTree should be const
2009-05-15 21:51:26 +0200 fs  r271971 : showParseTree should be const
2009-05-15 21:51:03 +0200 fs  r271970 : properly recognize the 'WHERE 0 = 1' clause, this way having proper statement meta data, this way saving much much calls from the DBA framework
2009-05-15 20:29:03 +0200 fs  r271969 : cleaned up the mess with the statement classes
2009-05-15 15:51:11 +0200 fs  r271944 : let the result set properly init its meta data
2009-05-15 15:29:54 +0200 fs  r271939 : proper property implementations for the resultset class
2009-05-15 15:01:31 +0200 fs  r271936 : proper property implementations for the statement class
2009-05-08 14:46:33 +0200 fs  r271717 : component_foo must be PUBLIC
2009-05-06 09:20:05 +0200 fs  r271565 : #i10000# (warnings on unxlngi6)
2009-05-06 09:01:30 +0200 fs  r271564 : #i101493#
2009-05-05 23:08:12 +0200 fs  r271560 : #i55701# merging the changes from the ancient (CVS-based) CWS evoab2default into this CWS here
This commit is contained in:
Kurt Zenker
2009-06-05 12:31:05 +00:00
parent 60698c8a61
commit 33e3bcc6da
61 changed files with 1363 additions and 6119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,6 +76,7 @@
#include <algorithm>
#include <functional>
#include <rtl/logfile.hxx>
#include <rtl/ustrbuf.hxx>
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::util;
@@ -2232,89 +2233,128 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition)
}
}
}
#if OSL_DEBUG_LEVEL > 1
#if OSL_DEBUG_LEVEL > 0
// -----------------------------------------------------------------------------
void OSQLParseNode::showParseTree(::rtl::OUString& rString, sal_uInt32 nLevel)
void OSQLParseNode::showParseTree( ::rtl::OUString& rString ) const
{
::rtl::OUStringBuffer aBuf;
showParseTree( aBuf, 0 );
rString = aBuf.makeStringAndClear();
}
// -----------------------------------------------------------------------------
void OSQLParseNode::showParseTree( ::rtl::OUStringBuffer& _inout_rBuffer, sal_uInt32 nLevel ) const
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseNode::showParseTree" );
if (!isToken())
for ( sal_uInt32 j=0; j<nLevel; ++j)
_inout_rBuffer.appendAscii( " " );
if ( !isToken() )
{
for (sal_uInt32 j=0; j<nLevel; j++) {rString+= ::rtl::OUString::createFromAscii("\t");};
// Regelnamen als rule: ...
rString+= ::rtl::OUString::createFromAscii("RULE_ID:\t ");
rString += ::rtl::OUString::valueOf( (sal_Int32)getRuleID());
rString+= ::rtl::OUString::createFromAscii("(");
rString += OSQLParser::RuleIDToStr(getRuleID());
rString+= ::rtl::OUString::createFromAscii(")");
rString+= ::rtl::OUString::createFromAscii("\n");
_inout_rBuffer.appendAscii( "RULE_ID: " );
_inout_rBuffer.append( (sal_Int32)getRuleID() );
_inout_rBuffer.append( sal_Unicode( '(' ) );
_inout_rBuffer.append( OSQLParser::RuleIDToStr( getRuleID() ) );
_inout_rBuffer.append( sal_Unicode( ')' ) );
_inout_rBuffer.append( sal_Unicode( '\n' ) );
// hol dir den ersten Subtree
for (OSQLParseNodes::const_iterator i = m_aChildren.begin();
i != m_aChildren.end(); i++)
(*i)->showParseTree(rString, nLevel+1);
for ( OSQLParseNodes::const_iterator i = m_aChildren.begin();
i != m_aChildren.end();
++i
)
(*i)->showParseTree( _inout_rBuffer, nLevel+1 );
}
else
{
// ein Token gefunden
// tabs fuer das Einruecken entsprechend nLevel
for (sal_uInt32 j=0; j<nLevel; j++) {rString+= ::rtl::OUString::createFromAscii("\t");};
switch (m_eNodeType) {
switch (m_eNodeType)
{
case SQL_NODE_KEYWORD:
{rString+= ::rtl::OUString::createFromAscii("SQL_KEYWORD:\t");
::rtl::OString sT = OSQLParser::TokenIDToStr(getTokenID());
rString += ::rtl::OUString(sT,sT.getLength(),RTL_TEXTENCODING_UTF8);
rString+= ::rtl::OUString::createFromAscii("\n");
break;}
_inout_rBuffer.appendAscii( "SQL_KEYWORD: " );
_inout_rBuffer.append( ::rtl::OStringToOUString( OSQLParser::TokenIDToStr( getTokenID() ), RTL_TEXTENCODING_UTF8 ) );
_inout_rBuffer.append( sal_Unicode( '\n' ) );
break;
case SQL_NODE_COMPARISON:
{rString+= ::rtl::OUString::createFromAscii("SQL_COMPARISON:\t");
rString += m_aNodeValue; // haenge Nodevalue an
rString+= ::rtl::OUString::createFromAscii("\n"); // und beginne neu Zeile
break;}
_inout_rBuffer.appendAscii( "SQL_COMPARISON: " );
_inout_rBuffer.append( m_aNodeValue );
_inout_rBuffer.append( sal_Unicode( '\n' ) );
break;
case SQL_NODE_NAME:
{rString+= ::rtl::OUString::createFromAscii("SQL_NAME:\t");
rString+= ::rtl::OUString::createFromAscii("\"");
rString += m_aNodeValue;
rString+= ::rtl::OUString::createFromAscii("\"");
rString+= ::rtl::OUString::createFromAscii("\n");
break;}
_inout_rBuffer.appendAscii( "SQL_NAME: " );
_inout_rBuffer.append( sal_Unicode( '"' ) );
_inout_rBuffer.append( m_aNodeValue );
_inout_rBuffer.append( sal_Unicode( '"' ) );
_inout_rBuffer.append( sal_Unicode( '\n' ) );
break;
case SQL_NODE_STRING:
{rString += ::rtl::OUString::createFromAscii("SQL_STRING:\t'");
rString += m_aNodeValue;
rString += ::rtl::OUString::createFromAscii("'\n");
break;}
_inout_rBuffer.appendAscii( "SQL_STRING: " );
_inout_rBuffer.append( sal_Unicode( '\'' ) );
_inout_rBuffer.append( m_aNodeValue );
_inout_rBuffer.append( sal_Unicode( '\'' ) );
_inout_rBuffer.append( sal_Unicode( '\n' ) );
break;
case SQL_NODE_INTNUM:
{rString += ::rtl::OUString::createFromAscii("SQL_INTNUM:\t");
rString += m_aNodeValue;
rString += ::rtl::OUString::createFromAscii("\n");
break;}
_inout_rBuffer.appendAscii( "SQL_INTNUM: " );
_inout_rBuffer.append( m_aNodeValue );
_inout_rBuffer.append( sal_Unicode( '\n' ) );
break;
case SQL_NODE_APPROXNUM:
{rString += ::rtl::OUString::createFromAscii("SQL_APPROXNUM:\t");
rString += m_aNodeValue;
rString += ::rtl::OUString::createFromAscii("\n");
break;}
_inout_rBuffer.appendAscii( "SQL_APPROXNUM: " );
_inout_rBuffer.append( m_aNodeValue );
_inout_rBuffer.append( sal_Unicode( '\n' ) );
break;
case SQL_NODE_PUNCTUATION:
{rString += ::rtl::OUString::createFromAscii("SQL_PUNCTUATION:\t");
rString += m_aNodeValue; // haenge Nodevalue an
rString += ::rtl::OUString::createFromAscii("\n"); // und beginne neu Zeile
break;}
_inout_rBuffer.appendAscii( "SQL_PUNCTUATION: " );
_inout_rBuffer.append( m_aNodeValue );
_inout_rBuffer.append( sal_Unicode( '\n' ) );
break;
case SQL_NODE_AMMSC:
{rString += ::rtl::OUString::createFromAscii("SQL_AMMSC:\t");
rString += m_aNodeValue; // haenge Nodevalue an
rString += ::rtl::OUString::createFromAscii("\n"); // und beginne neu Zeile
break;}
_inout_rBuffer.appendAscii( "SQL_AMMSC: " );
_inout_rBuffer.append( m_aNodeValue );
_inout_rBuffer.append( sal_Unicode( '\n' ) );
break;
case SQL_NODE_EQUAL:
case SQL_NODE_LESS:
case SQL_NODE_GREAT:
case SQL_NODE_LESSEQ:
case SQL_NODE_GREATEQ:
case SQL_NODE_NOTEQUAL:
_inout_rBuffer.append( m_aNodeValue );
_inout_rBuffer.append( sal_Unicode( '\n' ) );
break;
case SQL_NODE_ACCESS_DATE:
_inout_rBuffer.appendAscii( "SQL_ACCESS_DATE: " );
_inout_rBuffer.append( m_aNodeValue );
_inout_rBuffer.append( sal_Unicode( '\n' ) );
break;
case SQL_NODE_DATE:
_inout_rBuffer.appendAscii( "SQL_DATE: " );
_inout_rBuffer.append( m_aNodeValue );
_inout_rBuffer.append( sal_Unicode( '\n' ) );
break;
case SQL_NODE_CONCAT:
_inout_rBuffer.appendAscii( "||" );
_inout_rBuffer.append( sal_Unicode( '\n' ) );
break;
default:
OSL_ASSERT("OSQLParser::ShowParseTree: unzulaessiger NodeType");
OSL_TRACE( "-- %i", int( m_eNodeType ) );
OSL_ENSURE( false, "OSQLParser::ShowParseTree: unzulaessiger NodeType" );
}
}
}