Minor simplifications to the compile-time option reporting functions and

pragmas to facilitate coverage testing.

FossilOrigin-Name: 633d874783a94f923ff8240f9153764033d37a89

diff --git a/manifest b/manifest
index fde1e49c033e10117283fde2d081aa808bb84fa6..465b8108ef78aa09cc46eabe21287e05d82e3030 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Expire\spragma\sstatements\swhen\sreset,\seven\sif\sthey\swere\snot\srun\sto\scompletion.
-D 2010-02-25T14:47:02
+C Minor\ssimplifications\sto\sthe\scompile-time\soption\sreporting\sfunctions\sand\npragmas\sto\sfacilitate\scoverage\stesting.
+D 2010-02-25T15:28:42
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -124,7 +124,7 @@ F src/delete.c 610dc008e88a9599f905f5cbe9577ac9c36e0581
 F src/expr.c d0a345e1d8995e142bc5d9f39a97b9981d7d8f23
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c e2116672a6bd610dc888e27df292ebc7999c9bb0
-F src/func.c d1fbbfe135a25778294c77cee031e5ced39bda72
+F src/func.c 374f45d2a5dcebc0aedc8755c2e9abe71b4e49b0
 F src/global.c 5a9c1e3c93213ca574786ac1caa976ce8f709105
 F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
 F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
@@ -161,7 +161,7 @@ F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e
 F src/pcache.c 815bcb3cf0e14b23212efd3f4981f667a5fd633e
 F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
 F src/pcache1.c 2bb2261190b42a348038f5b1c285c8cef415fcc8
-F src/pragma.c edaded19e5a5f2c96aeab08928d6643b8de14eba
+F src/pragma.c d610d4f4fc55dca58919890fb5323d441b385362
 F src/prepare.c c80630169d82945070a50ebf298611fd9f1485f1
 F src/printf.c f5c160b471e4a4dd22b756cb4ffe0c6979fd6d24
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
@@ -795,14 +795,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P f0ae251abb9e8a8793f46a30b79b2ce541cf14d5
-R 8b107df37b458e983784936eaf5fdbea
+P 78351d289bba83e536b64666c566b7bfc57351da
+R fc8b2f3b47f245eabb47345addf3c287
 U drh
-Z c22f338e59aad7a1b1c2424e3a89156a
+Z 4e47927e3bcb66e5fb9f95fb6ecab24b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFLho1poxKgR168RlERAtzRAJ9394HBtSKDbf1COfLt9MZN1jx3oQCfYvjd
-a+BqRtJmrba2rkJpR5hhYk4=
-=hG6d
+iD8DBQFLhpctoxKgR168RlERAqODAJ9s1JUohWfuDCMn8r6UjUKPuWx+sgCfVoJZ
+FiEbzo9If4ZwffR72z1peFY=
+=7Yci
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 01e9522f526971492734ce03d88f12fcd9a0dca8..421eaf9518b6de9fe41f488709cf15741c761dc9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-78351d289bba83e536b64666c566b7bfc57351da
\ No newline at end of file
+633d874783a94f923ff8240f9153764033d37a89
\ No newline at end of file

diff --git a/src/func.c b/src/func.c
index f24215477cfe200eec0ad7dd80343ca974b3420a..12ee5168b4f297cc98a01cbac55e711b19f1bb52 100644 (file)
--- a/src/func.c
+++ b/src/func.c
@@ -790,11 +790,8 @@ static void compileoptionusedFunc(
   UNUSED_PARAMETER(argc);
   /* IMP: R-xxxx This function is an SQL wrapper around the
   ** sqlite3_compileoption_used() C interface. */
-  if (   ( sqlite3_value_type(argv[0])==SQLITE_TEXT )
-      && ( (zOptName = (const char*)sqlite3_value_text(argv[0]))!=0 )){
+  if( (zOptName = (const char*)sqlite3_value_text(argv[0]))!=0 ){
     sqlite3_result_int(context, sqlite3_compileoption_used(zOptName));
-  }else{
-    sqlite3_result_null(context);
   }
 }
 #endif /* SQLITE_OMIT_COMPILEOPTION_DIAGS */

diff --git a/src/pragma.c b/src/pragma.c
index 93a933c48bf6128440d7a1410d93c0b5470568b1..9a72d643c67deff12cf7f20af3a663b700165036 100644 (file)
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -1375,7 +1375,7 @@ void sqlite3Pragma(
     returnSingleInt(pParse, zRight, used);
   }else
 
-  if( sqlite3StrICmp(zLeft, "compile_options")==0 && !zRight ){
+  if( sqlite3StrICmp(zLeft, "compile_options")==0 ){
     int i = 0;
     const char *zOpt;
     sqlite3VdbeSetNumCols(v, 1);