Fix handling of FK constraints that immediately follow named table constraints in...

FossilOrigin-Name: 1c6f09f9f95ba76efa4f11f1c05d405d799b43f3570b23791472c3e165971bbc

diff --git a/manifest b/manifest
index 8ca71011c3e6ee04bd4f481309e6e6b5865f50f6..337e6f5912c1d583f843aa2cad8dea4a24c1a164 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\ssome\sDROP\sCONSTRAINT\sand\sDROP\sNOT\sNULL\scases\sinvolving\sSQL\scomments\sor\smultiple\stable\sconstraints\swithout\sseparating\scommas.
-D 2025-09-30T17:13:12.931
+C Fix\shandling\sof\sFK\sconstraints\sthat\simmediately\sfollow\snamed\stable\sconstraints\sin\sDROP\sCONSTRAINT.
+D 2025-09-30T19:20:53.155
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -670,7 +670,7 @@ F mptest/multiwrite01.test dab5c5f8f9534971efce679152c5146da265222d
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 1b9c24374a85dfc7eb8fa7c4266ee0db4f9609cceecfc5481cd8307e5af04366
 F sqlite3.pc.in e6dee284fba59ef500092fdc1843df3be8433323a3733c91da96690a50a5b398
-F src/alter.c a2d3e4d1afe75c98048400b316e01c73a3688548ddbd9a8b76bebbae3f91b883
+F src/alter.c 753f720f5654020458477fd99c253de6a58eae669198c76f03b7941aca5e0f56
 F src/analyze.c 03bcfc083fc0cccaa9ded93604e1d4244ea245c17285d463ef6a60425fcb247d
 F src/attach.c 9af61b63b10ee702b1594ecd24fb8cea0839cfdb6addee52fba26fa879f5db9d
 F src/auth.c 54ab9c6c5803b47c0d45b76ce27eff22a03b4b1f767c5945a3a4eb13aa4c78dc
@@ -840,7 +840,7 @@ F test/alterauth.test 63442ba61ceb0c1eeb63aac1f4f5cebfa509d352276059d27106ae256b
 F test/alterauth2.test 4b74fa8f184f4736497317feb587b65759eb87d87acfe3a8ef433d4d18bb002b
 F test/altercol.test b43fb5725332f4cf8cff0280605202c1672e808281accea60a066d2ccc5129e5
 F test/altercons.test 22f4882404a7ba114ec9cbcadc4d15cea4a9ff73079d26cb649357808d586521
-F test/altercons2.test 6e8e384f394ac1b6657429a885bc50be27bb88fe7427d8e1d5a64bdf600c221c
+F test/altercons2.test 5103d35e8a513e53c07b993575942aa7ad8400e4e6f63215e2352bb132b0599f
 F test/altercorrupt.test 2e1d705342cf9d7de884518ddbb053fd52d7e60d2b8869b7b63b2fda68435c12
 F test/alterdropcol.test a653a3945f964d26845ec0cd0a8e74189f46de3119a984c5bc45457da392612e
 F test/alterdropcol2.test 527fce683b200d620f560f666c44ae33e22728e990a10a48a543280dfd4b4d41
@@ -2171,8 +2171,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 17a6f4e69e54a5dc233e33501f16f0f69f77fff071142cefc309b5407f57f721
-R cad1fca46ac4b09e84f0a86ca159c2b9
+P b0b02e58ac60e4371981938c904ccf831b2367e3fd7d22e0ec2b4782e4c6805b
+R 0dfce6bd91dfad4cc3e4550bd7110887
 U dan
-Z 5d912a204d4b04c238cd0328baa01045
+Z 3a11fcb014fc358470015a5ab963636d
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 32e8134015f38a641bc8ccc0808bc0356d4e0054..b6a1473af3199a5e3d8f9500b664dea86ddf5407 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b0b02e58ac60e4371981938c904ccf831b2367e3fd7d22e0ec2b4782e4c6805b
+1c6f09f9f95ba76efa4f11f1c05d405d799b43f3570b23791472c3e165971bbc

