Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add the '--no-repository' option to the 'fossil sqlite3' command and make use of it for the merge5 test. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | sqlCmdNoRepo |
Files: | files | file ages | folders |
SHA1: |
56f74a120d0aac8773b0c43e2a3c8f7f |
User & Date: | mistachkin 2016-01-13 01:31:10 |
Context
2016-01-13
| ||
06:19 | Simplify the previous check-in. ... (Closed-Leaf check-in: 384482a8 user: mistachkin tags: sqlCmdNoRepo) | |
01:31 | Add the '--no-repository' option to the 'fossil sqlite3' command and make use of it for the merge5 test. ... (check-in: 56f74a12 user: mistachkin tags: sqlCmdNoRepo) | |
00:38 | The test file directory saved by the test suite infrastructure should be normalized. ... (check-in: be81a2fd user: mistachkin tags: trunk) | |
Changes
Changes to src/sqlcmd.c.
︙ | ︙ | |||
150 151 152 153 154 155 156 | g.db = db; return SQLITE_OK; } /* ** COMMAND: sqlite3 ** | | | > > > > | 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 | g.db = db; return SQLITE_OK; } /* ** COMMAND: sqlite3 ** ** Usage: %fossil sqlite3 ?FOSSIL_OPTS? ?DATABASE? ?SHELL_OPTS? ** ** Run the standalone sqlite3 command-line shell on DATABASE with SHELL_OPTS. ** If DATABASE is omitted, then the repository that serves the working ** directory is opened. See https://www.sqlite.org/cli.html for additional ** information. ** ** Fossil Options: ** ** --no-repository Skip opening the repository database. ** ** WARNING: Careless use of this command can corrupt a Fossil repository ** in ways that are unrecoverable. Be sure you know what you are doing before ** running any SQL commands that modifies the repository database. ** ** The following extensions to the usual SQLite commands are provided: ** ** content(X) Return the contenxt of artifact X. X can be a |
︙ | ︙ | |||
191 192 193 194 195 196 197 198 | ** ** Usage example for files_of_checkin: ** ** CREATE VIRTUAL TABLE temp.foci USING files_of_checkin; ** SELECT * FROM foci WHERE checkinID=symbolic_name_to_rid('trunk'); */ void cmd_sqlite3(void){ extern int sqlite3_shell(int, char**); | > > > | | > | 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 | ** ** Usage example for files_of_checkin: ** ** CREATE VIRTUAL TABLE temp.foci USING files_of_checkin; ** SELECT * FROM foci WHERE checkinID=symbolic_name_to_rid('trunk'); */ void cmd_sqlite3(void){ int noRepository; extern int sqlite3_shell(int, char**); noRepository = find_option("no-repository", 0, 0)!=0; if( !noRepository ){ db_find_and_open_repository(OPEN_ANY_SCHEMA, 0); db_close(1); } sqlite3_shutdown(); sqlite3_shell(g.argc-1, g.argv+1); sqlite3_cancel_auto_extension((void(*)(void))sqlcmd_autoinit); g.db = 0; g.zMainDbType = 0; g.repositoryOpen = 0; g.localOpen = 0; |
︙ | ︙ |
Changes to test/merge5.test.
︙ | ︙ | |||
46 47 48 49 50 51 52 | # # Fossil will write data on $HOME, running 'fossil open' here. # We need not to clutter the $HOME of the test caller. set env(HOME) [pwd] # Construct a test repository # | | | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 | # # Fossil will write data on $HOME, running 'fossil open' here. # We need not to clutter the $HOME of the test caller. set env(HOME) [pwd] # Construct a test repository # exec fossil sqlite3 --no-repository m5.fossil <$testdir/${testfile}_repo.sql fossil rebuild m5.fossil fossil open m5.fossil fossil user default drh --user drh fossil update baseline checkout-test 10 { da5c8346496f3421cb58f84b6e59e9531d9d424d one.txt ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt |
︙ | ︙ |