database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-29 08:01:23 +03:00
Code Activity

Fix the error message returned by sqlite3session_diff() for tables with no PRIMARY KEY.

Browse Source 
FossilOrigin-Name: 4d34a3d40da210bebb2a2e6dff094f9a39c92798
This commit is contained in:
dan
2015-04-23 15:03:14 +00:00
parent dd009f839c
commit 4cc923e3e3
5 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ext/session/sqlite3session.c
View File

@ -1473,18 +1473,21 @@ int sqlite3session_diff(
/* Check the table schemas match */
if( rc==SQLITE_OK ){
int bHasPk = 0;
int nCol; /* Columns in zFrom.zTbl */
u8 *abPK;
const char **azCol = 0;
rc = sessionTableInfo(db, zFrom, zTbl, &nCol, 0, &azCol, &abPK);
if( rc==SQLITE_OK ){
int bMismatch = 0;
if( pTo->nCol!=nCol || memcmp(pTo->abPK, abPK, nCol) ){
if( pTo->nCol!=nCol ){
bMismatch = 1;
}else{
int i;
for(i=0; i<nCol; i++){
if( pTo->abPK[i]!=abPK[i] ) bMismatch = 1;
if( sqlite3_stricmp(azCol[i], pTo->azCol[i]) ) bMismatch = 1;
if( abPK[i] ) bHasPk = 1;
}
}
@ -1492,6 +1495,10 @@ int sqlite3session_diff(
*pzErrMsg = sqlite3_mprintf("table schemas do not match");
rc = SQLITE_ERROR;
}
if( bHasPk==0 ){
*pzErrMsg = sqlite3_mprintf("table has no primary key");
rc = SQLITE_ERROR;
}
}
sqlite3_free(azCol);
}