Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Fix an assertion failure that occurs when attempting to delete all rows of a table while the "count_changes" pragma is turned on. Up the version number to 2.6.1. (CVS 690) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
612df004017b241651074ee859096dd0 |
User & Date: | drh 2002-07-19 18:52:41.000 |
Context
2002-07-19
| ||
19:03 | Rig the ident string so that it is not changed by RCS on checkin. (CVS 692) (check-in: 773d36c8d9 user: drh tags: trunk) | |
18:52 | Fix an assertion failure that occurs when attempting to delete all rows of a table while the "count_changes" pragma is turned on. Up the version number to 2.6.1. (CVS 690) (check-in: 612df00401 user: drh tags: trunk) | |
18:13 | Add static ident strings (such as picked up by the RCS "ident" command) containing the library version number. (CVS 689) (check-in: 712ee3914e user: drh tags: trunk) | |
Changes
Changes to VERSION.
|
| | | 1 | 2.6.1 |
Changes to src/delete.c.
︙ | ︙ | |||
8 9 10 11 12 13 14 | ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains C code routines that are called by the parser ** to handle DELETE FROM statements. ** | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains C code routines that are called by the parser ** to handle DELETE FROM statements. ** ** $Id: delete.c,v 1.41 2002/07/19 18:52:41 drh Exp $ */ #include "sqliteInt.h" /* ** Given a table name, find the corresponding table and make sure the ** table is writeable. Generate an error and return NULL if not. If |
︙ | ︙ | |||
166 167 168 169 170 171 172 | if( pWhere==0 && !row_triggers_exist ){ if( db->flags & SQLITE_CountRows ){ /* If counting rows deleted, just count the total number of ** entries in the table. */ int endOfLoop = sqliteVdbeMakeLabel(v); int addr; openOp = pTab->isTemp ? OP_OpenAux : OP_Open; | < | | | | | 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 | if( pWhere==0 && !row_triggers_exist ){ if( db->flags & SQLITE_CountRows ){ /* If counting rows deleted, just count the total number of ** entries in the table. */ int endOfLoop = sqliteVdbeMakeLabel(v); int addr; openOp = pTab->isTemp ? OP_OpenAux : OP_Open; sqliteVdbeAddOp(v, openOp, base, pTab->tnum); sqliteVdbeAddOp(v, OP_Rewind, base, sqliteVdbeCurrentAddr(v)+2); addr = sqliteVdbeAddOp(v, OP_AddImm, 1, 0); sqliteVdbeAddOp(v, OP_Next, base, addr); sqliteVdbeResolveLabel(v, endOfLoop); sqliteVdbeAddOp(v, OP_Close, base, 0); } sqliteVdbeAddOp(v, OP_Clear, pTab->tnum, pTab->isTemp); for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){ sqliteVdbeAddOp(v, OP_Clear, pIdx->tnum, pTab->isTemp); } } |
︙ | ︙ |
Changes to src/main.c.
︙ | ︙ | |||
10 11 12 13 14 15 16 | ** ************************************************************************* ** Main file for the SQLite library. The routines in this file ** implement the programmer interface to the library. Routines in ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** | | | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | ** ************************************************************************* ** Main file for the SQLite library. The routines in this file ** implement the programmer interface to the library. Routines in ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** ** $Id: main.c,v 1.91 2002/07/19 18:52:41 drh Exp $ */ #include "sqliteInt.h" #include "os.h" #include <ctype.h> /* ** A pointer to this structure is used to communicate information |
︙ | ︙ | |||
111 112 113 114 115 116 117 | */ static int upgrade_3_callback(void *pInit, int argc, char **argv, char **NotUsed){ InitData *pData = (InitData*)pInit; int rc; Table *pTab; Trigger *pTrig; | | | 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 | */ static int upgrade_3_callback(void *pInit, int argc, char **argv, char **NotUsed){ InitData *pData = (InitData*)pInit; int rc; Table *pTab; Trigger *pTrig; char *zErr = 0; pTab = sqliteFindTable(pData->db, argv[0]); if( pTab ){ pTrig = pTab->pTrigger; pTab->pTrigger = 0; /* Disable all triggers before rebuilding the table */ } rc = sqlite_exec_printf(pData->db, |
︙ | ︙ | |||
298 299 300 301 302 303 304 | sqliteBtreeCloseCursor(curMain); return sParse.rc; } /* ** The version of the library */ | | | 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 | sqliteBtreeCloseCursor(curMain); return sParse.rc; } /* ** The version of the library */ static const char rcsid[] = "@(#) $Id: main.c,v 1.91 2002/07/19 18:52:41 drh Exp $"; const char sqlite_version[] = SQLITE_VERSION; /* ** Does the library expect data to be encoded as UTF-8 or iso8859? The ** following global constant always lets us know. */ #ifdef SQLITE_UTF8 |
︙ | ︙ |
Changes to test/delete.test.
1 2 3 4 5 6 7 8 9 10 11 12 13 | # 2001 September 15 # # The author disclaims copyright to this source code. In place of # a legal notice, here is a blessing: # # May you do good and not evil. # 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 DELETE FROM statement. # | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | # 2001 September 15 # # The author disclaims copyright to this source code. In place of # a legal notice, here is a blessing: # # May you do good and not evil. # 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 DELETE FROM statement. # # $Id: delete.test,v 1.11 2002/07/19 18:52:41 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl # Try to delete from a non-existant table. # do_test delete-1.1 { |
︙ | ︙ | |||
189 190 191 192 193 194 195 | execsql {SELECT f1 FROM table2} } {} do_test delete-6.10 { execsql {INSERT INTO table2 VALUES(2,3)} execsql {SELECT f1 FROM table2} } {2} | > > > > > > > | > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 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 236 237 238 239 240 241 242 243 244 245 | execsql {SELECT f1 FROM table2} } {} do_test delete-6.10 { execsql {INSERT INTO table2 VALUES(2,3)} execsql {SELECT f1 FROM table2} } {2} do_test delete-7.1 { execsql { CREATE TABLE t3(a); INSERT INTO t3 VALUES(1); INSERT INTO t3 SELECT a+1 FROM t3; INSERT INTO t3 SELECT a+2 FROM t3; SELECT * FROM t3; } } {1 2 3 4} do_test delete-7.2 { execsql { CREATE TABLE cnt(del); INSERT INTO cnt VALUES(0); CREATE TRIGGER r1 AFTER DELETE ON t3 FOR EACH ROW BEGIN UPDATE cnt SET del=del+1; END; DELETE FROM t3 WHERE a<2; SELECT * FROM t3; } } {2 3 4} do_test delete-7.3 { execsql { SELECT * FROM cnt; } } {1} do_test delete-7.4 { execsql { DELETE FROM t3; SELECT * FROM t3; } } {} do_test delete-7.5 { execsql { SELECT * FROM cnt; } } {4} do_test delete-7.6 { execsql { INSERT INTO t3 VALUES(1); INSERT INTO t3 SELECT a+1 FROM t3; INSERT INTO t3 SELECT a+2 FROM t3; CREATE TABLE t4 AS SELECT * FROM t3; PRAGMA count_changes=ON; DELETE FROM t3; DELETE FROM t4; } } {4 4} finish_test |
Changes to test/version.test.
︙ | ︙ | |||
8 9 10 11 12 13 14 | # 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 ability of the library to detect # past or future file format version numbers and respond appropriately. # | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | # 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 ability of the library to detect # past or future file format version numbers and respond appropriately. # # $Id: version.test,v 1.4 2002/07/19 18:52:41 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl # Current file format version set VX 3 |
︙ | ︙ | |||
174 175 176 177 178 179 180 181 182 | btree_commit $::bt btree_close $::bt catch {file attributes test.db -permissions 0444} catch {file attributes test.db -readonly 1} set rc [catch {sqlite db test.db} msg] lappend rc $msg } {1 {unable to upgrade database to the version 2.6 format: attempt to write a readonly database}} finish_test | > > > > > > > > > > > | 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 | btree_commit $::bt btree_close $::bt catch {file attributes test.db -permissions 0444} catch {file attributes test.db -readonly 1} set rc [catch {sqlite db test.db} msg] lappend rc $msg } {1 {unable to upgrade database to the version 2.6 format: attempt to write a readonly database}} do_test version-2.2 { file delete -force test.db set fd [open test.db w] set txt "This is not a valid database file\n" while {[string length $txt]<4092} {append txt $txt} puts $fd $txt close $fd set rc [catch {sqlite db test.db} msg] lappend rc $msg } {1 {}} finish_test |
Changes to www/changes.tcl.
︙ | ︙ | |||
21 22 23 24 25 26 27 | proc chng {date desc} { puts "<DT><B>$date</B></DT>" puts "<DD><P><UL>$desc</UL></P></DD>" } | | > > > > > > > > > | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | proc chng {date desc} { puts "<DT><B>$date</B></DT>" puts "<DD><P><UL>$desc</UL></P></DD>" } chng {2002 Jly 19 (2.6.1)} { <li>Include a static string in the library that responds to the RCS "ident" command and which contains the library version number.</li> <li>Fix an assertion failure that occurred when deleting all rows of a table with the "count_changes" pragma turned on.</li> <li>Better error reporting when problems occur during the automatic 2.5.6 to 2.6.0 database format upgrade.</li> } chng {2002 Jly 17 (2.6.0)} { <li>Change the format of indices to correct a design flaw the originated with version 2.1.0. <font color="red">*** This is an incompatible file format change ***</font> When version 2.6.0 or later of the library attempts to open a database file created by version 2.5.6 or earlier, it will automatically and irreversibly convert the file format. <b>Make backup copies of older database files before opening them with version 2.6.0 of the library.</b> |
︙ | ︙ |