From 57f7ece78410a8aae86aa4625fb7556897db384c Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Thu, 21 Nov 2019 18:28:44 +0000
Subject: Fix a problem that comes up when using generated columns that
 evaluate to a constant in an index and then making use of that index in a
 join.

FossilOrigin-Name: 8b12e95fec7ce6e0de82a04ca3dfcf1a8e62e233b7382aa28a8a9be6e862b1af
---
 src/expr.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/expr.c')

diff --git a/src/expr.c b/src/expr.c
index 45c053a8c..a3ed249ee 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -3605,7 +3605,12 @@ expr_code_doover:
         ** constant.
         */
         int iReg = sqlite3ExprCodeTarget(pParse, pExpr->pLeft,target);
-        int aff = sqlite3TableColumnAffinity(pExpr->y.pTab, pExpr->iColumn);
+        int aff;
+        if( pExpr->y.pTab ){
+          aff = sqlite3TableColumnAffinity(pExpr->y.pTab, pExpr->iColumn);
+        }else{
+          aff = pExpr->affExpr;
+        }
         if( aff>SQLITE_AFF_BLOB ){
           static const char zAff[] = "B\000C\000D\000E";
           assert( SQLITE_AFF_BLOB=='A' );
-- 
cgit v1.2.3