database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-02 05:54:29 +03:00
Code Activity

Test cases added. RETURNING works with UPSERT as does PG.

Browse Source 
FossilOrigin-Name: f5698f96e27c9b8669ec6016bb9920ef7580c4146eb61d628a0f62be5135ce94
This commit is contained in:
drh
2021-01-30 01:30:26 +00:00
parent 8f4e2e25c4
commit ba71a8a01b
5 changed files with 105 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/vdbeaux.c
View File

@@ -2602,7 +2602,10 @@ void sqlite3VdbeSetNumCols(Vdbe *p, int nResColumn){
void sqlite3VdbeColumnInfoXfer(Vdbe *pTo, Vdbe *pFrom){
sqlite3 *db = pTo->db;
assert( db==pFrom->db );
sqlite3DbFree(db, pTo->aColName);
if( pTo->nResColumn ){
releaseMemArray(pTo->aColName, pTo->nResColumn*COLNAME_N);
sqlite3DbFree(db, pTo->aColName);
}
pTo->aColName = pFrom->aColName;
pFrom->aColName = 0;
pTo->nResColumn = pFrom->nResColumn;