/ Check-in [02ebc60b]
Login

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

Overview
Comment:Minor fixes to requirements marks.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 02ebc60b9bbc1736f4989eb56f8d31ca97fe90c930841d10986c618381ceb8b4
User & Date: drh 2019-04-04 18:20:25
Context
2019-04-04
19:21
Fix a typo in the documentation for sqlite3_value_frombind(). Also add a new hyperlink to that same documentation. No code changes. check-in: bf3cd936 user: drh tags: trunk
18:20
Minor fixes to requirements marks. check-in: 02ebc60b user: drh tags: trunk
17:58
Add test cases to improve coverage of VDBE branches. Still some to go. check-in: 4cef609d user: dan tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/vacuum.c.

   159    159     int nRes;               /* Bytes of reserved space at the end of each page */
   160    160     int nDb;                /* Number of attached databases */
   161    161     const char *zDbMain;    /* Schema name of database to vacuum */
   162    162     const char *zOut;       /* Name of output file */
   163    163   
   164    164     if( !db->autoCommit ){
   165    165       sqlite3SetString(pzErrMsg, db, "cannot VACUUM from within a transaction");
   166         -    return SQLITE_ERROR;
          166  +    return SQLITE_ERROR; /* IMP: R-12218-18073 */
   167    167     }
   168    168     if( db->nVdbeActive>1 ){
   169    169       sqlite3SetString(pzErrMsg, db,"cannot VACUUM - SQL statements in progress");
   170         -    return SQLITE_ERROR;
          170  +    return SQLITE_ERROR; /* IMP: R-15610-35227 */
   171    171     }
   172    172     saved_openFlags = db->openFlags;
   173    173     if( pOut ){
   174    174       if( sqlite3_value_type(pOut)!=SQLITE_TEXT ){
   175    175         sqlite3SetString(pzErrMsg, db, "non-text filename");
   176    176         return SQLITE_ERROR;
   177    177       }

Changes to test/e_vacuum.test.

   282    282     SELECT rowid, x FROM t5;
   283    283   } {1 x 3 z}
   284    284   do_execsql_test e_vacuum-3.1.8 {
   285    285     VACUUM;
   286    286     SELECT rowid, x FROM t5;
   287    287   } {1 x 3 z}
   288    288   
   289         -# EVIDENCE-OF: R-49563-33883 A VACUUM will fail if there is an open
   290         -# transaction, or if there are one or more active SQL statements when it
   291         -# is run.
          289  +# EVIDENCE-OF: R-12218-18073 A VACUUM will fail if there is an open
          290  +# transaction on the database connection that is attempting to run the
          291  +# VACUUM.
   292    292   #
   293    293   do_execsql_test  e_vacuum-3.2.1.1 { BEGIN } {}
   294    294   do_catchsql_test e_vacuum-3.2.1.2 { 
   295    295     VACUUM 
   296    296   } {1 {cannot VACUUM from within a transaction}}
   297    297   do_execsql_test  e_vacuum-3.2.1.3 { COMMIT } {}
   298    298   do_execsql_test  e_vacuum-3.2.1.4 { VACUUM } {}