/ Check-in [633d8747]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Minor simplifications to the compile-time option reporting functions and pragmas to facilitate coverage testing.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 633d874783a94f923ff8240f9153764033d37a89
User & Date: drh 2010-02-25 15:28:42
Context
2010-02-25
16:09
Fixed numbering of a few tests; minor tweaks on others; added a couple new tests to stress previous simplifications to compile-time option reporting functions. check-in: 9b18dfd1 user: shaneh tags: trunk
15:28
Minor simplifications to the compile-time option reporting functions and pragmas to facilitate coverage testing. check-in: 633d8747 user: drh tags: trunk
14:47
Expire pragma statements when reset, even if they were not run to completion. check-in: 78351d28 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/func.c.

786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
  sqlite3_value **argv
){
  const char *zOptName;
  assert( argc==1 );
  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 )){
    sqlite3_result_int(context, sqlite3_compileoption_used(zOptName));
  }else{
    sqlite3_result_null(context);
  }
}
#endif /* SQLITE_OMIT_COMPILEOPTION_DIAGS */

/*
** Implementation of the sqlite_compileoption_get() function. 
** The result is a string that identifies the compiler options 







<
|

<
<







786
787
788
789
790
791
792

793
794


795
796
797
798
799
800
801
  sqlite3_value **argv
){
  const char *zOptName;
  assert( argc==1 );
  UNUSED_PARAMETER(argc);
  /* IMP: R-xxxx This function is an SQL wrapper around the
  ** sqlite3_compileoption_used() C interface. */

  if( (zOptName = (const char*)sqlite3_value_text(argv[0]))!=0 ){
    sqlite3_result_int(context, sqlite3_compileoption_used(zOptName));


  }
}
#endif /* SQLITE_OMIT_COMPILEOPTION_DIAGS */

/*
** Implementation of the sqlite_compileoption_get() function. 
** The result is a string that identifies the compiler options 

Changes to src/pragma.c.

1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
  ** compile time.
  */
  if( sqlite3StrICmp(zLeft, "compile_option")==0 && zRight ){
    int used = sqlite3_compileoption_used(zRight);
    returnSingleInt(pParse, zRight, used);
  }else

  if( sqlite3StrICmp(zLeft, "compile_options")==0 && !zRight ){
    int i = 0;
    const char *zOpt;
    sqlite3VdbeSetNumCols(v, 1);
    pParse->nMem = 1;
    sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "compile_option", SQLITE_STATIC);
    while( (zOpt = sqlite3_compileoption_get(i++))!=0 ){
      sqlite3VdbeAddOp4(v, OP_String8, 0, 1, 0, zOpt, 0);







|







1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
  ** compile time.
  */
  if( sqlite3StrICmp(zLeft, "compile_option")==0 && zRight ){
    int used = sqlite3_compileoption_used(zRight);
    returnSingleInt(pParse, zRight, used);
  }else

  if( sqlite3StrICmp(zLeft, "compile_options")==0 ){
    int i = 0;
    const char *zOpt;
    sqlite3VdbeSetNumCols(v, 1);
    pParse->nMem = 1;
    sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "compile_option", SQLITE_STATIC);
    while( (zOpt = sqlite3_compileoption_get(i++))!=0 ){
      sqlite3VdbeAddOp4(v, OP_String8, 0, 1, 0, zOpt, 0);