From: dan <dan@noemail.net>
Date: Mon, 10 Jun 2019 15:34:16 +0000 (+0000)
Subject: Handle renaming a column or table when the schema contains a (meaningless) index... 
X-Git-Tag: version-3.29.0~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e20a894a34894eeb4eca0252d4ff25f99ac311e8;p=thirdparty%2Fsqlite.git

Handle renaming a column or table when the schema contains a (meaningless) index on the constant expression ('text' IN ()) or ('text' NOT IN()).

FossilOrigin-Name: 567b13093956185b5d5e971b81ba4788fd9d26c03688f643b380f0f1c1a94da0
---

diff --git a/manifest b/manifest
index 80bac3620e..722c863cab 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sattempt\sthe\sLIKE\soptimization\son\sa\scolumn\swith\snumeric\saffinity\sif\sthe\srhs\sof\sthe\soperator\sbegins\swith\swhitespace.\sFix\sfor\sticket\s[fd76310a5e].
-D 2019-06-10T13:46:42.468
+C Handle\srenaming\sa\scolumn\sor\stable\swhen\sthe\sschema\scontains\sa\s(meaningless)\sindex\son\sthe\sconstant\sexpression\s('text'\sIN\s())\sor\s('text'\sNOT\sIN()).
+D 2019-06-10T15:34:16.336
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -511,7 +511,7 @@ F src/os_win.c 85d9e532d0444ab6c16d7431490c2e279e282aa0917b0e988996b1ae0de5c5a0
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 422fd8cfa59fb9173eff36a95878904a0eeb0dcc62ba49350acc8b1e51c4dc7b
 F src/pager.h 217921e81eb5fe455caa5cda96061959706bcdd29ddb57166198645ef7822ac3
-F src/parse.y 91f76f436db1c0ed3cc8a82ba6c945a592dc24a036f0ff7b48313bd80977d382
+F src/parse.y 954e2624409fb04344811e2a59e3458abf67fd75ad71f0776e94435617871edf
 F src/pcache.c 696a01f1a6370c1b50a09c15972bc3bee3333f8fcd1f2da8e9a76b1b062c59ee
 F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
 F src/pcache1.c be64b2f3908a7f97c56c963676eb12f0d6254c95b28cdc1d73a186eff213219d
@@ -632,7 +632,7 @@ F test/altermalloc.test 167a47de41b5c638f5f5c6efb59784002b196fff70f98d9b4ed3cd74
 F test/altermalloc2.test fa7b1c1139ea39b8dec407cf1feb032ca8e0076bd429574969b619175ad0174b
 F test/altertab.test b6901287474841cffbd8f90b098d3bd7d8445868b42caeb01b27034698f7245f
 F test/altertab2.test 5d423a2d1006085b05cc1b788863d5a860ea2da21c4f892d15e2f2a34c78348a
-F test/altertab3.test 2433d0cc6cb9cffe087f9138cd36818c7abd5c396804aa6e6dc8c2b80e2cd406
+F test/altertab3.test a8f64e2896a9645d948ff65a6202ccbe6687b483c0ead2928d532472e674be6f
 F test/amatch1.test b5ae7065f042b7f4c1c922933f4700add50cdb9f
 F test/analyze.test 7168c8bffa5d5cbc53c05b7e9c7fcdd24b365a1bc5046ce80c45efa3c02e6b7c
 F test/analyze3.test ff62d9029e6deb2c914490c6b00caf7fae47cc85cdc046e4a0d0a4d4b87c71d8
@@ -1830,7 +1830,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P b141bae3f6d16c0ebb59dac9b02086a4370839e71ade34004f647b09b1083d1d
-R 0edeeba297be7794a2df312af7fa73d6
+P 94b58ab059cba9771e75f16d1460f313104a8fb879f9f8805725d362aa58cbcd
+R 690f23cd3c9b330abd9f7860557c7bc2
 U dan
-Z f66db0d0d24acc61923a149ef2da89aa
+Z 9f6778172efe3826af7afd3381a81ce6
diff --git a/manifest.uuid b/manifest.uuid
index e84dddf058..4c3d0191a5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-94b58ab059cba9771e75f16d1460f313104a8fb879f9f8805725d362aa58cbcd
\ No newline at end of file
+567b13093956185b5d5e971b81ba4788fd9d26c03688f643b380f0f1c1a94da0
\ No newline at end of file
diff --git a/src/parse.y b/src/parse.y
index 46faa9a369..de7c6b16d5 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -1172,10 +1172,18 @@ expr(A) ::= expr(A) between_op(N) expr(X) AND expr(Y). [BETWEEN] {
       **
       ** simplify to constants 0 (false) and 1 (true), respectively,
       ** regardless of the value of expr1.
+      **
+      ** Or, if this is part of an ALTER TABLE RENAME command, instead
+      ** change the expression to "+(expr1)". The unary + is required to
+      ** workaround the obscure case where expr1 is a string literal, as
+      ** SQLite treats simple string literals in CREATE INDEX statements
+      ** as column names, not constant expressions.
       */
       if( IN_RENAME_OBJECT==0 ){
         sqlite3ExprDelete(pParse->db, A);
         A = sqlite3ExprAlloc(pParse->db, TK_INTEGER,&sqlite3IntTokens[N],1);
+      }else{
+        A = sqlite3PExpr(pParse, TK_UPLUS, A, 0);
       }
     }else if( Y->nExpr==1 ){
       /* Expressions of the form:
diff --git a/test/altertab3.test b/test/altertab3.test
index b37d9ed1f9..897f6908f6 100644
--- a/test/altertab3.test
+++ b/test/altertab3.test
@@ -175,6 +175,21 @@ do_catchsql_test 7.2.2 {
   ALTER TABLE t1x RENAME TO t1;
 } {1 {error in trigger AFTER: no such column: d}}
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 8.0 {
+  CREATE TABLE t0(c0);
+  CREATE INDEX i0 ON t0('1' IN ());
+}
+do_execsql_test 8.1 {
+  ALTER TABLE t0 RENAME TO t1;
+  SELECT sql FROM sqlite_master;
+} {
+  {CREATE TABLE "t1"(c0)}
+  {CREATE INDEX i0 ON "t1"('1' IN ())}
+}
+
+
 finish_test