Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Minor bugs fixed. (CVS 307) |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: | 6e7e7dbf8e93d00eced88404aed792fcf9e75b7d |
| User & Date: | drh 2001-11-09 22:41:45 |
Context
|
2001-11-10
| ||
| 13:51 | Comment changes (CVS 308) check-in: 2d2ad264 user: drh tags: trunk | |
|
2001-11-09
| ||
| 22:41 | Minor bugs fixed. (CVS 307) check-in: 6e7e7dbf user: drh tags: trunk | |
| 13:41 | Bug fixes. (CVS 306) check-in: 84997fda user: drh tags: trunk | |
Changes
Changes to src/os.c.
126 127 128 129 130 131 132 133 134 135 136 137 138 139 |
static struct lockInfo *findLockInfo(int fd){
int rc;
struct inodeKey key;
struct stat statbuf;
struct lockInfo *pInfo;
rc = fstat(fd, &statbuf);
if( rc!=0 ) return 0;
key.dev = statbuf.st_dev;
key.ino = statbuf.st_ino;
pInfo = (struct lockInfo*)sqliteHashFind(&lockHash, &key, sizeof(key));
if( pInfo==0 ){
struct lockInfo *pOld;
pInfo = sqliteMalloc( sizeof(*pInfo) );
if( pInfo==0 ) return 0;
|
> |
126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 |
static struct lockInfo *findLockInfo(int fd){
int rc;
struct inodeKey key;
struct stat statbuf;
struct lockInfo *pInfo;
rc = fstat(fd, &statbuf);
if( rc!=0 ) return 0;
memset(&key, 0, sizeof(key));
key.dev = statbuf.st_dev;
key.ino = statbuf.st_ino;
pInfo = (struct lockInfo*)sqliteHashFind(&lockHash, &key, sizeof(key));
if( pInfo==0 ){
struct lockInfo *pOld;
pInfo = sqliteMalloc( sizeof(*pInfo) );
if( pInfo==0 ) return 0;
|
Changes to src/shell.c.
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
...
543
544
545
546
547
548
549
550
551
552
553
554
555
556
|
** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains code to implement the "sqlite" command line ** utility for accessing SQLite databases. ** ** $Id: shell.c,v 1.37 2001/10/19 16:44:57 drh Exp $ */ #include <stdlib.h> #include <string.h> #include <stdio.h> #include "sqlite.h" #include <ctype.h> #ifdef OS_UNIX ................................................................................ }else if( strcmp(z,"yes")==0 ){ val = 1; } p->echoOn = val; }else if( c=='e' && strncmp(azArg[0], "exit", n)==0 ){ exit(0); }else if( c=='e' && strncmp(azArg[0], "explain", n)==0 ){ p->mode = MODE_Column; p->showHeader = 1; p->colWidth[0] = 4; |
|
>
|
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
...
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
|
** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains code to implement the "sqlite" command line ** utility for accessing SQLite databases. ** ** $Id: shell.c,v 1.38 2001/11/09 22:41:45 drh Exp $ */ #include <stdlib.h> #include <string.h> #include <stdio.h> #include "sqlite.h" #include <ctype.h> #ifdef OS_UNIX ................................................................................ }else if( strcmp(z,"yes")==0 ){ val = 1; } p->echoOn = val; }else if( c=='e' && strncmp(azArg[0], "exit", n)==0 ){ sqlite_close(db); exit(0); }else if( c=='e' && strncmp(azArg[0], "explain", n)==0 ){ p->mode = MODE_Column; p->showHeader = 1; p->colWidth[0] = 4; |
Changes to test/tester.tcl.
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
...
178
179
180
181
182
183
184
185
186
187
188
189
190
191
|
# May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements some common TCL routines used for regression # testing the SQLite library # # $Id: tester.tcl,v 1.20 2001/09/27 15:11:55 drh Exp $ # Make sure tclsqlite was compiled correctly. Abort now with an # error message if not. # if {[sqlite -tcl-uses-utf]} { if {"\u1234"=="u1234"} { puts stderr "***** BUILD PROBLEM *****" ................................................................................ # proc catchsql {sql {db db}} { # puts "SQL = $sql" set r [catch {$db eval $sql} msg] lappend r $msg return $r } # Another procedure to execute SQL. This one includes the field # names in the returned list. # proc execsql2 {sql} { set result {} db eval $sql data { |
|
>
>
>
>
>
>
>
>
>
>
>
|
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
...
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
|
# May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements some common TCL routines used for regression # testing the SQLite library # # $Id: tester.tcl,v 1.21 2001/11/09 22:41:45 drh Exp $ # Make sure tclsqlite was compiled correctly. Abort now with an # error message if not. # if {[sqlite -tcl-uses-utf]} { if {"\u1234"=="u1234"} { puts stderr "***** BUILD PROBLEM *****" ................................................................................ # proc catchsql {sql {db db}} { # puts "SQL = $sql" set r [catch {$db eval $sql} msg] lappend r $msg return $r } # Do an VDBE code dump on the SQL given # proc explain {sql {db db}} { puts "" puts "addr opcode p1 p2 p3 " puts "---- ------------ ------ ------ ---------------" $db eval "explain $sql" {} { puts [format {%-4d %-12.12s %-6d %-6d %s} $addr $opcode $p1 $p2 $p3] } } # Another procedure to execute SQL. This one includes the field # names in the returned list. # proc execsql2 {sql} { set result {} db eval $sql data { |
Changes to test/update.test.
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
...
320
321
322
323
324
325
326
327
328
329
330
331
332
333
|
# 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 UPDATE statement. # # $Id: update.test,v 1.7 2001/10/15 00:44:36 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl # Try to update an non-existent table # do_test update-1.1 { ................................................................................ execsql {SELECT * FROM test1 WHERE f1==88 ORDER BY f1,f2} } {} do_test update-7.2 { execsql {UPDATE test1 SET f2=f2-1 WHERE f1==8 and f2>800} execsql {SELECT * FROM test1 ORDER BY f1,f2} } {6 64 7 128 8 89 8 257 8 888 9 512 10 1024 77 128 777 128} do_test update-7.3 { execsql {UPDATE test1 SET f2=f2-1 WHERE f1==8 and f2<800} execsql {SELECT * FROM test1 ORDER BY f1,f2} } {6 64 7 128 8 88 8 256 8 888 9 512 10 1024 77 128 777 128} do_test update-7.3.1 { execsql {SELECT * FROM test1 WHERE f1==8 ORDER BY f1,f2} } {8 88 8 256 8 888} do_test update-7.3.2 { |
|
>
|
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
...
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
|
# 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 UPDATE statement. # # $Id: update.test,v 1.8 2001/11/09 22:41:45 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl # Try to update an non-existent table # do_test update-1.1 { ................................................................................ execsql {SELECT * FROM test1 WHERE f1==88 ORDER BY f1,f2} } {} do_test update-7.2 { execsql {UPDATE test1 SET f2=f2-1 WHERE f1==8 and f2>800} execsql {SELECT * FROM test1 ORDER BY f1,f2} } {6 64 7 128 8 89 8 257 8 888 9 512 10 1024 77 128 777 128} do_test update-7.3 { # explain {UPDATE test1 SET f2=f2-1 WHERE f1==8 and F2<300} execsql {UPDATE test1 SET f2=f2-1 WHERE f1==8 and f2<800} execsql {SELECT * FROM test1 ORDER BY f1,f2} } {6 64 7 128 8 88 8 256 8 888 9 512 10 1024 77 128 777 128} do_test update-7.3.1 { execsql {SELECT * FROM test1 WHERE f1==8 ORDER BY f1,f2} } {8 88 8 256 8 888} do_test update-7.3.2 { |