Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix VACUUM so that it works on files whose name contains '. Ticket #873 (CVS 1930) |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
8dd938e48048ffeb11181db9d98112ea |
| User & Date: | drh 2004-09-02 15:27:42 |
Context
|
2004-09-02
| ||
| 15:49 | Fix a bug in the pagesize test script. (CVS 1931) (check-in: 1cf05bc6 user: drh tags: trunk) | |
| 15:27 | Fix VACUUM so that it works on files whose name contains '. Ticket #873 (CVS 1930) (check-in: 8dd938e4 user: drh tags: trunk) | |
| 15:14 | Fix a problem with EXPLAIN on pragmas that return single integer values. Ticket #886 (CVS 1929) (check-in: 8ce3d730 user: drh tags: trunk) | |
Changes
Changes to src/vacuum.c.
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
...
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
|
** ************************************************************************* ** This file contains code used to implement the VACUUM command. ** ** Most of the code in this file may be omitted by defining the ** SQLITE_OMIT_VACUUM macro. ** ** $Id: vacuum.c,v 1.28 2004/07/26 23:07:52 drh Exp $ */ #include "sqliteInt.h" #include "os.h" #if !defined(SQLITE_OMIT_VACUUM) || SQLITE_OMIT_VACUUM /* ** Generate a random name of 20 character in length. ................................................................................ ** can be set to 'off' for this file, as it is not recovered if a crash ** occurs anyway. The integrity of the database is maintained by a ** (possibly synchronous) transaction opened on the main database before ** sqlite3BtreeCopyFile() is called. ** ** An optimisation would be to use a non-journaled pager. */ zSql = sqlite3MPrintf("ATTACH '%s' AS vacuum_db;", zTemp); if( !zSql ){ rc = SQLITE_NOMEM; goto end_of_vacuum; } rc = execSql(db, zSql); sqliteFree(zSql); zSql = 0; |
|
|
|
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
...
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
|
** ************************************************************************* ** This file contains code used to implement the VACUUM command. ** ** Most of the code in this file may be omitted by defining the ** SQLITE_OMIT_VACUUM macro. ** ** $Id: vacuum.c,v 1.29 2004/09/02 15:27:42 drh Exp $ */ #include "sqliteInt.h" #include "os.h" #if !defined(SQLITE_OMIT_VACUUM) || SQLITE_OMIT_VACUUM /* ** Generate a random name of 20 character in length. ................................................................................ ** can be set to 'off' for this file, as it is not recovered if a crash ** occurs anyway. The integrity of the database is maintained by a ** (possibly synchronous) transaction opened on the main database before ** sqlite3BtreeCopyFile() is called. ** ** An optimisation would be to use a non-journaled pager. */ zSql = sqlite3MPrintf("ATTACH '%q' AS vacuum_db;", zTemp); if( !zSql ){ rc = SQLITE_NOMEM; goto end_of_vacuum; } rc = execSql(db, zSql); sqliteFree(zSql); zSql = 0; |
Changes to test/vacuum.test.
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
...
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
|
# May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this file is testing the VACUUM statement. # # $Id: vacuum.test,v 1.24 2004/07/26 23:07:52 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl set fcnt 1 proc cksum {{db db}} { set sql "SELECT name, type, sql FROM sqlite_master ORDER BY name, type" ................................................................................ select count(*) from "abc abc" WHERE a = X'00112233'; } } {1} # Check what happens when an in-memory database is vacuumed. do_test vacuum-7.0 { sqlite3 db2 :memory: execsql { CREATE TABLE t1(t); VACUUM; } db2 } {} db2 close # finish_test |
|
>
>
>
>
>
>
>
>
>
>
>
>
>
|
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
...
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
|
# May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this file is testing the VACUUM statement. # # $Id: vacuum.test,v 1.25 2004/09/02 15:27:42 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl set fcnt 1 proc cksum {{db db}} { set sql "SELECT name, type, sql FROM sqlite_master ORDER BY name, type" ................................................................................ select count(*) from "abc abc" WHERE a = X'00112233'; } } {1} # Check what happens when an in-memory database is vacuumed. do_test vacuum-7.0 { sqlite3 db2 :memory: execsql { CREATE TABLE t1(t); VACUUM; } db2 } {} db2 close # Ticket #873. VACUUM a database that has ' in its name. # do_test vacuum-8.1 { file delete -force a'z.db file delete -force a'z.db-journal sqlite3 db2 a'z.db execsql { CREATE TABLE t1(t); VACUUM; } db2 } {} db2 close # finish_test |