Fossil SCM

Execute 'optional' SQL statements in their original order.

mistachkin 2015-02-24 00:36 trunk merge
Commit 9491f1dd54e2ff7c432845bb2293b3bbd736141d
1 file changed +4 -2
+4 -2
--- src/db.c
+++ src/db.c
@@ -159,14 +159,16 @@
159159
if( rollbackFlag ) db.doRollback = 1;
160160
db.nBegin--;
161161
if( db.nBegin==0 ){
162162
int i;
163163
if( db.doRollback==0 && db.nPriorChanges<sqlite3_total_changes(g.db) ){
164
+ i = 0;
164165
while( db.nBeforeCommit ){
165166
db.nBeforeCommit--;
166
- sqlite3_exec(g.db, db.azBeforeCommit[db.nBeforeCommit], 0, 0, 0);
167
- sqlite3_free(db.azBeforeCommit[db.nBeforeCommit]);
167
+ sqlite3_exec(g.db, db.azBeforeCommit[i], 0, 0, 0);
168
+ sqlite3_free(db.azBeforeCommit[i]);
169
+ i++;
168170
}
169171
leaf_do_pending_checks();
170172
}
171173
for(i=0; db.doRollback==0 && i<db.nCommitHook; i++){
172174
db.doRollback |= db.aHook[i].xHook();
173175
--- src/db.c
+++ src/db.c
@@ -159,14 +159,16 @@
159 if( rollbackFlag ) db.doRollback = 1;
160 db.nBegin--;
161 if( db.nBegin==0 ){
162 int i;
163 if( db.doRollback==0 && db.nPriorChanges<sqlite3_total_changes(g.db) ){
 
164 while( db.nBeforeCommit ){
165 db.nBeforeCommit--;
166 sqlite3_exec(g.db, db.azBeforeCommit[db.nBeforeCommit], 0, 0, 0);
167 sqlite3_free(db.azBeforeCommit[db.nBeforeCommit]);
 
168 }
169 leaf_do_pending_checks();
170 }
171 for(i=0; db.doRollback==0 && i<db.nCommitHook; i++){
172 db.doRollback |= db.aHook[i].xHook();
173
--- src/db.c
+++ src/db.c
@@ -159,14 +159,16 @@
159 if( rollbackFlag ) db.doRollback = 1;
160 db.nBegin--;
161 if( db.nBegin==0 ){
162 int i;
163 if( db.doRollback==0 && db.nPriorChanges<sqlite3_total_changes(g.db) ){
164 i = 0;
165 while( db.nBeforeCommit ){
166 db.nBeforeCommit--;
167 sqlite3_exec(g.db, db.azBeforeCommit[i], 0, 0, 0);
168 sqlite3_free(db.azBeforeCommit[i]);
169 i++;
170 }
171 leaf_do_pending_checks();
172 }
173 for(i=0; db.doRollback==0 && i<db.nCommitHook; i++){
174 db.doRollback |= db.aHook[i].xHook();
175

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button