From 11d20940897835e49a3ba310a24dc5fc933ceaf3 Mon Sep 17 00:00:00 2001 From: David Hall Date: Tue, 10 Jul 2018 14:03:17 -0500 Subject: [PATCH] MCOL-1531 Don't compare alias in == operators for ReturnedColumn types --- dbcon/execplan/arithmeticcolumn.cpp | 8 ++++---- dbcon/execplan/constantcolumn.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dbcon/execplan/arithmeticcolumn.cpp b/dbcon/execplan/arithmeticcolumn.cpp index 5c12f7e5f..2c2eb5ace 100644 --- a/dbcon/execplan/arithmeticcolumn.cpp +++ b/dbcon/execplan/arithmeticcolumn.cpp @@ -345,10 +345,10 @@ bool ArithmeticColumn::operator==(const ArithmeticColumn& t) const } else if (fExpression != NULL || t.fExpression != NULL) return false; - if (fAlias != t.fAlias) - return false; - if (fTableAlias != t.fTableAlias) - return false; +// if (fAlias != t.fAlias) +// return false; +// if (fTableAlias != t.fTableAlias) +// return false; if (fData != t.fData) return false; return true; diff --git a/dbcon/execplan/constantcolumn.cpp b/dbcon/execplan/constantcolumn.cpp index fce3825b8..fadd2dfc9 100644 --- a/dbcon/execplan/constantcolumn.cpp +++ b/dbcon/execplan/constantcolumn.cpp @@ -316,8 +316,8 @@ bool ConstantColumn::operator==(const ConstantColumn& t) const return false; if (fType != t.fType) return false; - if (fAlias != t.fAlias) - return false; +// if (fAlias != t.fAlias) +// return false; if (fData != t.fData) return false; if (fReturnAll != t.fReturnAll)