From 01dced109f78e8fd1eb5c20e57686717cd378e95 Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 20 Aug 2015 16:16:37 +0000 Subject: [PATCH 1/9] Fix a typo in series.c. FossilOrigin-Name: 23db7f50f14801c2cf56c006d7c7f593908b7158 --- ext/misc/series.c | 2 +- manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ext/misc/series.c b/ext/misc/series.c index 43de3b711b..645ddeab15 100644 --- a/ext/misc/series.c +++ b/ext/misc/series.c @@ -76,7 +76,7 @@ SQLITE_EXTENSION_INIT1 #ifndef SQLITE_OMIT_VIRTUALTABLE -/* series_cursor is a subclas of sqlite3_vtab_cursor which will +/* series_cursor is a subclass of sqlite3_vtab_cursor which will ** serve as the underlying representation of a cursor that scans ** over rows of the result */ diff --git a/manifest b/manifest index 38f503e8f1..ab8f0ade60 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\seponymous\svirtual\stables\sso\sthat\sthey\sdo\snot\sautomatically\smake\sthe\sfirst\ncolumn\sthe\srowid.\s\sEnhance\sthe\sgenerate_series\svirtual\stable\sto\ssupport\srowid. -D 2015-08-19T19:01:28.078 +C Fix\sa\stypo\sin\sseries.c. +D 2015-08-20T16:16:37.345 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 4f663b6b4954b9b1eb0e6f08387688a93b57542d F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -196,7 +196,7 @@ F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342 F ext/misc/percentile.c bcbee3c061b884eccb80e21651daaae8e1e43c63 F ext/misc/regexp.c af92cdaa5058fcec1451e49becc7ba44dba023dc F ext/misc/rot13.c 1ac6f95f99b575907b9b09c81a349114cf9be45a -F ext/misc/series.c 5b84c6584af085b55ae07e2ee7b133b6db03e323 +F ext/misc/series.c e9b658e442090f75ae01bbf4924feb52a759674c F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52 F ext/misc/spellfix.c 86998fb73aefb7b5dc346ba8a58912f312da4996 F ext/misc/totype.c 4a167594e791abeed95e0a8db028822b5e8fe512 @@ -1376,7 +1376,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P fef44c37f31ca9fd7891cecdbe95cc46a987067b -R a41603407a6c0b327e60b148f02b0042 -U drh -Z aa56d5c64521b30a9993ce3328198562 +P a325a08599759471047e234ef9cfcc3cb110aafd +R c7d0daf8fbeee011c3f976b2caec6772 +U dan +Z e8e4b80135954d12498e194483d7037d diff --git a/manifest.uuid b/manifest.uuid index 8d7098b5e3..f79d828421 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a325a08599759471047e234ef9cfcc3cb110aafd \ No newline at end of file +23db7f50f14801c2cf56c006d7c7f593908b7158 \ No newline at end of file From cbd8db35f58c647f63ae05d153a148efb4ed8ef3 Mon Sep 17 00:00:00 2001 From: drh Date: Thu, 20 Aug 2015 17:18:32 +0000 Subject: [PATCH 2/9] Make SQLITE_BUSY_SNAPSHOT and SQLITE_BUSY_RECOVERY retryable, just as a plain SQLITE_BUSY is. FossilOrigin-Name: fd13dd950d99fd1996860f7a5f220fdc89180194 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/vdbe.c | 8 +++++--- src/vdbeapi.c | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index f60e23602b..f61e06cf6d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Simplification\sto\serror\shandling\sin\saddModuleArgument()\sin\sthe\svirtual\stable\nprocessing. -D 2015-08-19T12:45:57.389 +C Make\sSQLITE_BUSY_SNAPSHOT\sand\sSQLITE_BUSY_RECOVERY\sretryable,\sjust\sas\sa\splain\nSQLITE_BUSY\sis. +D 2015-08-20T17:18:32.370 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2fc9ca6bf5949d415801c007ed3004a4bdb7c380 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -398,10 +398,10 @@ F src/update.c 487747b328b7216bb7f6af0695d6937d5c9e605f F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c F src/util.c bc9dd64b5db544218b871b66243871c202b2781f F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701 -F src/vdbe.c 2ab1decd98925f8cd846993dde9dccaa69cdf0ef +F src/vdbe.c 6d85be995bd2308a5aa2a68c7b564c5d4cc1a6fb F src/vdbe.h 7a75045d879118b9d3af7e8b3c108f2f27c51473 F src/vdbeInt.h 8b54e01ad0463590e7cffabce0bc36da9ee4f816 -F src/vdbeapi.c adabbd66eb2e3a10f3998485ee0be7e326d06ee4 +F src/vdbeapi.c bda74ef4b5103d7b4a4be36f936d3cf2b56a7d6f F src/vdbeaux.c af2d86b2b114a106c94fc656503fc5c89594f5af F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90 F src/vdbemem.c ae38a0d35ae71cf604381a887c170466ba518090 @@ -1374,7 +1374,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P dec14a3980dcf6c61b0b9ac4ba82fa963ac346d4 -R 9e79c5c3619781e4dd0837447f8e7872 +P c573b0a1aa3ba509234f07520fa94d008bcbb330 +R 1e0943db53cafa4eb98e44dc50fad14a U drh -Z 95e599ba5e8b06b741ae2fef900bf405 +Z 77fc4debeb34981fd43290820f00ea8a diff --git a/manifest.uuid b/manifest.uuid index 78e94e2abc..4bc18f7bdf 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c573b0a1aa3ba509234f07520fa94d008bcbb330 \ No newline at end of file +fd13dd950d99fd1996860f7a5f220fdc89180194 \ No newline at end of file diff --git a/src/vdbe.c b/src/vdbe.c index f9c988cdf7..2c0034cf64 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -571,7 +571,7 @@ int sqlite3VdbeExec( ** sqlite3_column_text16() failed. */ goto no_mem; } - assert( p->rc==SQLITE_OK || p->rc==SQLITE_BUSY ); + assert( p->rc==SQLITE_OK || (p->rc&0xff)==SQLITE_BUSY ); assert( p->bIsReader || p->readOnly!=0 ); p->rc = SQLITE_OK; p->iCurrentTime = 0; @@ -3085,9 +3085,11 @@ case OP_Transaction: { if( pBt ){ rc = sqlite3BtreeBeginTrans(pBt, pOp->p2); - if( rc==SQLITE_BUSY ){ + testcase( rc==SQLITE_BUSY_SNAPSHOT ); + testcase( rc==SQLITE_BUSY_RECOVERY ); + if( (rc&0xff)==SQLITE_BUSY ){ p->pc = (int)(pOp - aOp); - p->rc = rc = SQLITE_BUSY; + p->rc = rc; goto vdbe_return; } if( rc!=SQLITE_OK ){ diff --git a/src/vdbeapi.c b/src/vdbeapi.c index ebd5ef29a2..15a8bba0d4 100644 --- a/src/vdbeapi.c +++ b/src/vdbeapi.c @@ -611,7 +611,7 @@ end_of_step: ** were called on statement p. */ assert( rc==SQLITE_ROW || rc==SQLITE_DONE || rc==SQLITE_ERROR - || rc==SQLITE_BUSY || rc==SQLITE_MISUSE + || (rc&0xff)==SQLITE_BUSY || rc==SQLITE_MISUSE ); assert( (p->rc!=SQLITE_ROW && p->rc!=SQLITE_DONE) || p->rc==p->rcApp ); if( p->isPrepareV2 && rc!=SQLITE_ROW && rc!=SQLITE_DONE ){ From b81fba193079eb6276b3fc94849d847b47c5544e Mon Sep 17 00:00:00 2001 From: drh Date: Thu, 20 Aug 2015 18:28:46 +0000 Subject: [PATCH 3/9] Prevent the series.c extension from loading on older versions of SQLite that do not support xCreate==NULL. FossilOrigin-Name: 3efc79427ef4686142d074cfe5b2f0a33af19b2e --- ext/misc/series.c | 5 +++++ manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ext/misc/series.c b/ext/misc/series.c index 645ddeab15..892426bacb 100644 --- a/ext/misc/series.c +++ b/ext/misc/series.c @@ -389,6 +389,11 @@ int sqlite3_series_init( int rc = SQLITE_OK; SQLITE_EXTENSION_INIT2(pApi); #ifndef SQLITE_OMIT_VIRTUALTABLE + if( sqlite3_libversion_number()<3008012 ){ + *pzErrMsg = sqlite3_mprintf( + "generate_series() requires SQLite 3.8.12 or later"); + return SQLITE_ERROR; + } rc = sqlite3_create_module(db, "generate_series", &seriesModule, 0); #endif return rc; diff --git a/manifest b/manifest index ab8f0ade60..4b88941c4f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\stypo\sin\sseries.c. -D 2015-08-20T16:16:37.345 +C Prevent\sthe\sseries.c\sextension\sfrom\sloading\son\solder\sversions\sof\sSQLite\sthat\ndo\snot\ssupport\sxCreate==NULL. +D 2015-08-20T18:28:46.970 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 4f663b6b4954b9b1eb0e6f08387688a93b57542d F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -196,7 +196,7 @@ F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342 F ext/misc/percentile.c bcbee3c061b884eccb80e21651daaae8e1e43c63 F ext/misc/regexp.c af92cdaa5058fcec1451e49becc7ba44dba023dc F ext/misc/rot13.c 1ac6f95f99b575907b9b09c81a349114cf9be45a -F ext/misc/series.c e9b658e442090f75ae01bbf4924feb52a759674c +F ext/misc/series.c 610bf80e8e85bedf3588907476d4dc2a8cdd013c F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52 F ext/misc/spellfix.c 86998fb73aefb7b5dc346ba8a58912f312da4996 F ext/misc/totype.c 4a167594e791abeed95e0a8db028822b5e8fe512 @@ -1376,7 +1376,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P a325a08599759471047e234ef9cfcc3cb110aafd -R c7d0daf8fbeee011c3f976b2caec6772 -U dan -Z e8e4b80135954d12498e194483d7037d +P 23db7f50f14801c2cf56c006d7c7f593908b7158 +R d99fb6b924c5803dd958720cff95849c +U drh +Z a0d63a9f28ce5db0938546bd2b7f7c87 diff --git a/manifest.uuid b/manifest.uuid index f79d828421..e9329d72f7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -23db7f50f14801c2cf56c006d7c7f593908b7158 \ No newline at end of file +3efc79427ef4686142d074cfe5b2f0a33af19b2e \ No newline at end of file From d10dbad5e1e0a516b6fa0fcf9419fc92d71165af Mon Sep 17 00:00:00 2001 From: drh Date: Thu, 20 Aug 2015 20:13:37 +0000 Subject: [PATCH 4/9] Correctly handle empty function argument lists on table-valued functions. FossilOrigin-Name: a7acc7878b8bb8e27a0da67b2dbb7bd51df4859b --- manifest | 17 ++++++++--------- manifest.uuid | 2 +- src/build.c | 2 +- src/resolve.c | 8 +++++--- test/tabfunc01.test | 5 +++++ 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/manifest b/manifest index 3adf504c43..dddec336ba 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\ssupport\sfor\stable-valued\sfunctions\sin\sthe\sFROM\sclause\simplemented\sas\nvirtual\stables. -D 2015-08-20T19:55:58.980 +C Correctly\shandle\sempty\sfunction\sargument\slists\son\stable-valued\sfunctions. +D 2015-08-20T20:13:37.543 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 4f663b6b4954b9b1eb0e6f08387688a93b57542d F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -281,7 +281,7 @@ F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79 F src/btree.c f48b3ef91676c06a90a8832987ecef6b94c931ee F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1 F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0 -F src/build.c 16051071cd855c23e47b087b49ac99c65b1d8c39 +F src/build.c 2a2fd9547c06a71d0e83484acc22f1485f0e731b F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0 F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b @@ -334,7 +334,7 @@ F src/pragma.h 631a91c8b0e6ca8f051a1d8a4a0da4150e04620a F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1 F src/printf.c 2bc439ff20a4aad0e0ad50a37a67b5eae7d20edc F src/random.c ba2679f80ec82c4190062d756f22d0c358180696 -F src/resolve.c bbb4874decae6e60eee0395a31205d3b55cd2c00 +F src/resolve.c 1103be495dddaae9378626a484d5d350fcb9d5fa F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e F src/select.c c46de38c1b66355f02a839bb72eb13f277e6d19c F src/shell.c b1f91e60918df3a68efad1e3a11696b9a7e23d23 @@ -1031,7 +1031,7 @@ F test/superlock.test 1cde669f68d2dd37d6c9bd35eee1d95491ae3fc2 F test/sync.test a34cd43e98b7fb84eabbf38f7ed8f7349b3f3d85 F test/syscall.test d2fdaad713f103ac611fe7ef9b724c7b69f8149c F test/sysfault.test fa776e60bf46bdd3ae69f0b73e46ee3977a58ae6 -F test/tabfunc01.test 61d185dde74aa2ff70085d33bc5f9a0ce8d6a318 +F test/tabfunc01.test ae7f4e5b67edbb423e63efeee37d672bb61d5a07 F test/table.test 33bf0d1fd07f304582695184b8e6feb017303816 F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126 F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930 @@ -1376,8 +1376,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P fd13dd950d99fd1996860f7a5f220fdc89180194 3efc79427ef4686142d074cfe5b2f0a33af19b2e -R ed28318b8329f2834aba92a570f623d2 -T +closed 3efc79427ef4686142d074cfe5b2f0a33af19b2e +P 9b718b06b156163ae34115b6c5f6d163a7ee7cc3 +R 2b816e99c82340667135ddd4e70a16fb U drh -Z 557e316b28e61ca6cba28c2e6c7085e1 +Z d3ffbc216692d7d7c440600b0a1b96fc diff --git a/manifest.uuid b/manifest.uuid index 194a0d685f..54608e6e14 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9b718b06b156163ae34115b6c5f6d163a7ee7cc3 \ No newline at end of file +a7acc7878b8bb8e27a0da67b2dbb7bd51df4859b \ No newline at end of file diff --git a/src/build.c b/src/build.c index 96dc03a825..6a5b50b0db 100644 --- a/src/build.c +++ b/src/build.c @@ -3802,7 +3802,7 @@ void sqlite3SrcListIndexedBy(Parse *pParse, SrcList *p, Token *pIndexedBy){ ** table-valued-function. */ void sqlite3SrcListFuncArgs(Parse *pParse, SrcList *p, ExprList *pList){ - if( p && ALWAYS(p->nSrc>0) ){ + if( p && ALWAYS(p->nSrc>0) && pList ){ struct SrcList_item *pItem = &p->a[p->nSrc-1]; assert( pItem->fg.notIndexed==0 ); assert( pItem->fg.isIndexedBy==0 ); diff --git a/src/resolve.c b/src/resolve.c index 72d5f319c1..9799a136b9 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -1451,9 +1451,11 @@ int sqlite3ResolveExprListNames( NameContext *pNC, /* Namespace to resolve expressions in. */ ExprList *pList /* The expression list to be analyzed. */ ){ - int i; - for(i=0; inExpr; i++){ - if( sqlite3ResolveExprNames(pNC, pList->a[i].pExpr) ) return WRC_Abort; + if( pList ){ + int i; + for(i=0; inExpr; i++){ + if( sqlite3ResolveExprNames(pNC, pList->a[i].pExpr) ) return WRC_Abort; + } } return WRC_Continue; } diff --git a/test/tabfunc01.test b/test/tabfunc01.test index 8897893197..b3711baea0 100644 --- a/test/tabfunc01.test +++ b/test/tabfunc01.test @@ -61,4 +61,9 @@ do_execsql_test tabfunc01-2.1 { SELECT *, '|' FROM t1, generate_series(1,x) ORDER BY 1, 2 } {2 1 | 2 2 | 3 1 | 3 2 | 3 3 |} +do_execsql_test tabfunc01-2.2 { + SELECT * FROM generate_series() LIMIT 5; +} {0 1 2 3 4} + + finish_test From bc63ec1d6255065472e573d7fb3fea2288561280 Mon Sep 17 00:00:00 2001 From: mistachkin Date: Thu, 20 Aug 2015 20:21:06 +0000 Subject: [PATCH 5/9] Fix stray variable declaration for C89. FossilOrigin-Name: 17eb7f18cb76170e109977a94b259b763cd86c47 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/build.c | 3 ++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index dddec336ba..36b071cdc0 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Correctly\shandle\sempty\sfunction\sargument\slists\son\stable-valued\sfunctions. -D 2015-08-20T20:13:37.543 +C Fix\sstray\svariable\sdeclaration\sfor\sC89. +D 2015-08-20T20:21:06.528 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 4f663b6b4954b9b1eb0e6f08387688a93b57542d F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -281,7 +281,7 @@ F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79 F src/btree.c f48b3ef91676c06a90a8832987ecef6b94c931ee F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1 F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0 -F src/build.c 2a2fd9547c06a71d0e83484acc22f1485f0e731b +F src/build.c 733a7b19f2c467775d5997d8467ce3677d2c8cc6 F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0 F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b @@ -1376,7 +1376,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 9b718b06b156163ae34115b6c5f6d163a7ee7cc3 -R 2b816e99c82340667135ddd4e70a16fb -U drh -Z d3ffbc216692d7d7c440600b0a1b96fc +P a7acc7878b8bb8e27a0da67b2dbb7bd51df4859b +R ab9999ab7b4e03861512ce91d476cfe4 +U mistachkin +Z 6bb10870cccae9f7d2b7bc147f067428 diff --git a/manifest.uuid b/manifest.uuid index 54608e6e14..eec676b836 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a7acc7878b8bb8e27a0da67b2dbb7bd51df4859b \ No newline at end of file +17eb7f18cb76170e109977a94b259b763cd86c47 \ No newline at end of file diff --git a/src/build.c b/src/build.c index 6a5b50b0db..5f8bf8488f 100644 --- a/src/build.c +++ b/src/build.c @@ -355,6 +355,7 @@ Table *sqlite3LocateTable( p = sqlite3FindTable(pParse->db, zName, zDbase); if( p==0 ){ + const char *zMsg; #ifndef SQLITE_OMIT_VIRTUAL_TABLE /* If zName is the not the name of a table in the schema created using ** CREATE, then check to see if it is the name of an virtual table that @@ -364,7 +365,7 @@ Table *sqlite3LocateTable( return pMod->pEpoTab; } #endif - const char *zMsg = isView ? "no such view" : "no such table"; + zMsg = isView ? "no such view" : "no such table"; if( zDbase ){ sqlite3ErrorMsg(pParse, "%s: %s.%s", zMsg, zDbase, zName); }else{ From 1abbe28884026f6311b18c30ca5a780fec5d0261 Mon Sep 17 00:00:00 2001 From: mistachkin Date: Thu, 20 Aug 2015 21:09:32 +0000 Subject: [PATCH 6/9] Fix compiler warnings in the sqldiff tool seen with MSVC. FossilOrigin-Name: 072279d458fbb74a812a9ee723041d6b7c662a88 --- manifest | 15 +++++++++------ manifest.uuid | 2 +- tool/sqldiff.c | 18 +++++++++++------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/manifest b/manifest index 36b071cdc0..297a655bf5 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sstray\svariable\sdeclaration\sfor\sC89. -D 2015-08-20T20:21:06.528 +C Fix\scompiler\swarnings\sin\sthe\ssqldiff\stool\sseen\swith\sMSVC. +D 2015-08-20T21:09:32.725 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 4f663b6b4954b9b1eb0e6f08387688a93b57542d F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -1365,7 +1365,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c -F tool/sqldiff.c a6988cc6e10e08662d73df28538df43b01dc371e +F tool/sqldiff.c b318efc2eaf7a7fac4d281a0ce736193cb2506df F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43 F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d F tool/symbols.sh fec58532668296d7c7dc48be9c87f75ccdb5814f @@ -1376,7 +1376,10 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P a7acc7878b8bb8e27a0da67b2dbb7bd51df4859b -R ab9999ab7b4e03861512ce91d476cfe4 +P 17eb7f18cb76170e109977a94b259b763cd86c47 +R 104bda6f56c91429ce0a720bb365ee76 +T *branch * msvcWarn +T *sym-msvcWarn * +T -sym-trunk * U mistachkin -Z 6bb10870cccae9f7d2b7bc147f067428 +Z 3c2642f645417b50de6b6b4d431a1560 diff --git a/manifest.uuid b/manifest.uuid index eec676b836..60c52a42f8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -17eb7f18cb76170e109977a94b259b763cd86c47 \ No newline at end of file +072279d458fbb74a812a9ee723041d6b7c662a88 \ No newline at end of file diff --git a/tool/sqldiff.c b/tool/sqldiff.c index 3a5c4e4f7c..9f0b705c40 100644 --- a/tool/sqldiff.c +++ b/tool/sqldiff.c @@ -810,9 +810,9 @@ static void hash_init(hash *pHash, const char *z){ */ static void hash_next(hash *pHash, int c){ u16 old = pHash->z[pHash->i]; - pHash->z[pHash->i] = c; + pHash->z[pHash->i] = (char)c; pHash->i = (pHash->i+1)&(NHASH-1); - pHash->a = pHash->a - old + c; + pHash->a = pHash->a - old + (char)c; pHash->b = pHash->b - NHASH*old + pHash->a; } @@ -849,7 +849,7 @@ static void putInt(unsigned int v, char **pz){ */ static int digit_count(int v){ unsigned int i, x; - for(i=1, x=64; v>=x; i++, x <<= 6){} + for(i=1, x=64; (unsigned int)v>=x; i++, x <<= 6){} return i; } @@ -956,7 +956,7 @@ static int rbuDeltaCreate( unsigned int lenOut, /* Length of the target file */ char *zDelta /* Write the delta into this buffer */ ){ - int i, base; + unsigned int i, base; char *zOrigDelta = zDelta; hash h; int nHash; /* Number of hash table entries */ @@ -1005,7 +1005,7 @@ static int rbuDeltaCreate( base = 0; /* We have already generated everything before zOut[base] */ while( base+NHASH Date: Thu, 20 Aug 2015 21:14:31 +0000 Subject: [PATCH 7/9] Skip calling the virtual table xDestroy method when it is null. FossilOrigin-Name: b73ad305a6b7cb84fe0a1efb334b8e4592e21c40 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/vtab.c | 4 +++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 36b071cdc0..3c5d640edd 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sstray\svariable\sdeclaration\sfor\sC89. -D 2015-08-20T20:21:06.528 +C Skip\scalling\sthe\svirtual\stable\sxDestroy\smethod\swhen\sit\sis\snull. +D 2015-08-20T21:14:31.239 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 4f663b6b4954b9b1eb0e6f08387688a93b57542d F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -408,7 +408,7 @@ F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90 F src/vdbemem.c ae38a0d35ae71cf604381a887c170466ba518090 F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0 -F src/vtab.c 05395350f947ec0b1af25e8502b9cfec84f17ea7 +F src/vtab.c ab36813224d5551cb60f87f3c7e58e0b32541e12 F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb F src/wal.c 6fb6b68969e4692593c2552c4e7bff5882de2cb8 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4 @@ -1376,7 +1376,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P a7acc7878b8bb8e27a0da67b2dbb7bd51df4859b -R ab9999ab7b4e03861512ce91d476cfe4 +P 17eb7f18cb76170e109977a94b259b763cd86c47 +R 25130809f3babeec0691a193d02e4069 U mistachkin -Z 6bb10870cccae9f7d2b7bc147f067428 +Z f2d173175579a2040d53483e92ff71ba diff --git a/manifest.uuid b/manifest.uuid index eec676b836..fda47be90f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -17eb7f18cb76170e109977a94b259b763cd86c47 \ No newline at end of file +b73ad305a6b7cb84fe0a1efb334b8e4592e21c40 \ No newline at end of file diff --git a/src/vtab.c b/src/vtab.c index fca8170d22..8042e0e7bd 100644 --- a/src/vtab.c +++ b/src/vtab.c @@ -801,6 +801,7 @@ int sqlite3VtabCallDestroy(sqlite3 *db, int iDb, const char *zTab){ pTab = sqlite3FindTable(db, zTab, db->aDb[iDb].zName); if( ALWAYS(pTab!=0 && pTab->pVTable!=0) ){ VTable *p; + int (*xDestroy)(sqlite3_vtab *); for(p=pTab->pVTable; p; p=p->pNext){ assert( p->pVtab ); if( p->pVtab->nRef>0 ){ @@ -808,7 +809,8 @@ int sqlite3VtabCallDestroy(sqlite3 *db, int iDb, const char *zTab){ } } p = vtabDisconnectAll(db, pTab); - rc = p->pMod->pModule->xDestroy(p->pVtab); + xDestroy = p->pMod->pModule->xDestroy; + rc = xDestroy ? xDestroy(p->pVtab) : SQLITE_OK; /* Remove the sqlite3_vtab* from the aVTrans[] array, if applicable */ if( rc==SQLITE_OK ){ assert( pTab->pVTable==p && p->pNext==0 ); From d8b1bfc6bf2f9463c1dfc27e7c52e9207b291145 Mon Sep 17 00:00:00 2001 From: drh Date: Thu, 20 Aug 2015 23:21:34 +0000 Subject: [PATCH 8/9] Fix corner-case memory management issues in table-valued functions. Change virtual table handling so that if xDestroy is missing the table is eponymous only even if xCreate is present. FossilOrigin-Name: 774e6a14b124bbae4da0e188b62aee9ffb8c3745 --- ext/misc/series.c | 13 ++++++++----- manifest | 24 ++++++++++++------------ manifest.uuid | 2 +- src/build.c | 7 ++++--- src/resolve.c | 9 ++++----- src/vtab.c | 11 ++++++----- src/whereexpr.c | 2 +- test/tabfunc01.test | 2 +- 8 files changed, 37 insertions(+), 33 deletions(-) diff --git a/ext/misc/series.c b/ext/misc/series.c index 892426bacb..21f95ccb74 100644 --- a/ext/misc/series.c +++ b/ext/misc/series.c @@ -112,8 +112,7 @@ static int seriesConnect( char **pzErr ){ sqlite3_vtab *pNew; - pNew = *ppVtab = sqlite3_malloc( sizeof(*pNew) ); - if( pNew==0 ) return SQLITE_NOMEM; + int rc; /* Column numbers */ #define SERIES_COLUMN_VALUE 0 @@ -121,10 +120,14 @@ static int seriesConnect( #define SERIES_COLUMN_STOP 2 #define SERIES_COLUMN_STEP 3 - sqlite3_declare_vtab(db, + rc = sqlite3_declare_vtab(db, "CREATE TABLE x(value,start hidden,stop hidden,step hidden)"); - memset(pNew, 0, sizeof(*pNew)); - return SQLITE_OK; + if( rc==SQLITE_OK ){ + pNew = *ppVtab = sqlite3_malloc( sizeof(*pNew) ); + if( pNew==0 ) return SQLITE_NOMEM; + memset(pNew, 0, sizeof(*pNew)); + } + return rc; } /* diff --git a/manifest b/manifest index 3c5d640edd..06e7ddf3f5 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Skip\scalling\sthe\svirtual\stable\sxDestroy\smethod\swhen\sit\sis\snull. -D 2015-08-20T21:14:31.239 +C Fix\scorner-case\smemory\smanagement\sissues\sin\stable-valued\sfunctions.\s\sChange\nvirtual\stable\shandling\sso\sthat\sif\sxDestroy\sis\smissing\sthe\stable\sis\neponymous\sonly\seven\sif\sxCreate\sis\spresent. +D 2015-08-20T23:21:34.475 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 4f663b6b4954b9b1eb0e6f08387688a93b57542d F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -196,7 +196,7 @@ F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342 F ext/misc/percentile.c bcbee3c061b884eccb80e21651daaae8e1e43c63 F ext/misc/regexp.c af92cdaa5058fcec1451e49becc7ba44dba023dc F ext/misc/rot13.c 1ac6f95f99b575907b9b09c81a349114cf9be45a -F ext/misc/series.c 610bf80e8e85bedf3588907476d4dc2a8cdd013c +F ext/misc/series.c 6f94daf590d0668187631dee2a4d7e1d8f3095c3 F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52 F ext/misc/spellfix.c 86998fb73aefb7b5dc346ba8a58912f312da4996 F ext/misc/totype.c 4a167594e791abeed95e0a8db028822b5e8fe512 @@ -281,7 +281,7 @@ F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79 F src/btree.c f48b3ef91676c06a90a8832987ecef6b94c931ee F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1 F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0 -F src/build.c 733a7b19f2c467775d5997d8467ce3677d2c8cc6 +F src/build.c 0ebd9d21500311ff4b7df52fe927e5f235ad1867 F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0 F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b @@ -334,7 +334,7 @@ F src/pragma.h 631a91c8b0e6ca8f051a1d8a4a0da4150e04620a F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1 F src/printf.c 2bc439ff20a4aad0e0ad50a37a67b5eae7d20edc F src/random.c ba2679f80ec82c4190062d756f22d0c358180696 -F src/resolve.c 1103be495dddaae9378626a484d5d350fcb9d5fa +F src/resolve.c 02e2c9ed5f45a22d41e799739c17b770dbb31866 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e F src/select.c c46de38c1b66355f02a839bb72eb13f277e6d19c F src/shell.c b1f91e60918df3a68efad1e3a11696b9a7e23d23 @@ -408,7 +408,7 @@ F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90 F src/vdbemem.c ae38a0d35ae71cf604381a887c170466ba518090 F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0 -F src/vtab.c ab36813224d5551cb60f87f3c7e58e0b32541e12 +F src/vtab.c d31174e4c8f592febab3fa7f69e18320b4fd657a F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb F src/wal.c 6fb6b68969e4692593c2552c4e7bff5882de2cb8 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4 @@ -416,7 +416,7 @@ F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba F src/where.c 66518a14a1238611aa0744d6980b6b7f544f4816 F src/whereInt.h 880a8599226ac1c00203490d934f3ed79b292572 F src/wherecode.c 69f19535a6de0cceb10e16b31a3a03463e31bc24 -F src/whereexpr.c 6332ade8f72beebb6438734e92757da4631176e0 +F src/whereexpr.c f9dbd159127452150c92b558e184827ecb8f9229 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2 F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 @@ -1031,7 +1031,7 @@ F test/superlock.test 1cde669f68d2dd37d6c9bd35eee1d95491ae3fc2 F test/sync.test a34cd43e98b7fb84eabbf38f7ed8f7349b3f3d85 F test/syscall.test d2fdaad713f103ac611fe7ef9b724c7b69f8149c F test/sysfault.test fa776e60bf46bdd3ae69f0b73e46ee3977a58ae6 -F test/tabfunc01.test ae7f4e5b67edbb423e63efeee37d672bb61d5a07 +F test/tabfunc01.test d556af2def6af10b0a759b2f8a8f41135c2b634e F test/table.test 33bf0d1fd07f304582695184b8e6feb017303816 F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126 F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930 @@ -1376,7 +1376,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 17eb7f18cb76170e109977a94b259b763cd86c47 -R 25130809f3babeec0691a193d02e4069 -U mistachkin -Z f2d173175579a2040d53483e92ff71ba +P b73ad305a6b7cb84fe0a1efb334b8e4592e21c40 +R f600d04c9db5494b68811630044e0207 +U drh +Z 52a18320de00f5816e7cb149e8e4308c diff --git a/manifest.uuid b/manifest.uuid index fda47be90f..903bbc12fa 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b73ad305a6b7cb84fe0a1efb334b8e4592e21c40 \ No newline at end of file +774e6a14b124bbae4da0e188b62aee9ffb8c3745 \ No newline at end of file diff --git a/src/build.c b/src/build.c index 5f8bf8488f..d6ceb2c88e 100644 --- a/src/build.c +++ b/src/build.c @@ -355,7 +355,6 @@ Table *sqlite3LocateTable( p = sqlite3FindTable(pParse->db, zName, zDbase); if( p==0 ){ - const char *zMsg; #ifndef SQLITE_OMIT_VIRTUAL_TABLE /* If zName is the not the name of a table in the schema created using ** CREATE, then check to see if it is the name of an virtual table that @@ -365,7 +364,7 @@ Table *sqlite3LocateTable( return pMod->pEpoTab; } #endif - zMsg = isView ? "no such view" : "no such table"; + const char *zMsg = isView ? "no such view" : "no such table"; if( zDbase ){ sqlite3ErrorMsg(pParse, "%s: %s.%s", zMsg, zDbase, zName); }else{ @@ -3803,13 +3802,15 @@ void sqlite3SrcListIndexedBy(Parse *pParse, SrcList *p, Token *pIndexedBy){ ** table-valued-function. */ void sqlite3SrcListFuncArgs(Parse *pParse, SrcList *p, ExprList *pList){ - if( p && ALWAYS(p->nSrc>0) && pList ){ + if( p && pList ){ struct SrcList_item *pItem = &p->a[p->nSrc-1]; assert( pItem->fg.notIndexed==0 ); assert( pItem->fg.isIndexedBy==0 ); assert( pItem->fg.isTabFunc==0 ); pItem->u1.pFuncArg = pList; pItem->fg.isTabFunc = 1; + }else{ + sqlite3ExprListDelete(pParse->db, pList); } } diff --git a/src/resolve.c b/src/resolve.c index 9799a136b9..0908d4cd5d 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -1451,11 +1451,10 @@ int sqlite3ResolveExprListNames( NameContext *pNC, /* Namespace to resolve expressions in. */ ExprList *pList /* The expression list to be analyzed. */ ){ - if( pList ){ - int i; - for(i=0; inExpr; i++){ - if( sqlite3ResolveExprNames(pNC, pList->a[i].pExpr) ) return WRC_Abort; - } + assert( pList!=0 ); + int i; + for(i=0; inExpr; i++){ + if( sqlite3ResolveExprNames(pNC, pList->a[i].pExpr) ) return WRC_Abort; } return WRC_Continue; } diff --git a/src/vtab.c b/src/vtab.c index 8042e0e7bd..1675ca2e31 100644 --- a/src/vtab.c +++ b/src/vtab.c @@ -699,7 +699,7 @@ int sqlite3VtabCallCreate(sqlite3 *db, int iDb, const char *zTab, char **pzErr){ ** invoke it now. If the module has not been registered, return an ** error. Otherwise, do nothing. */ - if( pMod==0 || pMod->pModule->xCreate==0 ){ + if( pMod==0 || pMod->pModule->xCreate==0 || pMod->pModule->xDestroy==0 ){ *pzErr = sqlite3MPrintf(db, "no such module: %s", zMod); rc = SQLITE_ERROR; }else{ @@ -810,7 +810,8 @@ int sqlite3VtabCallDestroy(sqlite3 *db, int iDb, const char *zTab){ } p = vtabDisconnectAll(db, pTab); xDestroy = p->pMod->pModule->xDestroy; - rc = xDestroy ? xDestroy(p->pVtab) : SQLITE_OK; + assert( xDestroy!=0 ); /* Checked before the virtual table is created */ + rc = xDestroy(p->pVtab); /* Remove the sqlite3_vtab* from the aVTrans[] array, if applicable */ if( rc==SQLITE_OK ){ assert( pTab->pVTable==p && p->pNext==0 ); @@ -1123,9 +1124,9 @@ int sqlite3VtabEponymousTableInit(Parse *pParse, Module *pMod){ pTab->tabFlags |= TF_Virtual; pTab->nModuleArg = 0; pTab->iPKey = -1; - addModuleArgument(db, pTab, pTab->zName); + addModuleArgument(db, pTab, sqlite3DbStrDup(db, pTab->zName)); addModuleArgument(db, pTab, 0); - addModuleArgument(db, pTab, pTab->zName); + addModuleArgument(db, pTab, sqlite3DbStrDup(db, pTab->zName)); rc = vtabCallConstructor(db, pTab, pMod, pModule->xConnect, &zErr); if( rc ){ sqlite3ErrorMsg(pParse, "%s", zErr); @@ -1144,7 +1145,7 @@ void sqlite3VtabEponymousTableClear(sqlite3 *db, Module *pMod){ Table *pTab = pMod->pEpoTab; if( (pTab = pMod->pEpoTab)!=0 ){ sqlite3DeleteColumnNames(db, pTab); - sqlite3DbFree(db, pTab->azModuleArg); + sqlite3VtabClear(db, pTab); sqlite3DbFree(db, pTab); pMod->pEpoTab = 0; } diff --git a/src/whereexpr.c b/src/whereexpr.c index a0f7c822af..d6f94b3e1a 100644 --- a/src/whereexpr.c +++ b/src/whereexpr.c @@ -1273,7 +1273,7 @@ void sqlite3WhereTabFuncArgs( for(j=k=0; jnExpr; j++){ while( knCol && (pTab->aCol[k].colFlags & COLFLAG_HIDDEN)==0 ){ k++; } if( k>=pTab->nCol ){ - sqlite3ErrorMsg(pParse, "too many arguments on %s - max %d", + sqlite3ErrorMsg(pParse, "too many arguments on %s() - max %d", pTab->zName, j); return; } diff --git a/test/tabfunc01.test b/test/tabfunc01.test index b3711baea0..39264d2f05 100644 --- a/test/tabfunc01.test +++ b/test/tabfunc01.test @@ -43,7 +43,7 @@ do_execsql_test tabfunc01-1.6 { } {1 4 7 10} do_catchsql_test tabfunc01-1.7 { SELECT * FROM generate_series(1,9,2,11); -} {1 {too many arguments on generate_series - max 3}} +} {1 {too many arguments on generate_series() - max 3}} do_execsql_test tabfunc01-1.8 { SELECT * FROM generate_series(0,32,5) ORDER BY rowid DESC; From c743579e59d310769f1e53e5217e58ae74b249cf Mon Sep 17 00:00:00 2001 From: drh Date: Thu, 20 Aug 2015 23:28:18 +0000 Subject: [PATCH 9/9] Fix a couple C99-isms that cause compile errors on MSVC. FossilOrigin-Name: bc577fe6cbbe5385d81d6fa0f3c34bb1c833f0d6 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/build.c | 2 +- src/resolve.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 06e7ddf3f5..6bfc6a1697 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\scorner-case\smemory\smanagement\sissues\sin\stable-valued\sfunctions.\s\sChange\nvirtual\stable\shandling\sso\sthat\sif\sxDestroy\sis\smissing\sthe\stable\sis\neponymous\sonly\seven\sif\sxCreate\sis\spresent. -D 2015-08-20T23:21:34.475 +C Fix\sa\scouple\sC99-isms\sthat\scause\scompile\serrors\son\sMSVC. +D 2015-08-20T23:28:18.956 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 4f663b6b4954b9b1eb0e6f08387688a93b57542d F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -281,7 +281,7 @@ F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79 F src/btree.c f48b3ef91676c06a90a8832987ecef6b94c931ee F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1 F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0 -F src/build.c 0ebd9d21500311ff4b7df52fe927e5f235ad1867 +F src/build.c 5eb5d055a1d1cdaaea25e01b12607aa894bc0911 F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0 F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b @@ -334,7 +334,7 @@ F src/pragma.h 631a91c8b0e6ca8f051a1d8a4a0da4150e04620a F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1 F src/printf.c 2bc439ff20a4aad0e0ad50a37a67b5eae7d20edc F src/random.c ba2679f80ec82c4190062d756f22d0c358180696 -F src/resolve.c 02e2c9ed5f45a22d41e799739c17b770dbb31866 +F src/resolve.c 7a67cd2aebc9a9eeecd1d104eb6a9237388eb452 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e F src/select.c c46de38c1b66355f02a839bb72eb13f277e6d19c F src/shell.c b1f91e60918df3a68efad1e3a11696b9a7e23d23 @@ -1376,7 +1376,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P b73ad305a6b7cb84fe0a1efb334b8e4592e21c40 -R f600d04c9db5494b68811630044e0207 +P 774e6a14b124bbae4da0e188b62aee9ffb8c3745 +R a705c27f52160ef69f13084e79416a63 U drh -Z 52a18320de00f5816e7cb149e8e4308c +Z 3baa7e86161b56868138f2b0a38c7271 diff --git a/manifest.uuid b/manifest.uuid index 903bbc12fa..0240b8ded9 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -774e6a14b124bbae4da0e188b62aee9ffb8c3745 \ No newline at end of file +bc577fe6cbbe5385d81d6fa0f3c34bb1c833f0d6 \ No newline at end of file diff --git a/src/build.c b/src/build.c index d6ceb2c88e..e45908dc3b 100644 --- a/src/build.c +++ b/src/build.c @@ -355,6 +355,7 @@ Table *sqlite3LocateTable( p = sqlite3FindTable(pParse->db, zName, zDbase); if( p==0 ){ + const char *zMsg = isView ? "no such view" : "no such table"; #ifndef SQLITE_OMIT_VIRTUAL_TABLE /* If zName is the not the name of a table in the schema created using ** CREATE, then check to see if it is the name of an virtual table that @@ -364,7 +365,6 @@ Table *sqlite3LocateTable( return pMod->pEpoTab; } #endif - const char *zMsg = isView ? "no such view" : "no such table"; if( zDbase ){ sqlite3ErrorMsg(pParse, "%s: %s.%s", zMsg, zDbase, zName); }else{ diff --git a/src/resolve.c b/src/resolve.c index 0908d4cd5d..c859e886a7 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -1451,8 +1451,8 @@ int sqlite3ResolveExprListNames( NameContext *pNC, /* Namespace to resolve expressions in. */ ExprList *pList /* The expression list to be analyzed. */ ){ - assert( pList!=0 ); int i; + assert( pList!=0 ); for(i=0; inExpr; i++){ if( sqlite3ResolveExprNames(pNC, pList->a[i].pExpr) ) return WRC_Abort; }