paulhorn/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some problems with DROP CONSTRAINT and DROP NOT NULL on generated columns.

Browse Source 
FossilOrigin-Name: 66c47e18e6e1b69df4c2ceb63ff20423bbc1d5819934d77b140cf321fa14eac5
This commit is contained in:
dan
2025-10-01 17:27:23 +00:00
parent c592b7e01d
commit d802904c8a
6 changed files with 83 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
manifest
+9 -9
View File
@@ -1,5 +1,5 @@
C Fix\shandling\sof\sFK\sconstraints\sthat\simmediately\sfollow\snamed\stable\sconstraints\sin\sDROP\sCONSTRAINT.
D 2025-09-30T19:20:53.155
C Fix\ssome\sproblems\swith\sDROP\sCONSTRAINT\sand\sDROP\sNOT\sNULL\son\sgenerated\scolumns.
D 2025-10-01T17:27:23.371
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 753f720f5654020458477fd99c253de6a58eae669198c76f03b7941aca5e0f56
F src/alter.c 2acf37ac6d22394ea783f48d5f84e14992d2708cc0aaa5fd4ab69b38f50e8440
F src/analyze.c 03bcfc083fc0cccaa9ded93604e1d4244ea245c17285d463ef6a60425fcb247d
F src/attach.c 9af61b63b10ee702b1594ecd24fb8cea0839cfdb6addee52fba26fa879f5db9d
F src/auth.c 54ab9c6c5803b47c0d45b76ce27eff22a03b4b1f767c5945a3a4eb13aa4c78dc
@@ -838,9 +838,9 @@ F test/alter3.test dcdd5f850f30656a45a0f05e41abfb52b74bbf6ccba165d0f7adf6b0116e4
F test/alter4.test 37cafe164067a6590a0ee4cec780bddbbaa33dc50b11542dcfbe0e65626494fd
F test/alterauth.test 63442ba61ceb0c1eeb63aac1f4f5cebfa509d352276059d27106ae256bafc959
F test/alterauth2.test 4b74fa8f184f4736497317feb587b65759eb87d87acfe3a8ef433d4d18bb002b
F test/altercol.test b43fb5725332f4cf8cff0280605202c1672e808281accea60a066d2ccc5129e5
F test/altercons.test 22f4882404a7ba114ec9cbcadc4d15cea4a9ff73079d26cb649357808d586521
F test/altercons2.test 5103d35e8a513e53c07b993575942aa7ad8400e4e6f63215e2352bb132b0599f
F test/altercol.test 3661c432aacb42bc2198dd4611bbb9c3b09fc73251b59edda046109103b8ac00
F test/altercons.test ea18def4a0f26b9066da56095c9c480df705df4d02e4ae151708fae76f7e3884
F test/altercons2.test 23202f119ff158c0228cb24c6b2d35e923e812976b0a2a972401d2e40aac35b4
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 b0b02e58ac60e4371981938c904ccf831b2367e3fd7d22e0ec2b4782e4c6805b
R 0dfce6bd91dfad4cc3e4550bd7110887
P 1c6f09f9f95ba76efa4f11f1c05d405d799b43f3570b23791472c3e165971bbc
R 1674535639316908637a4df60255a2ab
U dan
Z 3a11fcb014fc358470015a5ab963636d
Z db2f59c1797ee523a66c1a9dbd0f2362
# Remove this line to create a well-formed Fossil manifest.
manifest.uuid
+1 -1
View File
@@ -1 +1 @@
1c6f09f9f95ba76efa4f11f1c05d405d799b43f3570b23791472c3e165971bbc
66c47e18e6e1b69df4c2ceb63ff20423bbc1d5819934d77b140cf321fa14eac5
src/alter.c
+3 -2
View File
@@ -2397,7 +2397,7 @@ static int getConstraint(const u8 *z){
** of the following tokens:
**
** CONSTRAINT, PRIMARY, NOT, UNIQUE, CHECK, DEFAULT,
** COLLATE, REFERENCES, FOREIGN, RP, or COMMA
** COLLATE, REFERENCES, FOREIGN, GENERATED, AS, RP, or COMMA
**
** Also exit the loop if ILLEGAL turns up.
*/
@@ -2406,6 +2406,7 @@ static int getConstraint(const u8 *z){
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_FOREIGN || t==TK_RP || t==TK_COMMA || t==TK_ILLEGAL
|| t==TK_AS || t==TK_GENERATED
){
break;
}
@@ -2530,7 +2531,7 @@ static void dropConstraintFunc(
** to the CONSTRAINT keyword. */
nTok = getConstraintToken(&zSql[iOff], &t);
if( t==TK_CONSTRAINT || t==TK_DEFAULT || t==TK_COLLATE
|| t==TK_COMMA || t==TK_RP
|| t==TK_COMMA || t==TK_RP || t==TK_GENERATED || t==TK_AS
){
t = TK_CHECK;
}else{
test/altercol.test
+13
View File
@@ -946,4 +946,17 @@ do_execsql_test 23.20 {
ROLLBACK;
} {t4new}
#-------------------------------------------------------------------------
reset_db
do_execsql_test 24.0 {
CREATE TABLE t1(a PRIMARY KEY, b);
CREATE TABLE t2(a, b, c);
INSERT INTO t2 VALUES(1, 1, 1);
}
do_catchsql_test 24.1 {
PRAGMA foreign_keys = 1;
ALTER TABLE t2 ADD COLUMN d REFERENCES t1 DEFAULT 123;
} {1 {Cannot add a REFERENCES column with non-NULL default value}}
finish_test
test/altercons.test
+25
View File
@@ -76,6 +76,25 @@ foreach {tn before after} {
17 { CREATE TABLE t1(a, b, c, /* world */ CONSTRAINT abc CHECK( a!=b )) }
{ CREATE TABLE t1(a, b, c) }
18 { CREATE TABLE t1(a, b, c -- comment
CONSTRAINT abc NOT NULL
) }
{ CREATE TABLE t1(a, b, c) }
19 { CREATE TABLE t1(a, b, c, -- comment
CONSTRAINT abc CHECK (a>b) CONSTRAINT two
) }
{ CREATE TABLE t1(a, b, c, CONSTRAINT two
) }
20 { CREATE TABLE t1(a, b, c, CONSTRAINT one CONSTRAINT abc CHECK (a>b)CONSTRAINT two) }
{ CREATE TABLE t1(a, b, c, CONSTRAINT one CONSTRAINT two) }
21 { CREATE TABLE t1(a, b, c CONSTRAINT abc AS (b+1)) }
{ CREATE TABLE t1(a, b, c AS (b+1)) }
22 { CREATE TABLE t1(a, b, c CONSTRAINT abc GENERATED ALWAYS AS (b+1) STORED) }
{ CREATE TABLE t1(a, b, c GENERATED ALWAYS AS (b+1) STORED) }
} {
reset_db
@@ -131,6 +150,12 @@ foreach {tn col before after} {
9 b { CREATE TABLE t1(a, b CONSTRAINT nn CHECK (b IS NOT NULL) NOT NULL) }
{ CREATE TABLE t1(a, b CONSTRAINT nn CHECK (b IS NOT NULL)) }
10 b { CREATE TABLE t1(a, b NOT NULL AS (a+1)) }
{ CREATE TABLE t1(a, b AS (a+1)) }
11 b { CREATE TABLE t1(a, b NOT NULL GENERATED ALWAYS AS (a+1)) }
{ CREATE TABLE t1(a, b GENERATED ALWAYS AS (a+1)) }
} {
reset_db
test/altercons2.test
+32
View File
@@ -174,5 +174,37 @@ do_catchsql_test 8.1 {
ALTER TABLE abc DROP CONSTRAINT one
} {1 {constraint may not be dropped: one}}
#-------------------------------------------------------------------------
reset_db
do_execsql_test 9.0 {
CREATE TABLE abc(a, b NOT NULL AS (a+1))
}
do_execsql_test 9.1 {
ALTER TABLE abc ALTER b DROP NOT NULL;
SELECT sql FROM sqlite_schema;
} {{CREATE TABLE abc(a, b AS (a+1))}}
#-------------------------------------------------------------------------
reset_db
do_execsql_test 10.0 {
CREATE TABLE abc(a, b GENERATED ALWAYS AS (a+1));
INSERT INTO abc VALUES(1), (2);
SELECT * FROM abc;
} {1 2 2 3}
do_execsql_test 10.1 {
ALTER TABLE abc ALTER b SET NOT NULL;
}
do_catchsql_test 10.2 {
INSERT INTO abc VALUES(NULL);
} {1 {NOT NULL constraint failed: abc.b}}
do_execsql_test 10.3 {
INSERT INTO abc VALUES(3);
ALTER TABLE abc ALTER COLUMN b DROP NOT NULL;
}
do_execsql_test 10.4 {
INSERT INTO abc VALUES(NULL);
}
finish_test