Remove a faulty assert() statement.

FossilOrigin-Name: 5f2539da8cb9df99029ab4ab7023804722697673

diff --git a/manifest b/manifest
index 6d6fcde033dd630aa67bdf8ff4f6845066a2aeff..5da91d4d653e1f3aadd19bb7c0e8ce6006ccdcb5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Have\sthe\sautoconf\spackage\sbuild\sthe\sshell\stool\swith\sSQLite\slinked\sin\sstatically.
-D 2015-05-06T14:18:58.864
+C Remove\sa\sfaulty\sassert()\sstatement.
+D 2015-05-07T00:09:29.803
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 08728ecbeddca339c77bfd564d3484b523dffdb1
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -229,7 +229,7 @@ F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f
 F src/prepare.c 1fffbdcd6f8a0173a8f70d71f22528f4c0e1e3d3
 F src/printf.c 54dd6dce95454fadffa3ebf7717c5f6c06250d1d
 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
-F src/resolve.c 13109bc3b5ab404446296efa17039640de5bc35d
+F src/resolve.c 99eabf7eff0bfa65b75939b46caa82e2b2133f28
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 F src/select.c 1b0bfc7d59e48c26b895a6b719157111a617d9e3
 F src/shell.c 1b6fc902d4455b7a4d6d9cc9a23d3f6af7089302
@@ -843,7 +843,7 @@ F test/securedel2.test 2d54c28e46eb1fd6902089958b20b1b056c6f1c5
 F test/select1.test be62204d2bd9a5a8a149e9974cfddce893d8f686
 F test/select2.test 352480e0e9c66eda9c3044e412abdf5be0215b56
 F test/select3.test 2ce595f8fb8e2ac10071d3b4e424cadd4634a054
-F test/select4.test ac1cd55264a43872b49efac3a4f01a95ab6c6d50
+F test/select4.test 824342f382f16b4afe42d0887ef82b3d6abb6075
 F test/select5.test e758b8ef94f69b111df4cb819008856655dcd535
 F test/select6.test 39eac4a5c03650b2b473c532882273283ee8b7a0
 F test/select7.test 7fd2ef598cfabb6b9ff6ac13973b91d0527df49d
@@ -1256,7 +1256,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 04afa3febee32854fbb09ef8d4ffffd432119716
-R c802443e961f136bbb49cf06ee4d41db
-U dan
-Z de033081a6dd5244aca249205579af45
+P 31834c3aa7deeafee1163a67caf5f3197f07baf4
+R 014968d54fc9fdc23120a39f420a5f8f
+U drh
+Z 0f95adc7c225baa520f1175eee89a43c

diff --git a/manifest.uuid b/manifest.uuid
index 7f767af7e0c1d4fb7a8d23ffec1f727ef569d306..953203fe8dac48158ae47ba0196c26a60ff72ff4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-31834c3aa7deeafee1163a67caf5f3197f07baf4
\ No newline at end of file
+5f2539da8cb9df99029ab4ab7023804722697673
\ No newline at end of file

diff --git a/src/resolve.c b/src/resolve.c
index b75db42ef6f84027feb093e306be3b52f195d12e..23636eacec8b254966ca82b0e12569903716545f 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -99,7 +99,6 @@ static void resolveAlias(
   assert( iCol>=0 && iCol<pEList->nExpr );
   pOrig = pEList->a[iCol].pExpr;
   assert( pOrig!=0 );
-  assert( (pOrig->flags & EP_Resolved)!=0 || zType[0]==0 );
   db = pParse->db;
   pDup = sqlite3ExprDup(db, pOrig, 0);
   if( pDup==0 ) return;

diff --git a/test/select4.test b/test/select4.test
index a1619e59caabd03fc3bf5c8a7f8802bd1b422e06..c0f88a15076cee94cee07ceeb4e6dd9f6d6d8722 100644 (file)
--- a/test/select4.test
+++ b/test/select4.test
@@ -158,6 +158,9 @@ do_test select4-2.4 {
   }} msg]
   lappend v $msg
 } {1 {ORDER BY clause should come after UNION not before}}
+do_execsql_test select4-2.5 {
+  SELECT 123 AS x ORDER BY (SELECT x ORDER BY 1);
+} {123}
 
 # Except operator
 #