diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-06-04 14:23:34 +0200 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-06-04 14:23:34 +0200 |
| commit | 52d1202cce6b0c53dd5ef6682132b59c77e0783e (patch) | |
| tree | d8feeea19204cb078f6de7cf2a24cab0546ea58d /connectivity/source/drivers/kab | |
| parent | e95e77100efb7aa337358fa0c58b43c3e7e8f19e (diff) | |
| parent | b8076ccb49b2fa9730230490b4c34d15878a8ad7 (diff) | |
CWS-TOOLING: integrate CWS dba33f
Diffstat (limited to 'connectivity/source/drivers/kab')
| -rw-r--r-- | connectivity/source/drivers/kab/KColumns.cxx | 1 | ||||
| -rw-r--r-- | connectivity/source/drivers/kab/KStatement.cxx | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/connectivity/source/drivers/kab/KColumns.cxx b/connectivity/source/drivers/kab/KColumns.cxx index d75e782aed7b..4adcbe304c82 100644 --- a/connectivity/source/drivers/kab/KColumns.cxx +++ b/connectivity/source/drivers/kab/KColumns.cxx @@ -66,6 +66,7 @@ sdbcx::ObjectType KabColumns::createObject(const ::rtl::OUString& _rName) _rName, xRow->getString(6), xRow->getString(13), + xRow->getString(12), xRow->getInt(11), xRow->getInt(7), xRow->getInt(9), diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx index 4164ffe0ee52..f0069fc6875e 100644 --- a/connectivity/source/drivers/kab/KStatement.cxx +++ b/connectivity/source/drivers/kab/KStatement.cxx @@ -185,12 +185,13 @@ KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParse } } } - else if (pParseNode->count() == 4) + else if (SQL_ISRULE(pParseNode, test_for_null) || SQL_ISRULE(pParseNode, like_predicate)) { - const OSQLParseNode *pLeft = pParseNode->getChild(0), - *pMiddleLeft = pParseNode->getChild(1), - *pMiddleRight = pParseNode->getChild(2), - *pRight = pParseNode->getChild(3); + const OSQLParseNode *pLeft = pParseNode->getChild(0); + const OSQLParseNode* pPart2 = pParseNode->getChild(1); + const OSQLParseNode *pMiddleLeft = pPart2->getChild(0), + *pMiddleRight = pPart2->getChild(1), + *pRight = pPart2->getChild(2); if (SQL_ISRULE(pParseNode, test_for_null)) { |