SQLite: Check-in [30704d2a]

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

Overview

Comment:	Improved ".selecttrace" output formatting. No changes in non-debug code.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA3-256:	30704d2a52d37717d8b34a402c99ea32453e5c1a9840037dba96591f4acc1503
User & Date:	drh 2018-03-19 16:06:11

Context

2018-03-19
16:09		In the compile_options pragma, show the actual value of the SQLITE_ENABLE_CEROD compile-time option, if it exists. check-in: 1ec339fd user: drh tags: trunk
16:06		Improved ".selecttrace" output formatting. No changes in non-debug code. check-in: 30704d2a user: drh tags: trunk
2018-03-17
16:26		Do not use sqlite3_column_decltype() in the CLI if it is compiled with SQLITE_OMIT_DECLTYPE. check-in: 442e816b user: drh tags: trunk

Changes

Hide Diffs Side-by-Side Diffs Show Whitespace Changes Patch

Changes to src/select.c.

    17     17   /*
    18     18   ** Trace output macros
    19     19   */
    20     20   #if SELECTTRACE_ENABLED
    21     21   /***/ int sqlite3SelectTrace = 0;
    22     22   # define SELECTTRACE(K,P,S,X)  \
    23     23     if(sqlite3SelectTrace&(K))   \
    24         -    sqlite3DebugPrintf("%*s%s.%p: ",(P)->nSelectIndent*2-2,"",\
           24  +    sqlite3DebugPrintf("%*s%s/%p: ",(P)->nSelectIndent*2-2,"",\
    25     25           (S)->zSelName,(S)),\
    26     26       sqlite3DebugPrintf X
    27     27   #else
    28     28   # define SELECTTRACE(K,P,S,X)
    29     29   #endif
    30     30   
    31     31

Changes to src/treeview.c.

   133    133     pView = sqlite3TreeViewPush(pView, moreToFollow);
   134    134     if( p->pWith ){
   135    135       sqlite3TreeViewWith(pView, p->pWith, 1);
   136    136       cnt = 1;
   137    137       sqlite3TreeViewPush(pView, 1);
   138    138     }
   139    139     do{
          140  +#if SELECTTRACE_ENABLED
          141  +    sqlite3TreeViewLine(pView,
          142  +      "SELECT%s%s (%s/%p) selFlags=0x%x nSelectRow=%d",
          143  +      ((p->selFlags & SF_Distinct) ? " DISTINCT" : ""),
          144  +      ((p->selFlags & SF_Aggregate) ? " agg_flag" : ""),
          145  +      p->zSelName, p, p->selFlags,
          146  +      (int)p->nSelectRow
          147  +    );
          148  +#else
   140    149       sqlite3TreeViewLine(pView, "SELECT%s%s (0x%p) selFlags=0x%x nSelectRow=%d",
   141    150         ((p->selFlags & SF_Distinct) ? " DISTINCT" : ""),
   142    151         ((p->selFlags & SF_Aggregate) ? " agg_flag" : ""), p, p->selFlags,
   143    152         (int)p->nSelectRow
   144    153       );
          154  +#endif
   145    155       if( cnt++ ) sqlite3TreeViewPop(pView);
   146    156       if( p->pPrior ){
   147    157         n = 1000;
   148    158       }else{
   149    159         n = 0;
   150    160         if( p->pSrc && p->pSrc->nSrc ) n++;
   151    161         if( p->pWhere ) n++;