Simplified error message for the unsafe use of a virtual table.

FossilOrigin-Name: d662129a601e05e8fca5717a890b5bc920b80a750d061f3c2494788d32b917a5

diff --git a/manifest b/manifest
index 2544b8cd3dd219227557d3979cffa55bd3fe9574..a4a0bd8da24f7f6dad22771d294737205e629b56 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\sthat\srestricted\sedgy\sfunctions\sin\sTEMP\stables.\nNew\stest\scases\sadded.
-D 2020-01-09T01:20:03.116
+C Simplified\serror\smessage\sfor\sthe\sunsafe\suse\sof\sa\svirtual\stable.
+D 2020-01-09T13:08:28.875
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -529,7 +529,7 @@ F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 1139e3157c710c6e6f04fe726f4e0d8bdb1ae89a276d3b0ca4975af163141c9c
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
-F src/select.c fbae5d6db63959aa1ecb34efe93caf5399444ca3c78d6f1ef4620b0ee5c37707
+F src/select.c 0ae5299e59845657ccbe1e05817b9926807523d3ca584e80040f57eab892b98a
 F src/shell.c.in 43d3cfbee97d78ca5782dc53e4c1e22d3cc15c91beff20889dc60551f47eab9f
 F src/sqlite.h.in 06452043348e35cf6108345a35574a2faa4d1c2829beefb1e73c73d6bfb2fa80
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1855,7 +1855,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P da434dc149786e4b1cd80b3b2b25f8b614d0dec62d5439f839a66b536999e398
-R 5d23da58c4e26d6a3869b8997dbb1f9d
+P 8878c40753566a8c4ccd1d413019cabde7569b947f730527d13bfc3db384e97d
+R 0dd0572d840f5da124648f9c608f9c87
 U drh
-Z 2a63c0c342c8804a0df9ef8a4a5f7519
+Z 4a660a42e378fba2b6c64d3dce74af2a

diff --git a/manifest.uuid b/manifest.uuid
index e7e1532d0f8b7bf8f889ce54130e52804ee99f90..47e32ca86f55eef14f91fd764bfdbb90d74615f2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8878c40753566a8c4ccd1d413019cabde7569b947f730527d13bfc3db384e97d
\ No newline at end of file
+d662129a601e05e8fca5717a890b5bc920b80a750d061f3c2494788d32b917a5
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 34c476ff739bd8fffdab120b41b3599c756c65b6..e7fd1b8c9f60a4f8aed193f06a1e99d5e6e17e26 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -4977,8 +4977,8 @@ static int selectExpander(Walker *pWalker, Select *p){
          && ALWAYS(pTab->pVTable!=0)
          && pTab->pVTable->eVtabRisk > ((db->flags & SQLITE_TrustedSchema)!=0)
         ){
-          sqlite3ErrorMsg(pParse, "cannot access \"%s\" from within a trigger"
-                                  " or view", pTab->zName);
+          sqlite3ErrorMsg(pParse, "unsafe use of virtual table \"%s\"",
+                                  pTab->zName);
         }
         pFrom->pSelect = sqlite3SelectDup(db, pTab->pSelect, 0);
         nCol = pTab->nCol;