summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOcke Janssen [oj] <Ocke.Janssen@oracle.com>2011-01-04 13:12:33 +0100
committerOcke Janssen [oj] <Ocke.Janssen@oracle.com>2011-01-04 13:12:33 +0100
commit9f338a693e1f7ca0b649827103edab417bd9b4d5 (patch)
tree910482520b125e4f28eb8853bce0ded03388f223
parent8a8d24e0e13629228731ee283fe72bf753e26179 (diff)
dba34c: #i20306# support for window function and limit fetch first, ... added
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 67385fd02d67..e0b4a665a8bc 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2061,6 +2061,13 @@ namespace
break;
}
+ const OSQLParseNode* pTableExp = pParseTree->getChild(3);
+ if ( pTableExp->getChild(6)->count() > 0 || pTableExp->getChild(7)->count() > 0 || pTableExp->getChild(8)->count() > 0)
+ {
+ eErrorCode = eStatementTooComplex;
+ break;
+ }
+
Reference< XConnection> xConnection = rController.getConnection();
if ( !xConnection.is() )
{
@@ -2142,7 +2149,7 @@ namespace
pTableView->RemoveTabWin(aIterTableMap->second);
}
- if ( eOk == (eErrorCode = FillOuterJoins(_pView,pParseTree->getChild(3)->getChild(0)->getChild(1))) )
+ if ( eOk == (eErrorCode = FillOuterJoins(_pView,pTableExp->getChild(0)->getChild(1))) )
{
// check if we have a distinct statement
if(SQL_ISTOKEN(pParseTree->getChild(1),DISTINCT))