Fossil

Differences From Artifact [d920e709b2]:

• File src/db.c — part of check-in [ec0e590191] at 2015-02-02 20:53:55 on branch indexed-fts — Incremental check-in for work on the indexed full-text search. (user: drh size: 96588)

To Artifact [f2eddf13e7]:

• File src/db.c — part of check-in [780117d223] at 2015-02-03 04:10:10 on branch indexed-fts — Restrict indexed search according to the search flags. Fix the generation of the index for wiki pages. Fix db_multi_exec() so that it aborts with a sensible message following a syntax error. (user: drh size: 96628) [more...]

545
546
547
548
549
550
551
552

553
554
555
556
557
558
559
560

  va_start(ap, zSql);
  blob_vappendf(&sql, zSql, ap);
  va_end(ap);
  z = blob_str(&sql);
  while( rc==SQLITE_OK && z[0] ){
    pStmt = 0;
    rc = sqlite3_prepare_v2(g.db, z, -1, &pStmt, &zEnd);
    if( rc!=SQLITE_OK ) break;

    if( pStmt ){
      db.nPrepare++;
      while( sqlite3_step(pStmt)==SQLITE_ROW ){}
      rc = sqlite3_finalize(pStmt);
      if( rc ) db_err("%s: {%.*s}", sqlite3_errmsg(g.db), (int)(zEnd-z), z);
    }
    z = zEnd;
  }

|
>
|

545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561

  va_start(ap, zSql);
  blob_vappendf(&sql, zSql, ap);
  va_end(ap);
  z = blob_str(&sql);
  while( rc==SQLITE_OK && z[0] ){
    pStmt = 0;
    rc = sqlite3_prepare_v2(g.db, z, -1, &pStmt, &zEnd);
    if( rc ){
      db_err("%s: {%s}", sqlite3_errmsg(g.db), z);
    }else if( pStmt ){
      db.nPrepare++;
      while( sqlite3_step(pStmt)==SQLITE_ROW ){}
      rc = sqlite3_finalize(pStmt);
      if( rc ) db_err("%s: {%.*s}", sqlite3_errmsg(g.db), (int)(zEnd-z), z);
    }
    z = zEnd;
  }