Remove an incorrect assert() statement (ticket [beba9cae6345a]). Fix other
minor problems in the name resolution logic.
FossilOrigin-Name: afe96a118c8a9627819ba5960aa83a607e734087
diff --git a/src/resolve.c b/src/resolve.c
index e1bcbcc..b9f5123 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -262,9 +262,6 @@
pTab = pItem->pTab;
assert( pTab!=0 && pTab->zName!=0 );
assert( pTab->nCol>0 );
- if( zDb && pTab->pSchema!=pSchema ){
- continue;
- }
if( pItem->pSelect && (pItem->pSelect->selFlags & SF_NestedFrom)!=0 ){
ExprList *pEList = pItem->pSelect->pEList;
int hit = 0;
@@ -278,6 +275,9 @@
}
if( hit || zTab==0 ) continue;
}
+ if( zDb && pTab->pSchema!=pSchema ){
+ continue;
+ }
if( zTab ){
const char *zTabName = pItem->zAlias ? pItem->zAlias : pTab->zName;
assert( zTabName!=0 );