database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-30 19:03:16 +03:00
Code Activity

Merge trunk into autosetup branch.

Browse Source 
FossilOrigin-Name: 2923a8924c92f62d07cb130462a8e6f4662837bad1a02bda53e630b64c692f60
This commit is contained in:
stephan
2024-10-19 13:51:23 +00:00
parent 6d8ec2aed4 885fad890c
commit a505d89bbe
29 changed files with 2532 additions and 1347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tool/custom.txt
View File

@ -38,6 +38,7 @@ amalgamator
amongst
analyse
antipenultimate
antirez
ap
api
appdef
@ -93,6 +94,7 @@ beginthreadex
behavior
behavioral
behaviors
behaviour
benigncnt
bg
bigblob
@ -243,6 +245,7 @@ dependences
dequote
dequoted
dequoting
dereference
dereferenced
dereferences
desc
@ -476,6 +479,7 @@ iff
ifndef
imm
impl
imposter
incr
incrblob
incrementing
@ -563,6 +567,7 @@ lifecycle
lindex
lineno
Linenoise
linenoise
linux
lised
lld
@ -650,6 +655,7 @@ msec
msg
msgs
msize
msteveb
msvc
mtime
mult
@ -893,6 +899,7 @@ rowids
Rowkey
rownumber
rowset
rsync
runtime
rw
rwc
@ -1192,6 +1199,7 @@ wheretrace
whitespace
Willmann
withoutrowid
workalike
wr
wrapup
writeable

32
tool/sqlite3_rsync.c
View File

@ -56,6 +56,7 @@ struct SQLiteRsync {
u8 isRemote; /* On the remote side of a connection */
u8 isReplica; /* True if running on the replica side */
u8 iProtocol; /* Protocol version number */
u8 wrongEncoding; /* ATTACH failed due to wrong encoding */
sqlite3_uint64 nOut; /* Bytes transmitted */
sqlite3_uint64 nIn; /* Bytes received */
unsigned int nPage; /* Total number of pages in the database */
@ -1064,7 +1065,15 @@ static sqlite3_stmt *prepareStmt(
return pStmt;
}
/* Run a single SQL statement
/* Run a single SQL statement. Report an error if something goes
** wrong.
**
** As a special case, if the statement starts with "ATTACH" (but not
** "Attach") and if the error message is about an incorrect encoding,
** then do not report the error, but instead set the wrongEncoding flag.
** This is a kludgy work-around to the problem of attaching a database
** with a non-UTF8 encoding to the empty :memory: database that is
** opened on the replica.
*/
static void runSql(SQLiteRsync *p, char *zSql, ...){
sqlite3_stmt *pStmt;
@ -1077,8 +1086,15 @@ static void runSql(SQLiteRsync *p, char *zSql, ...){
int rc = sqlite3_step(pStmt);
if( rc==SQLITE_ROW ) rc = sqlite3_step(pStmt);
if( rc!=SQLITE_OK && rc!=SQLITE_DONE ){
reportError(p, "SQL statement [%s] failed: %s", zSql,
sqlite3_errmsg(p->db));
const char *zErr = sqlite3_errmsg(p->db);
if( strncmp(zSql,"ATTACH ", 7)==0
&& strstr(zErr,"must use the same text encoding")!=0
){
p->wrongEncoding = 1;
}else{
reportError(p, "SQL statement [%s] failed: %s", zSql,
sqlite3_errmsg(p->db));
}
}
sqlite3_finalize(pStmt);
}
@ -1407,6 +1423,16 @@ static void replicaSide(SQLiteRsync *p){
break;
}
runSql(p, "ATTACH %Q AS 'replica'", p->zReplica);
if( p->wrongEncoding ){
p->wrongEncoding = 0;
runSql(p, "PRAGMA encoding=utf16le");
runSql(p, "ATTACH %Q AS 'replica'", p->zReplica);
if( p->wrongEncoding ){
p->wrongEncoding = 0;
runSql(p, "PRAGMA encoding=utf16be");
runSql(p, "Attach %Q AS 'replica'", p->zReplica);
}
}
if( p->nErr ){
closeDb(p);
break;