From: drh <drh@noemail.net>
Date: Thu, 11 Jun 2020 16:04:10 +0000 (+0000)
Subject: Add a new assert() to the SELECT processing.
X-Git-Tag: version-3.33.0~130
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5aaee5e31c081b3ba5beeb563419f2d66be2656;p=thirdparty%2Fsqlite.git

Add a new assert() to the SELECT processing.

FossilOrigin-Name: 98cea4a32ba558c137d71a5e373a6803d764d34c5640907371dcf6468ffb2e64
---

diff --git a/manifest b/manifest
index 228f95ace0..4f90c0b7d1 100644
--- a/manifest
+++ b/manifest
@@ -1,13 +1,13 @@
 B fd5abb1a7b5a55127d5c0d5ff448020d8bccab44e4f5afe1eb88fc19578af735
-C Avoid\srewriting\scompound\sSELECT\sstatements\sthat\suse\sa\sdifferent\scollation\ssequence\sfor\sORDER\sBY\sand\srecord\sprocessing\sa\ssecond\stime\sif\sthey\scontain\swindow\sfunctions.\sFix\sfor\s[b706351c].
-D 2020-06-11T15:53:54.084
+C Add\sa\snew\sassert()\sto\sthe\sSELECT\sprocessing.
+D 2020-06-11T16:04:10.746
 F src/global.c 0409ae635839e0bef26a69b68be64126ab6cba62ac19bd7694f1652e591c4c17
-F src/select.c 4cf6adb522701a8f9d31b813898c0ec0b3409d343ba131a6f9659d49b76e222a
+F src/select.c 929e1c0db3cb3d9f7d2304c6596868abcb6dfd7c2a0ac1bdf12a5a4432078ba4
 F src/sqliteInt.h fe320867c4f48eeeca523062c5668508b3f9b88d65690d42610bd138a5fdb5c4
 F src/test1.c e9f68f157f8fd027ee4c32c4b427f4eed274749bfb745427e2d954fa89d95ad3
 F src/window.c 88a63e6948ea924b3cf9ad8aff5ea1fa53bebdb2f13340867205fda16ed0f19c
 F test/window1.test 9d7f4990e5b36d95af93b189da4aa75216c6690ce95cced3c8b6d3234be51c2c
-P 30c6d895b573d5f2a53487b3b7a0d20be7e382c7a0bc87336bd43fbd2fa89bf4
-R d77969df2abe7d3c02ea74b2057f9f3a
-U dan
-Z 0af3852064f40e6db0fa611ce2dd7e61
+P 32a88bdd4be5acdc1b80856bf6e32724dc3a467d5050bec0fe1a3dfedcc06f34
+R 2b3df40625e1e1ca91eabc824248dfbb
+U drh
+Z 5781754b9c0a637aa77d00f970b7b71b
diff --git a/manifest.uuid b/manifest.uuid
index 3dc252ddbe..73df9f885f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-32a88bdd4be5acdc1b80856bf6e32724dc3a467d5050bec0fe1a3dfedcc06f34
\ No newline at end of file
+98cea4a32ba558c137d71a5e373a6803d764d34c5640907371dcf6468ffb2e64
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index a8af176604..e89db37aeb 100644
--- a/src/select.c
+++ b/src/select.c
@@ -5829,6 +5829,11 @@ int sqlite3Select(
     Select *pSub = pItem->pSelect;
     Table *pTab = pItem->pTab;
 
+    /* The expander should have already created transient Table objects
+    ** even for FROM clause elements such as subqueries that do not correspond
+    ** to a real table */
+    assert( pTab!=0 );
+
     /* Convert LEFT JOIN into JOIN if there are terms of the right table
     ** of the LEFT JOIN used in the WHERE clause.
     */