database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-01 06:27:03 +03:00
Code Activity

Report an error if an UPDATE...FROM statement has an ORDER BY but no LIMIT clause. Add tests for multi-column primary keys.

Browse Source 
FossilOrigin-Name: ffcdb6689123bb871c9bd8f977197f86f37c42e9094e2d4bb187ff479f74cf65
This commit is contained in:
dan
2020-04-30 15:49:56 +00:00
parent f2972b6083
commit 1e113844fc
4 changed files with 145 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
test/upfrom2.test
View File

@ -125,6 +125,93 @@ foreach {tn wo} {
fifteen->sixteen iv->iv
}
#--------------------------------------------------------------
do_execsql_test 1.%TN%.7 {
CREATE TABLE o1(w, x, y, z UNIQUE, PRIMARY KEY(w, x)) %WO%;
CREATE INDEX o1y ON t1(y);
INSERT INTO o1 VALUES(0, 0, 'i', 'one');
INSERT INTO o1 VALUES(0, 1, 'ii', 'two');
INSERT INTO o1 VALUES(1, 0, 'iii', 'three');
INSERT INTO o1 VALUES(1, 1, 'iv', 'four');
CREATE TRIGGER tro1 BEFORE UPDATE ON o1 BEGIN
INSERT INTO log VALUES(old.z || '->' || new.z);
END;
CREATE TRIGGER tro2 AFTER UPDATE ON o1 BEGIN
INSERT INTO log VALUES(old.y || '->' || new.y);
END;
}
do_execsql_test 1.%TN%.8 {
DELETE FROM log;
WITH data(k, v) AS (
VALUES(3, 'thirty'), (1, 'ten')
)
UPDATE o1 SET z=v FROM data WHERE (1+x+w*2)=k;
SELECT * FROM o1;
SELECT * FROM log;
} {
0 0 i ten 0 1 ii two 1 0 iii thirty 1 1 iv four
one->ten i->i
three->thirty iii->iii
}
do_execsql_test 1.%TN%.9 {
DELETE FROM log;
UPDATE o1 SET y=v FROM t2, t3 WHERE (1+o1.w*2+o1.x)=t2.a AND t3.k=t2.b;
SELECT * FROM o1;
SELECT * FROM log;
} {
0 0 i ten 0 1 xii two 1 0 v thirty 1 1 iv four
two->two ii->xii
thirty->thirty iii->v
}
do_execsql_test 1.%TN%.10 {
DELETE FROM log;
WITH data(k, v) AS (
VALUES(1, 'seven'), (1, 'eight'), (2, 'eleven'), (2, 'twelve')
)
UPDATE o1 SET z=v FROM data WHERE (1+w*2+x)=k;
SELECT * FROM o1;
SELECT * FROM log;
} {
0 0 i eight 0 1 xii twelve 1 0 v thirty 1 1 iv four
ten->eight i->i
two->twelve xii->xii
}
do_test 1.%TN%.11 { db changes } {2}
do_execsql_test 1.%TN%.12 {
CREATE VIEW w1 AS SELECT * FROM o1;
CREATE TRIGGER w1tr INSTEAD OF UPDATE ON w1 BEGIN
UPDATE o1 SET y=new.y, z=new.z WHERE w=new.w AND x=new.x;
END;
DELETE FROM log;
WITH data(k, v) AS (
VALUES(3, 'thirteen'), (3, 'fourteen'), (4, 'fifteen'), (4, 'sixteen')
)
UPDATE w1 SET z=v FROM data WHERE (1+w*2+x)=k;
}
do_execsql_test 1.%TN%.13 {
SELECT * FROM w1;
SELECT * FROM log;
} {
0 0 i eight 0 1 xii twelve 1 0 v fourteen 1 1 iv sixteen
thirty->thirteen v->v
thirteen->fourteen v->v
four->fifteen iv->iv
fifteen->sixteen iv->iv
}
}]
}
@ -165,6 +252,40 @@ eval [string map [list %WO% $wo %TN% $tn] {
5 five 6 six 7 seven 8 eight
}
do_catchsql_test 2.%TN%.5 {
UPDATE x1 SET b=b||b ORDER BY b;
} {1 {ORDER BY without LIMIT on UPDATE}}
do_catchsql_test 2.%TN%.6 {
UPDATE x1 SET b=b||y FROM data1 WHERE a=x ORDER BY b;
} {1 {ORDER BY without LIMIT on UPDATE}}
#-----------------------------------------------------------------------
do_execsql_test 2.%TN%.6 {
DROP TABLE x1;
CREATE TABLE x1(u, v, b, PRIMARY KEY(u, v)) %WO%;
INSERT INTO x1 VALUES
(0, 1, 'one'), (1, 0, 'two'), (1, 1, 'three'), (2, 0, 'four'),
(2, 1, 'five'), (3, 0, 'six'), (3, 1, 'seven'), (4, 0, 'eight');
}
do_execsql_test 2.%TN%.7 {
UPDATE x1 SET b=y FROM data1 WHERE (u*2+v)=x ORDER BY u, v LIMIT 3;
SELECT * FROM x1;
} {
0 1 eleven 1 0 twelve 1 1 thirteen 2 0 four
2 1 five 3 0 six 3 1 seven 4 0 eight
}
do_execsql_test 2.%TN%.8 {
UPDATE x1 SET b=b||y FROM data1 WHERE (u*2+v)=x ORDER BY b LIMIT 3;
SELECT * FROM x1;
} {
0 1 eleveneleven 1 0 twelve 1 1 thirteenthirteen 2 0 fourfourteen
2 1 five 3 0 six 3 1 seven 4 0 eight
}
}]
}}