diff --git a/src/alter.c b/src/alter.c
index 40e6ff6aeb2e130dd589a0a909f398cc74c7ff1f..43d35f6261716cb957100e0716d730bcf2d8002b 100644 (file)
--- a/src/alter.c
+++ b/src/alter.c
@@ -2397,7 +2397,7 @@ static int getConstraint(const u8 *z){
   ** of the following tokens: 
   **
   **   CONSTRAINT, PRIMARY, NOT, UNIQUE, CHECK, DEFAULT, 
-  **   COLLATE, REFERENCES, RP, COMMA
+  **   COLLATE, REFERENCES, FOREIGN, RP, or COMMA
   **
   ** Also exit the loop if ILLEGAL turns up.
   */
@@ -2405,7 +2405,7 @@ static int getConstraint(const u8 *z){
     int n = getConstraintToken(&z[iOff], &t);
     if( t==TK_CONSTRAINT || t==TK_PRIMARY || t==TK_NOT || t==TK_UNIQUE
      || t==TK_CHECK || t==TK_DEFAULT || t==TK_COLLATE || t==TK_REFERENCES
-     || t==TK_RP || t==TK_COMMA || t==TK_ILLEGAL
+     || t==TK_FOREIGN || t==TK_RP || t==TK_COMMA || t==TK_ILLEGAL
     ){
       break;
     }
@@ -2518,8 +2518,9 @@ static void dropConstraintFunc(
         ** definition. This is enough to tell the type of the constraint - 
         ** TK_NOT means it is a NOT NULL, TK_CHECK a CHECK constraint etc.
         **
-        ** There is also the chance that the next token is TK_CONSTRAINT,
-        ** for example if a table has been created as follows:
+        ** There is also the chance that the next token is TK_CONSTRAINT
+        ** (or TK_DEFAULT or TK_COLLATE), for example if a table has been
+        ** created as follows:
         **
         **    CREATE TABLE t1(cols, CONSTRAINT one CONSTRAINT two NOT NULL);
         **
@@ -2528,7 +2529,9 @@ static void dropConstraintFunc(
         ** the next iteration of the loop with &zSql[iOff] still pointing
         ** to the CONSTRAINT keyword.  */
         nTok = getConstraintToken(&zSql[iOff], &t);
-        if( t==TK_CONSTRAINT || t==TK_COMMA || t==TK_RP ){
+        if( t==TK_CONSTRAINT || t==TK_DEFAULT || t==TK_COLLATE 
+         || t==TK_COMMA || t==TK_RP 
+        ){
           t = TK_CHECK;
         }else{
           iOff += nTok;

diff --git a/test/altercons2.test b/test/altercons2.test
index ac7394dbb4591f1393a45d59521fac306d53a10b..33645fbebf3eadea08c837c01c84367315065320 100644 (file)
--- a/test/altercons2.test
+++ b/test/altercons2.test
@@ -134,5 +134,45 @@ do_catchsql_test 5.1 {
   CREATE TABLE def(CONSTRAINT abc CHECK( b!=c ), a, b, c);
 } {1 {near "CONSTRAINT": syntax error}}
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 6.0 {
+  CREATE TABLE abc(a, b CONSTRAINT two COLLATE nocase CHECK (a!=b), c CONSTRAINT one DEFAULT 'abc');
+}
+
+do_execsql_test 6.1 {
+  ALTER TABLE abc DROP CONSTRAINT one;
+  ALTER TABLE abc DROP CONSTRAINT two;
+}
+
+do_execsql_test 6.2 {
+  SELECT sql FROM sqlite_schema
+} {
+  {CREATE TABLE abc(a, b COLLATE nocase CHECK (a!=b), c DEFAULT 'abc')}
+}
+
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 7.0 {
+  CREATE TABLE abc(a, b, c, CONSTRAINT one CHECK (a>b) FOREIGN KEY(a) REFERENCES abc);
+}
+do_execsql_test 7.1 {
+  ALTER TABLE abc DROP CONSTRAINT one
+}
+do_execsql_test 7.2 {
+  SELECT sql FROM sqlite_schema
+} {
+  {CREATE TABLE abc(a, b, c, FOREIGN KEY(a) REFERENCES abc)}
+}
+
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 8.0 {
+  CREATE TABLE abc(a, b, c, CONSTRAINT one FOREIGN KEY(a) REFERENCES abc);
+}
+do_catchsql_test 8.1 {
+  ALTER TABLE abc DROP CONSTRAINT one
+} {1 {constraint may not be dropped: one}}
+
 finish_test