Commit 59116f2d authored by Neil Kindlon's avatar Neil Kindlon
Browse files

Fixed context error that broke merge

parent 4a9a6c2b
......@@ -219,8 +219,16 @@ bool ContextBase::isValidState()
}
if (hasColumnOpsMethods()) {
for (int i=0; i < (int)_dbFileIdxs.size(); i++) {
FileRecordMgr *dbFile = getFile(_dbFileIdxs[i]);
if (hasIntersectMethods()) {
for (int i=0; i < (int)_dbFileIdxs.size(); i++) {
FileRecordMgr *dbFile = getFile(_dbFileIdxs[i]);
_keyListOps->setDBfileType(dbFile->getFileType());
if (!_keyListOps->isValidColumnOps(dbFile)) {
return false;
}
}
} else {
FileRecordMgr *dbFile = getFile(0);
_keyListOps->setDBfileType(dbFile->getFileType());
if (!_keyListOps->isValidColumnOps(dbFile)) {
return false;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment