From 7fe55926ec29a50b912e6644f29ad47b6bb89762 Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date: Wed, 29 Nov 2017 14:47:05 +0000
Subject: [PATCH] MCOL-1040 Fix returnedColumn assumption

Code appears to assume a simple returned column is derrived when that
may not always be the case.
---
 dbcon/execplan/simplecolumn.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dbcon/execplan/simplecolumn.cpp b/dbcon/execplan/simplecolumn.cpp
index bfbf96a2c..756e33401 100644
--- a/dbcon/execplan/simplecolumn.cpp
+++ b/dbcon/execplan/simplecolumn.cpp
@@ -112,7 +112,7 @@ ParseTree* replaceRefCol(ParseTree*& n, CalpontSelectExecutionPlan::ReturnedColu
 	else if (rc)
 	{
 		SimpleColumn* sc = dynamic_cast<SimpleColumn*>(rc);
-		if (sc)
+		if (sc && (sc->colPosition() > -1))
 		{
 			ReturnedColumn* tmp = derivedColList[sc->colPosition()]->clone();
 			delete sc;