Skip to content

Commit 549cee5

Browse files
sjlombardosjlombardo
committed
Merge sqlite-release(3.27.2) into prerelease-integration
2 parents 9e2eeb3 + 49234e8 commit 549cee5

File tree

14 files changed

+184
-98
lines changed

14 files changed

+184
-98
lines changed

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.27.1
1+
3.27.2

‎configure‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for sqlcipher 3.27.1.
3+
# Generated by GNU Autoconf 2.69 for sqlcipher 3.27.2.
44
#
55
#
66
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
587587
# Identity of this package.
588588
PACKAGE_NAME='sqlcipher'
589589
PACKAGE_TARNAME='sqlcipher'
590-
PACKAGE_VERSION='3.27.1'
591-
PACKAGE_STRING='sqlcipher 3.27.1'
590+
PACKAGE_VERSION='3.27.2'
591+
PACKAGE_STRING='sqlcipher 3.27.2'
592592
PACKAGE_BUGREPORT=''
593593
PACKAGE_URL=''
594594

@@ -1337,7 +1337,7 @@ if test "$ac_init_help" = "long"; then
13371337
# Omit some internal or obsolete options to make the list less imposing.
13381338
# This message is too long to be a string in the A/UX 3.1 sh.
13391339
cat <<_ACEOF
1340-
\`configure' configures sqlcipher 3.27.1 to adapt to many kinds of systems.
1340+
\`configure' configures sqlcipher 3.27.2 to adapt to many kinds of systems.
13411341
13421342
Usage: $0 [OPTION]... [VAR=VALUE]...
13431343
@@ -1402,7 +1402,7 @@ fi
14021402

14031403
if test -n "$ac_init_help"; then
14041404
case $ac_init_help in
1405-
short | recursive ) echo "Configuration of sqlcipher 3.27.1:";;
1405+
short | recursive ) echo "Configuration of sqlcipher 3.27.2:";;
14061406
esac
14071407
cat <<\_ACEOF
14081408
@@ -1538,7 +1538,7 @@ fi
15381538
test -n "$ac_init_help" && exit $ac_status
15391539
if $ac_init_version; then
15401540
cat <<\_ACEOF
1541-
sqlcipher configure 3.27.1
1541+
sqlcipher configure 3.27.2
15421542
generated by GNU Autoconf 2.69
15431543
15441544
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1957,7 +1957,7 @@ cat >config.log <<_ACEOF
19571957
This file contains any messages produced by compilers while
19581958
running configure, to aid debugging if configure makes a mistake.
19591959
1960-
It was created by sqlcipher $as_me 3.27.1, which was
1960+
It was created by sqlcipher $as_me 3.27.2, which was
19611961
generated by GNU Autoconf 2.69. Invocation command line was
19621962
19631963
$ $0 $@
@@ -13754,7 +13754,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1375413754
# report actual input values of CONFIG_FILES etc. instead of their
1375513755
# values after options handling.
1375613756
ac_log="
13757-
This file was extended by sqlcipher $as_me 3.27.1, which was
13757+
This file was extended by sqlcipher $as_me 3.27.2, which was
1375813758
generated by GNU Autoconf 2.69. Invocation command line was
1375913759
1376013760
CONFIG_FILES = $CONFIG_FILES
@@ -13820,7 +13820,7 @@ _ACEOF
1382013820
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1382113821
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1382213822
ac_cs_version="\\
13823-
sqlcipher config.status 3.27.1
13823+
sqlcipher config.status 3.27.2
1382413824
configured by $0, generated by GNU Autoconf 2.69,
1382513825
with options \\"\$ac_cs_config\\"
1382613826

‎manifest‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
C Version\s3.27.1
2-
D 2019-02-08T13:17:39.690
1+
C Version\s3.27.2
2+
D 2019-02-25T16:06:06.705
33
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
44
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
55
F Makefile.in 178d8eb6840771149cee40b322d1b3be30d330198c522c903c1b66fb5a1bfca4
66
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
77
F Makefile.msc 5df60c70edb157feb2148a14c687551969599bd065875a0b959b6b139721ca72
88
F README.md 377233394b905d3b2e2b33741289e093bc93f2e7adbe00923b2c5958c9a9edee
9-
F VERSION 15b2d421b2265aad451c0493066c1c31a511a72c5153bb4e9d5f62adbc12134c
9+
F VERSION a45c4d2eb2f9c1432c4e49d9306ccb0cd3f88dccddfa52ea1fe7460ce005e58a
1010
F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
1111
F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
1212
F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@ -33,7 +33,7 @@ F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63
3333
F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
3434
F config.h.in 6376abec766e9a0785178b1823b5a587e9f1ccbc
3535
F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
36-
F configure 2b0310f5ddb82f4e2c524c0bc7bacf480b0ac21bf05b543d7e72e2682772eaac x
36+
F configure 7fd4706775d3c31e928d3e94bcfca5150a60d5abfc6a36a20fa43ad66dc4d467 x
3737
F configure.ac 3552d3aecade98a9d4b64bceb48ffb7726cbc85902efde956812942f060fbd0a
3838
F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
3939
F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
@@ -466,7 +466,7 @@ F src/date.c ebe1dc7c8a347117bb02570f1a931c62dd78f4a2b1b516f4837d45b7d6426957
466466
F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
467467
F src/dbstat.c c12833de69cb655751487d2c5a59607e36be1c58ba1f4bd536609909ad47b319
468468
F src/delete.c d08c9e01a2664afd12edcfa3a9c6578517e8ff8735f35509582693adbe0edeaf
469-
F src/expr.c 182dc9ff30aa6a430b7f728ce84fda85ec10890e29fdf75be1e871d13222a99c
469+
F src/expr.c f2d0ecf68213770be4fad83128ce02e67667deebaa0a44061313f7e4f2a4ae28
470470
F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
471471
F src/fkey.c bd0138acdc008c1845ccf92f8e73787880562de649471804801c06fed814c765
472472
F src/func.c 0341881d22903aac5ba7f352b188806d6436e1d6ae4235ff01e44d56879dfe63
@@ -475,7 +475,7 @@ F src/hash.c a12580e143f10301ed5166ea4964ae2853d3905a511d4e0c44497245c7ce1f7a
475475
F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
476476
F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
477477
F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
478-
F src/insert.c 3ed9ceaa4b7d56a6f2613355e1cd1ae5cfe31712bce2bf5aa93c5f1f130704b2
478+
F src/insert.c 7b71ba94e3283b497c076068fdeea760ce93b9db7d6784bdf5404fc842b721e5
479479
F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
480480
F src/loadext.c e6f10875d52aca3b7e57ce1ec174aeafc9b6c00b43000cd30d791f9cb490b7a6
481481
F src/main.c 27d7265625ea6eaccdfe7c53ef41adc179c9357a077702a860c1a3b0a037a16f
@@ -512,14 +512,14 @@ F src/pragma.h a776bb9c915207e9d1117b5754743ddf1bf6a39cc092a4a44e74e6cb5fab1177
512512
F src/prepare.c 78027c6231fbb19ca186a5f5f0c0a1375d9c2cec0655273f9bd90d9ff74a34b3
513513
F src/printf.c cbf27c320091a83279d1738f68a27a9fe01698c607ce80516ab6bdb5a9c36a1a
514514
F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
515-
F src/resolve.c c8f207247472c41ac73d738e1c1a80719ad253d1dbb617ed57740492b2a6c097
515+
F src/resolve.c dd7550ed05486c49c2b467b46ef37c78cdf6bf9df3b15134816d081691fd42d1
516516
F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
517517
F src/select.c c998f694759e37799929e28df8a2649747f8774d4fc233529ab6bda689388e15
518518
F src/shell.c.in f2c1adbee3f6f36686b4a38d2168ebfc25298b4ad1e6d95199fc4e95b539251d
519-
F src/sqlite.h.in 7da74fd5bd7a9dbe92297060f036935520b26e240457287c5e67c7b9db51a986
519+
F src/sqlite.h.in 8859e0b45b48d4186fbc466885e508f8272420a349099acdebcdb8d410d54824
520520
F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
521521
F src/sqlite3ext.h 960f1b86c3610fa23cb6a267572a97dcf286e77aa0dd3b9b23292ffaa1ea8683
522-
F src/sqliteInt.h f657e35d824fdc17ddf46bb85f0193df3b965e8354ded9ec37825057e3224bcc
522+
F src/sqliteInt.h ea0b5769140ca4bed03aeca8e7abb5c7a3eef4ffac723c8db3cfde88c390f807
523523
F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
524524
F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
525525
F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@ -585,7 +585,7 @@ F src/upsert.c 0dd81b40206841814d46942a7337786932475f085716042d0cb2fc7791bf8ca4
585585
F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
586586
F src/util.c 82a2e3f691a3b654be872e305dab1f455e565dedf5e6a90c818c1ab307c00432
587587
F src/vacuum.c a9f389f41556c0ec310bc9169dc9476603c30a0a913ad92bfbc75c86886967ca
588-
F src/vdbe.c b7b6f965153607072917dbd81d654a268abf4872c58d556701d1549550766c02
588+
F src/vdbe.c 2c61090f2328ad125c8e55b4dab0712a78cfdfac893152fae34bed7e015b7cd7
589589
F src/vdbe.h 712bca562eaed1c25506b9faf9680bdc75fc42e2f4a1cd518d883fa79c7a4237
590590
F src/vdbeInt.h a76d5eed62c76bcd8de7afd3147fac1bc40c5a870582664bcd7d071ef437c37f
591591
F src/vdbeapi.c 57a2d794a8833f269b878dbc24e955369bdb379af6c4e93ebc5ce1a20fa3daf4
@@ -601,7 +601,7 @@ F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
601601
F src/walker.c 7607f1a68130c028255d8d56094ea602fc402c79e1e35a46e6282849d90d5fe4
602602
F src/where.c 8a207cb2ca6b99e1edb1e4bbff9b0504385a759cbf66180d1deb34d80ca4b799
603603
F src/whereInt.h 5f14db426ca46a83eabab1ae9aa6d4b8f27504ad35b64c290916289b1ddb2e88
604-
F src/wherecode.c a571d8d7c19d6db786a201f2df8788b320fefcb2842f2a1eb9a85b85e91bc35f
604+
F src/wherecode.c 061848646cc46a137d9038e47e666a955b3b2a1b458365eeed76b004c0053f3b
605605
F src/whereexpr.c 36b47f7261d6b6f1a72d774c113b74beddf6745aba1018e64b196e29db233442
606606
F src/window.c df2456386e0b1553a8d1fcf3a0ddc4c058fe2c650ea8c74b6bf8862082ddafc9
607607
F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -1006,7 +1006,7 @@ F test/hook2.test b9ff3b8c6519fb67f33192f1afe86e7782ee4ac8
10061006
F test/icu.test 41aa8847745a879b897a7febea0f8f9efc8e67fe8bf680589b6e07c7b0a1569a
10071007
F test/ieee754.test 806fc0ce7f305f57e3331eaceeddcfec9339e607
10081008
F test/imposter1.test c3f1db2d3db2c24611a6596a3fc0ffc14f1466c8
1009-
F test/in.test 2fa2dfba1afe30eb830f327e7131dfadaa7a701d677de0eb65f9303d99e18fe0
1009+
F test/in.test 63933d7b71eed01a49df55541a73a75398302b50a05b5333f90481460a32ff49
10101010
F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
10111011
F test/in3.test 3cbf58c87f4052cee3a58b37b6389777505aa0c0
10121012
F test/in4.test d2b38cba404bc4320f4fe1b595b3d163f212c068
@@ -1645,7 +1645,7 @@ F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
16451645
F test/walslow.test c05c68d4dc2700a982f89133ce103a1a84cc285f
16461646
F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747
16471647
F test/walvfs.test c0faffda13d045a96dfc541347886bb1a3d6f3205857fc98e683edfab766ea88
1648-
F test/where.test 8215d220633f08da331781cf9ede7fb7aed50eb113473c10acd39a643fd258ba
1648+
F test/where.test 93738e224cd5e7819565a9f272c19fd0ee5893d9cd7f5238ce026bae09b8d710
16491649
F test/where2.test 478d2170637b9211f593120648858593bf2445a1
16501650
F test/where3.test 2341a294e17193a6b1699ea7f192124a5286ca6acfcc3f4b06d16c931fbcda2c
16511651
F test/where4.test 4a371bfcc607f41d233701bdec33ac2972908ba8
@@ -1675,7 +1675,7 @@ F test/win32heap.test 10fd891266bd00af68671e702317726375e5407561d859be1aa04696f2
16751675
F test/win32lock.test fbf107c91d8f5512be5a5b87c4c42ab9fdd54972
16761676
F test/win32longpath.test 169c75a3b2e43481f4a62122510210c67b08f26d
16771677
F test/win32nolock.test ac4f08811a562e45a5755e661f45ca85892bdbbc
1678-
F test/window1.test 2798c8249e0f122c9bacce6aa7324765a5cd9106e49e7aacc81f6033d281577b
1678+
F test/window1.test d141eba02ee4d7441dcb45148d776aded21992e8de6ddbbe2aae8151e5fad45e
16791679
F test/window2.tcl 9bfa842d8a62b0d36dc8c1b5972206393c43847433c6d75940b87fec93ce3143
16801680
F test/window2.test 8e6d2a1b9f54dfebee1cde961c8590cd87b4db45c50f44947a211e1b63c2a05e
16811681
F test/window3.tcl 577a3b1ff913208e5248c04dab9df17fd760ce159a752789e26d0cb4a5f91823
@@ -1804,11 +1804,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
18041804
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
18051805
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
18061806
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
1807-
P d5d944d7947d7b44ba9a1c844418af49c5f39dbe84f181af790bb1412daed578
1808-
R 2251df76230cd55e64293ef8a825ebab
1807+
P a21ffcd8176672e791c11e7d3869878b0655e9f7fb3646378421fb7480d4d8c6
1808+
R a79d07126ad692dd98c735ebc3ce8975
18091809
T +bgcolor * #d0c0ff
18101810
T +sym-release *
1811-
T +sym-version-3.27.1 *
1811+
T +sym-version-3.27.2 *
18121812
U drh
1813-
Z 4aa002629995b65b1d5f498ebad69e25
1813+
Z 1721b9485efb0ba623f21704b685d9c7
18141814
# Remove this line to create a well-formed manifest.

‎manifest.uuid‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0eca3dd3d38b31c92b49ca2d311128b74584714d9e7de895b1a6286ef959a1dd
1+
bd49a8271d650fa89e446b42e513b595a717b9212c91dd384aab871fc1d0f6d7

‎src/expr.c‎

Lines changed: 7 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2552,14 +2552,11 @@ int sqlite3FindInIndex(
25522552
eType = IN_INDEX_EPH;
25532553
if( inFlags & IN_INDEX_LOOP ){
25542554
pParse->nQueryLoop = 0;
2555-
if( pX->pLeft->iColumn<0 && !ExprHasProperty(pX, EP_xIsSelect) ){
2556-
eType = IN_INDEX_ROWID;
2557-
}
25582555
}else if( prRhsHasNull ){
25592556
*prRhsHasNull = rMayHaveNull = ++pParse->nMem;
25602557
}
25612558
assert( pX->op==TK_IN );
2562-
sqlite3CodeRhsOfIN(pParse, pX, iTab, eType==IN_INDEX_ROWID);
2559+
sqlite3CodeRhsOfIN(pParse, pX, iTab);
25632560
if( rMayHaveNull ){
25642561
sqlite3SetHasNullFlag(v, iTab, rMayHaveNull);
25652562
}
@@ -2660,12 +2657,6 @@ void sqlite3VectorErrorMsg(Parse *pParse, Expr *pExpr){
26602657
** however the cursor number returned might not be the same, as it might
26612658
** have been duplicated using OP_OpenDup.
26622659
**
2663-
** If parameter isRowid is non-zero, then LHS of the IN operator is guaranteed
2664-
** to be a non-null integer. In this case, the ephemeral table can be an
2665-
** table B-Tree that keyed by only integers. The more general cases uses
2666-
** an index B-Tree which can have arbitrary keys, but is slower to both
2667-
** read and write.
2668-
**
26692660
** If the LHS expression ("x" in the examples) is a column value, or
26702661
** the SELECT statement returns a column value, then the affinity of that
26712662
** column is used to build the index keys. If both 'x' and the
@@ -2677,8 +2668,7 @@ void sqlite3VectorErrorMsg(Parse *pParse, Expr *pExpr){
26772668
void sqlite3CodeRhsOfIN(
26782669
Parse *pParse, /* Parsing context */
26792670
Expr *pExpr, /* The IN operator */
2680-
int iTab, /* Use this cursor number */
2681-
int isRowid /* If true, LHS is a rowid */
2671+
int iTab /* Use this cursor number */
26822672
){
26832673
int addrOnce = 0; /* Address of the OP_Once instruction at top */
26842674
int addr; /* Address of OP_OpenEphemeral instruction */
@@ -2731,22 +2721,20 @@ void sqlite3CodeRhsOfIN(
27312721
/* Check to see if this is a vector IN operator */
27322722
pLeft = pExpr->pLeft;
27332723
nVal = sqlite3ExprVectorSize(pLeft);
2734-
assert( !isRowid || nVal==1 );
27352724

27362725
/* Construct the ephemeral table that will contain the content of
27372726
** RHS of the IN operator.
27382727
*/
27392728
pExpr->iTable = iTab;
2740-
addr = sqlite3VdbeAddOp2(v, OP_OpenEphemeral,
2741-
pExpr->iTable, (isRowid?0:nVal));
2729+
addr = sqlite3VdbeAddOp2(v, OP_OpenEphemeral, pExpr->iTable, nVal);
27422730
#ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS
27432731
if( ExprHasProperty(pExpr, EP_xIsSelect) ){
27442732
VdbeComment((v, "Result of SELECT %u", pExpr->x.pSelect->selId));
27452733
}else{
27462734
VdbeComment((v, "RHS of IN operator"));
27472735
}
27482736
#endif
2749-
pKeyInfo = isRowid ? 0 : sqlite3KeyInfoAlloc(pParse->db, nVal, 1);
2737+
pKeyInfo = sqlite3KeyInfoAlloc(pParse->db, nVal, 1);
27502738

27512739
if( ExprHasProperty(pExpr, EP_xIsSelect) ){
27522740
/* Case 1: expr IN (SELECT ...)
@@ -2760,7 +2748,6 @@ void sqlite3CodeRhsOfIN(
27602748
ExplainQueryPlan((pParse, 1, "%sLIST SUBQUERY %d",
27612749
addrOnce?"":"CORRELATED ", pSelect->selId
27622750
));
2763-
assert( !isRowid );
27642751
/* If the LHS and RHS of the IN operator do not match, that
27652752
** error will have been caught long before we reach this point. */
27662753
if( ALWAYS(pEList->nExpr==nVal) ){
@@ -2813,10 +2800,8 @@ void sqlite3CodeRhsOfIN(
28132800
/* Loop through each expression in <exprlist>. */
28142801
r1 = sqlite3GetTempReg(pParse);
28152802
r2 = sqlite3GetTempReg(pParse);
2816-
if( isRowid ) sqlite3VdbeAddOp4(v, OP_Blob, 0, r2, 0, "", P4_STATIC);
28172803
for(i=pList->nExpr, pItem=pList->a; i>0; i--, pItem++){
28182804
Expr *pE2 = pItem->pExpr;
2819-
int iValToIns;
28202805

28212806
/* If the expression is not constant then we will need to
28222807
** disable the test that was generated above that makes sure
@@ -2829,20 +2814,9 @@ void sqlite3CodeRhsOfIN(
28292814
}
28302815

28312816
/* Evaluate the expression and insert it into the temp table */
2832-
if( isRowid && sqlite3ExprIsInteger(pE2, &iValToIns) ){
2833-
sqlite3VdbeAddOp3(v, OP_InsertInt, iTab, r2, iValToIns);
2834-
}else{
2835-
r3 = sqlite3ExprCodeTarget(pParse, pE2, r1);
2836-
if( isRowid ){
2837-
sqlite3VdbeAddOp2(v, OP_MustBeInt, r3,
2838-
sqlite3VdbeCurrentAddr(v)+2);
2839-
VdbeCoverage(v);
2840-
sqlite3VdbeAddOp3(v, OP_Insert, iTab, r2, r3);
2841-
}else{
2842-
sqlite3VdbeAddOp4(v, OP_MakeRecord, r3, 1, r2, &affinity, 1);
2843-
sqlite3VdbeAddOp4Int(v, OP_IdxInsert, iTab, r2, r3, 1);
2844-
}
2845-
}
2817+
r3 = sqlite3ExprCodeTarget(pParse, pE2, r1);
2818+
sqlite3VdbeAddOp4(v, OP_MakeRecord, r3, 1, r2, &affinity, 1);
2819+
sqlite3VdbeAddOp4Int(v, OP_IdxInsert, iTab, r2, r3, 1);
28462820
}
28472821
sqlite3ReleaseTempReg(pParse, r1);
28482822
sqlite3ReleaseTempReg(pParse, r2);

‎src/insert.c‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1919,10 +1919,13 @@ void sqlite3CompleteInsertion(
19191919
pik_flags |= (update_flags & OPFLAG_SAVEPOSITION);
19201920
#ifdef SQLITE_ENABLE_PREUPDATE_HOOK
19211921
if( update_flags==0 ){
1922-
sqlite3VdbeAddOp4(v, OP_InsertInt,
1923-
iIdxCur+i, aRegIdx[i], 0, (char*)pTab, P4_TABLE
1922+
int r = sqlite3GetTempReg(pParse);
1923+
sqlite3VdbeAddOp2(v, OP_Integer, 0, r);
1924+
sqlite3VdbeAddOp4(v, OP_Insert,
1925+
iIdxCur+i, aRegIdx[i], r, (char*)pTab, P4_TABLE
19241926
);
19251927
sqlite3VdbeChangeP5(v, OPFLAG_ISNOOP);
1928+
sqlite3ReleaseTempReg(pParse, r);
19261929
}
19271930
#endif
19281931
}

‎src/resolve.c‎

Lines changed: 36 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,6 +1243,38 @@ int sqlite3ResolveOrderGroupBy(
12431243
return 0;
12441244
}
12451245

1246+
#ifndef SQLITE_OMIT_WINDOWFUNC
1247+
/*
1248+
** Walker callback for resolveRemoveWindows().
1249+
*/
1250+
static int resolveRemoveWindowsCb(Walker *pWalker, Expr *pExpr){
1251+
if( ExprHasProperty(pExpr, EP_WinFunc) ){
1252+
Window **pp;
1253+
for(pp=&pWalker->u.pSelect->pWin; *pp; pp=&(*pp)->pNextWin){
1254+
if( *pp==pExpr->y.pWin ){
1255+
*pp = (*pp)->pNextWin;
1256+
break;
1257+
}
1258+
}
1259+
}
1260+
return WRC_Continue;
1261+
}
1262+
1263+
/*
1264+
** Remove any Window objects owned by the expression pExpr from the
1265+
** Select.pWin list of Select object pSelect.
1266+
*/
1267+
static void resolveRemoveWindows(Select *pSelect, Expr *pExpr){
1268+
Walker sWalker;
1269+
memset(&sWalker, 0, sizeof(Walker));
1270+
sWalker.xExprCallback = resolveRemoveWindowsCb;
1271+
sWalker.u.pSelect = pSelect;
1272+
sqlite3WalkExpr(&sWalker, pExpr);
1273+
}
1274+
#else
1275+
# define resolveRemoveWindows(x,y)
1276+
#endif
1277+
12461278
/*
12471279
** pOrderBy is an ORDER BY or GROUP BY clause in SELECT statement pSelect.
12481280
** The Name context of the SELECT statement is pNC. zType is either
@@ -1309,19 +1341,10 @@ static int resolveOrderGroupBy(
13091341
}
13101342
for(j=0; j<pSelect->pEList->nExpr; j++){
13111343
if( sqlite3ExprCompare(0, pE, pSelect->pEList->a[j].pExpr, -1)==0 ){
1312-
#ifndef SQLITE_OMIT_WINDOWFUNC
1313-
if( ExprHasProperty(pE, EP_WinFunc) ){
1314-
/* Since this window function is being changed into a reference
1315-
** to the same window function the result set, remove the instance
1316-
** of this window function from the Select.pWin list. */
1317-
Window **pp;
1318-
for(pp=&pSelect->pWin; *pp; pp=&(*pp)->pNextWin){
1319-
if( *pp==pE->y.pWin ){
1320-
*pp = (*pp)->pNextWin;
1321-
}
1322-
}
1323-
}
1324-
#endif
1344+
/* Since this expresion is being changed into a reference
1345+
** to an identical expression in the result set, remove all Window
1346+
** objects belonging to the expression from the Select.pWin list. */
1347+
resolveRemoveWindows(pSelect, pE);
13251348
pItem->u.x.iOrderByCol = j+1;
13261349
}
13271350
}

‎src/sqlite.h.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2369,7 +2369,7 @@ int sqlite3_changes(sqlite3*);
23692369
** not. ^Changes to a view that are intercepted by INSTEAD OF triggers
23702370
** are not counted.
23712371
**
2372-
** This the [sqlite3_total_changes(D)] interface only reports the number
2372+
** The [sqlite3_total_changes(D)] interface only reports the number
23732373
** of rows that changed due to SQL statement run against database
23742374
** connection D. Any changes by other database connections are ignored.
23752375
** To detect changes against a database file from other database

0 commit comments

Comments
 (0)