Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fixes to allow testfixture to be compiled with SQLITE_OMIT_VIRTUAL_TABLE defined. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
00231fb0127960d700de3549e34e82f8 |
| User & Date: | dan 2013-05-15 18:34:17 |
Context
|
2013-05-15
| ||
| 20:35 | Apply compilation fix from [a58af81483] to the other makefiles as well. check-in: 7e76889d user: mistachkin tags: trunk | |
| 18:34 | Fixes to allow testfixture to be compiled with SQLITE_OMIT_VIRTUAL_TABLE defined. check-in: 00231fb0 user: dan tags: trunk | |
| 17:47 | The sqlite3ExprCollSeq() function can no longer be called while parse the schema, so remove the code path inside of sqlite3ExprCollSeq() that dealt with that case. check-in: 867b3e3b user: drh tags: trunk | |
Changes
Changes to ext/misc/amatch.c.
160 161 162 163 164 165 166 167 168 169 170 171 172 173 .... 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 .... 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 |
SQLITE_EXTENSION_INIT1 #include <stdlib.h> #include <string.h> #include <assert.h> #include <stdio.h> #include <ctype.h> /* ** Forward declaration of objects used by this implementation */ typedef struct amatch_vtab amatch_vtab; typedef struct amatch_cursor amatch_cursor; typedef struct amatch_rule amatch_rule; typedef struct amatch_word amatch_word; ................................................................................ 0, /* xFindMethod */ 0, /* xRename */ 0, /* xSavepoint */ 0, /* xRelease */ 0 /* xRollbackTo */ }; /* ** Register the amatch virtual table */ #ifdef _WIN32 __declspec(dllexport) #endif int sqlite3_amatch_init( ................................................................................ sqlite3 *db, char **pzErrMsg, const sqlite3_api_routines *pApi ){ int rc = SQLITE_OK; SQLITE_EXTENSION_INIT2(pApi); (void)pzErrMsg; /* Not used */ rc = sqlite3_create_module(db, "approximate_match", &amatchModule, 0); return rc; } |
> > > > > > |
160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 .... 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 .... 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 |
SQLITE_EXTENSION_INIT1 #include <stdlib.h> #include <string.h> #include <assert.h> #include <stdio.h> #include <ctype.h> #ifndef SQLITE_OMIT_VIRTUALTABLE /* ** Forward declaration of objects used by this implementation */ typedef struct amatch_vtab amatch_vtab; typedef struct amatch_cursor amatch_cursor; typedef struct amatch_rule amatch_rule; typedef struct amatch_word amatch_word; ................................................................................ 0, /* xFindMethod */ 0, /* xRename */ 0, /* xSavepoint */ 0, /* xRelease */ 0 /* xRollbackTo */ }; #endif /* SQLITE_OMIT_VIRTUALTABLE */ /* ** Register the amatch virtual table */ #ifdef _WIN32 __declspec(dllexport) #endif int sqlite3_amatch_init( ................................................................................ sqlite3 *db, char **pzErrMsg, const sqlite3_api_routines *pApi ){ int rc = SQLITE_OK; SQLITE_EXTENSION_INIT2(pApi); (void)pzErrMsg; /* Not used */ #ifndef SQLITE_OMIT_VIRTUALTABLE rc = sqlite3_create_module(db, "approximate_match", &amatchModule, 0); #endif /* SQLITE_OMIT_VIRTUALTABLE */ return rc; } |
Changes to ext/misc/closure.c.
144 145 146 147 148 149 150 151 152 153 154 155 156 157 ... 919 920 921 922 923 924 925 926 927 928 929 930 931 932 ... 933 934 935 936 937 938 939 940 941 942 |
SQLITE_EXTENSION_INIT1 #include <stdlib.h> #include <string.h> #include <assert.h> #include <stdio.h> #include <ctype.h> /* ** Forward declaration of objects used by this implementation */ typedef struct closure_vtab closure_vtab; typedef struct closure_cursor closure_cursor; typedef struct closure_queue closure_queue; typedef struct closure_avl closure_avl; ................................................................................ 0, /* xFindMethod */ 0, /* xRename */ 0, /* xSavepoint */ 0, /* xRelease */ 0 /* xRollbackTo */ }; /* ** Register the closure virtual table */ #ifdef _WIN32 __declspec(dllexport) #endif int sqlite3_closure_init( ................................................................................ sqlite3 *db, char **pzErrMsg, const sqlite3_api_routines *pApi ){ int rc = SQLITE_OK; SQLITE_EXTENSION_INIT2(pApi); (void)pzErrMsg; rc = sqlite3_create_module(db, "transitive_closure", &closureModule, 0); return rc; } |
> > > > > > |
144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 ... 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 ... 937 938 939 940 941 942 943 944 945 946 947 948 |
SQLITE_EXTENSION_INIT1 #include <stdlib.h> #include <string.h> #include <assert.h> #include <stdio.h> #include <ctype.h> #ifndef SQLITE_OMIT_VIRTUALTABLE /* ** Forward declaration of objects used by this implementation */ typedef struct closure_vtab closure_vtab; typedef struct closure_cursor closure_cursor; typedef struct closure_queue closure_queue; typedef struct closure_avl closure_avl; ................................................................................ 0, /* xFindMethod */ 0, /* xRename */ 0, /* xSavepoint */ 0, /* xRelease */ 0 /* xRollbackTo */ }; #endif /* SQLITE_OMIT_VIRTUALTABLE */ /* ** Register the closure virtual table */ #ifdef _WIN32 __declspec(dllexport) #endif int sqlite3_closure_init( ................................................................................ sqlite3 *db, char **pzErrMsg, const sqlite3_api_routines *pApi ){ int rc = SQLITE_OK; SQLITE_EXTENSION_INIT2(pApi); (void)pzErrMsg; #ifndef SQLITE_OMIT_VIRTUALTABLE rc = sqlite3_create_module(db, "transitive_closure", &closureModule, 0); #endif /* SQLITE_OMIT_VIRTUALTABLE */ return rc; } |
Changes to ext/misc/fuzzer.c.
1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 |
int sqlite3_fuzzer_init(
sqlite3 *db,
char **pzErrMsg,
const sqlite3_api_routines *pApi
){
int rc = SQLITE_OK;
SQLITE_EXTENSION_INIT2(pApi);
rc = sqlite3_create_module(db, "fuzzer", &fuzzerModule, 0);
return rc;
}
|
> > |
1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 |
int sqlite3_fuzzer_init(
sqlite3 *db,
char **pzErrMsg,
const sqlite3_api_routines *pApi
){
int rc = SQLITE_OK;
SQLITE_EXTENSION_INIT2(pApi);
#ifndef SQLITE_OMIT_VIRTUALTABLE
rc = sqlite3_create_module(db, "fuzzer", &fuzzerModule, 0);
#endif
return rc;
}
|
Changes to ext/misc/spellfix.c.
25
26
27
28
29
30
31
32
33
34
35
36
37
38
....
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
|
# define ALWAYS(X) 1
# define NEVER(X) 0
typedef unsigned char u8;
typedef unsigned short u16;
# include <ctype.h>
#endif
/*
** Character classes for ASCII characters:
**
** 0 '' Silent letters: H W
** 1 'A' Any vowel: A E I O U (Y)
** 2 'B' A bilabeal stop or fricative: B F P V W
** 3 'C' Other fricatives or back stops: C G J K Q S X Z
................................................................................
for(i=0; i<sizeof(translit)/sizeof(translit[0])-1; i++){
assert( translit[i].cFrom<translit[i+1].cFrom );
}
return rc;
}
/*
** Extension load function.
*/
#ifdef _WIN32
__declspec(dllexport)
#endif
int sqlite3_spellfix_init(
sqlite3 *db,
char **pzErrMsg,
const sqlite3_api_routines *pApi
){
SQLITE_EXTENSION_INIT2(pApi);
return spellfix1Register(db);
}
|
>
>
>
>
>
>
>
|
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
....
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
|
# define ALWAYS(X) 1 # define NEVER(X) 0 typedef unsigned char u8; typedef unsigned short u16; # include <ctype.h> #endif #ifndef SQLITE_OMIT_VIRTUALTABLE /* ** Character classes for ASCII characters: ** ** 0 '' Silent letters: H W ** 1 'A' Any vowel: A E I O U (Y) ** 2 'B' A bilabeal stop or fricative: B F P V W ** 3 'C' Other fricatives or back stops: C G J K Q S X Z ................................................................................ for(i=0; i<sizeof(translit)/sizeof(translit[0])-1; i++){ assert( translit[i].cFrom<translit[i+1].cFrom ); } return rc; } #endif /* SQLITE_OMIT_VIRTUALTABLE */ /* ** Extension load function. */ #ifdef _WIN32 __declspec(dllexport) #endif int sqlite3_spellfix_init( sqlite3 *db, char **pzErrMsg, const sqlite3_api_routines *pApi ){ SQLITE_EXTENSION_INIT2(pApi); #ifndef SQLITE_OMIT_VIRTUALTABLE return spellfix1Register(db); #endif return SQLITE_OK; } |
Changes to test/closure01.test.
10 11 12 13 14 15 16 17 18 19 20 21 22 23 |
#***********************************************************************
#
# Test cases for transitive_closure virtual table.
set testdir [file dirname $argv0]
source $testdir/tester.tcl
set testprefix closure01
load_static_extension db closure
do_execsql_test 1.0 {
BEGIN;
CREATE TABLE t1(x INTEGER PRIMARY KEY, y INTEGER);
CREATE INDEX t1y ON t1(y);
|
> > |
10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 |
#***********************************************************************
#
# Test cases for transitive_closure virtual table.
set testdir [file dirname $argv0]
source $testdir/tester.tcl
set testprefix closure01
ifcapable !vtab { finish_test ; return }
load_static_extension db closure
do_execsql_test 1.0 {
BEGIN;
CREATE TABLE t1(x INTEGER PRIMARY KEY, y INTEGER);
CREATE INDEX t1y ON t1(y);
|
Changes to test/wal.test.
1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 |
do_test wal-23.3 {
db close
set ::log [list]
faultsim_restore_and_reopen
execsql { SELECT * FROM t1 }
} {1 2 3 4}
set nPage [expr 2+$AUTOVACUUM]
do_test wal-23.4 {
set ::log
} [list SQLITE_NOTICE_RECOVER_WAL \
"recovered $nPage frames from WAL file $walfile"]
ifcapable autovacuum {
# This block tests that if the size of a database is reduced by a
# transaction (because of an incremental or auto-vacuum), that no
# data is written to the WAL file for the truncated pages as part
# of the commit. e.g. if a transaction reduces the size of a database
|
< | |
1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 |
do_test wal-23.3 {
db close
set ::log [list]
faultsim_restore_and_reopen
execsql { SELECT * FROM t1 }
} {1 2 3 4}
do_test wal-23.4 {
set ::log
} [list SQLITE_NOTICE_RECOVER_WAL \
"recovered 2 frames from WAL file $walfile"]
ifcapable autovacuum {
# This block tests that if the size of a database is reduced by a
# transaction (because of an incremental or auto-vacuum), that no
# data is written to the WAL file for the truncated pages as part
# of the commit. e.g. if a transaction reduces the size of a database
|