Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | :-) (CVS 65) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
80ee166ed1bb3694530a73c57544cb4d |
User & Date: | drh 2000-06-07 00:12:25.000 |
Context
2000-06-07
| ||
01:27 | :-) (CVS 66) (check-in: 5d2e72e4bd user: drh tags: trunk) | |
00:12 | :-) (CVS 65) (check-in: 80ee166ed1 user: drh tags: trunk) | |
2000-06-06
| ||
22:19 | :-) (CVS 64) (check-in: 3a2f4dcab2 user: drh tags: trunk) | |
Changes
Changes to src/shell.c.
︙ | ︙ | |||
20 21 22 23 24 25 26 | ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** ************************************************************************* ** This file contains code to implement the "sqlite" command line ** utility for accessing SQLite databases. ** | | | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** ************************************************************************* ** This file contains code to implement the "sqlite" command line ** utility for accessing SQLite databases. ** ** $Id: shell.c,v 1.9 2000/06/07 00:12:25 drh Exp $ */ #include <stdlib.h> #include <string.h> #include <stdio.h> #include "sqlite.h" #include <unistd.h> #include <ctype.h> |
︙ | ︙ | |||
361 362 363 364 365 366 367 | struct callback_data data; char *zErrMsg = 0; char zSql[1000]; memcpy(&data, p, sizeof(data)); data.showHeader = 0; data.mode = MODE_List; if( nArg>1 ){ | | > > | 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 | struct callback_data data; char *zErrMsg = 0; char zSql[1000]; memcpy(&data, p, sizeof(data)); data.showHeader = 0; data.mode = MODE_List; if( nArg>1 ){ sprintf(zSql, "SELECT sql FROM sqlite_master " "WHERE tbl_name LIKE '%.800s'" "ORDER BY type DESC, name", azArg[1]); }else{ sprintf(zSql, "SELECT sql FROM sqlite_master " "ORDER BY tbl_name, type DESC, name"); } sqlite_exec(db, zSql, callback, &data, &zErrMsg); if( zErrMsg ){ |
︙ | ︙ |
Changes to src/vdbe.c.
︙ | ︙ | |||
37 38 39 40 41 42 43 | ** inplicit conversion from one type to the other occurs as necessary. ** ** Most of the code in this file is taken up by the sqliteVdbeExec() ** function which does the work of interpreting a VDBE program. ** But other routines are also provided to help in building up ** a program instruction by instruction. ** | | | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | ** inplicit conversion from one type to the other occurs as necessary. ** ** Most of the code in this file is taken up by the sqliteVdbeExec() ** function which does the work of interpreting a VDBE program. ** But other routines are also provided to help in building up ** a program instruction by instruction. ** ** $Id: vdbe.c,v 1.25 2000/06/07 00:12:25 drh Exp $ */ #include "sqliteInt.h" #include <unistd.h> /* ** SQL is translated into a sequence of instructions to be ** executed by a virtual machine. Each instruction is an instance |
︙ | ︙ | |||
2371 2372 2373 2374 2375 2376 2377 | for(i=p->tos-nField+1; i<=p->tos; i++){ if( Stringify(p, i) ) goto no_mem; nByte += p->aStack[i].n+2; } zNewKey = sqliteMalloc( nByte ); if( zNewKey==0 ) goto no_mem; j = 0; | | | | 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 | for(i=p->tos-nField+1; i<=p->tos; i++){ if( Stringify(p, i) ) goto no_mem; nByte += p->aStack[i].n+2; } zNewKey = sqliteMalloc( nByte ); if( zNewKey==0 ) goto no_mem; j = 0; k = 0; for(i=p->tos-nField+1; i<=p->tos; i++){ zNewKey[j++] = pOp->p3[k++]; memcpy(&zNewKey[j], p->zStack[i], p->aStack[i].n-1); j += p->aStack[i].n-1; zNewKey[j++] = 0; } zNewKey[j] = 0; PopStack(p, nField); NeedStack(p, p->tos+1); |
︙ | ︙ |
Added test/sort.test.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 | # Copyright (c) 1999, 2000 D. Richard Hipp # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public # License as published by the Free Software Foundation; either # version 2 of the License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public # License along with this library; if not, write to the # Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. # # Author contact information: # drh@hwaci.com # http://www.hwaci.com/drh/ # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this file is testing the CREATE TABLE statement. # # $Id: sort.test,v 1.1 2000/06/07 00:12:25 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl # Create a bunch of data to sort against # do_test sort-1.0 { set fd [open data.txt w] puts $fd "1\tone\t0\tI\t3.141592653" puts $fd "2\ttwo\t1\tII\t2.15" puts $fd "3\tthree\t1\tIII\t4221.0" puts $fd "4\tfour\t2\tIV\t-0.0013442" puts $fd "5\tfive\t2\tV\t-11" puts $fd "6\tsix\t2\tVI\t0.123" puts $fd "7\tseven\t2\tVII\t123.0" puts $fd "8\teight\t3\tVIII\t-1.6" close $fd execsql { CREATE TABLE t1( n int, v varchar(10), log int, roman varchar(10), flt real ); COPY t1 FROM 'data.txt' } file delete data.txt execsql {SELECT count(*) FROM t1} } {8} do_test sort-1.1 { execsql {SELECT n FROM t1 ORDER BY n} } {1 2 3 4 5 6 7 8} do_test sort-1.2 { execsql {SELECT n FROM t1 ORDER BY n DESC} } {8 7 6 5 4 3 2 1} do_test sort-1.3a { execsql {SELECT v FROM t1 ORDER BY v} } {eight five four one seven six three two} do_test sort-1.3b { execsql {SELECT n FROM t1 ORDER BY v} } {8 5 4 1 7 6 3 2} do_test sort-1.4 { execsql {SELECT n FROM t1 ORDER BY v DESC} } {2 3 6 7 1 4 5 8} do_test sort-1.5 { execsql {SELECT flt FROM t1 ORDER BY flt} } {-11 -1.6 -0.0013442 0.123 2.15 3.141592653 123.0 4221.0} do_test sort-1.6 { execsql {SELECT flt FROM t1 ORDER BY flt DESC} } {4221.0 123.0 3.141592653 2.15 0.123 -0.0013442 -1.6 -11} do_test sort-1.7 { execsql {SELECT roman FROM t1 ORDER BY roman} } {I II III IV V VI VII VIII} do_test sort-1.8 { execsql {SELECT n FROM t1 ORDER BY log, flt} } {1 2 3 5 4 6 7 8} do_test sort-1.9 { execsql {SELECT n FROM t1 ORDER BY log, flt DESC} } {1 3 2 7 6 4 5 8} do_test sort-1.10 { execsql {SELECT n FROM t1 ORDER BY log DESC, flt} } {8 5 4 6 7 2 3 1} do_test sort-1.11 { execsql {SELECT n FROM t1 ORDER BY log DESC, flt DESC} } {8 7 6 4 5 3 2 1} finish_test |