Fossil SCM

Merge trunk. Rename "hidden" option (not the tag name) to "hide", just as the "close" option compared to the "closed" tag. Just to prevent confusion.

jan.nijtmans 2013-12-03 15:42 hidden-tag merge
Commit 1a453093bb4662359038824e43c50a232b1a7f34
Parent ec4fe5cb15943a0…
4 files changed +9 -10 +9 -10 +4 -7 +1 -1
~ src/info.c ~ src/info.c ~ src/sqlite3.c ~ src/sqlite3.h
M src/info.c
+9 -10
--- src/info.c
+++ src/info.c
@@ -2054,11 +2054,12 @@
20542054
 const char *zNewBranch;
20552055
 const char *zCloseFlag;
20562056
 const char *zHiddenFlag;
20572057
 int fPropagateColor; /* True if color propagates before edit */
20582058
 int fNewPropagateColor; /* True if color propagates after edit */
2059
- int fHasHidden = 0; /* True hidden flag already set */
2059
+ int fHasHidden = 0; /* True if hidden tag already set */
2060
+ int fHasClosed = 0; /* True if closed tag already set */
20602061
 const char *zChngTime = 0; /* Value of chngtime= query param, if any */
20612062
 char *zUuid;
20622063
 Blob comment;
20632064
 const char *zBranchName = 0;
20642065
 Stmt q;
@@ -2096,11 +2097,11 @@
20962097
 zNewTagFlag = P("newtag") ? " checked" : "";
20972098
 zNewTag = PDT("tagname","");
20982099
 zNewBrFlag = P("newbr") ? " checked" : "";
20992100
 zNewBranch = PDT("brname","");
21002101
 zCloseFlag = P("close") ? " checked" : "";
2101
- zHiddenFlag = P("hidden") ? " checked" : "";
2102
+ zHiddenFlag = P("hide") ? " checked" : "";
21022103
 if( P("apply") ){
21032104
 Blob ctrl;
21042105
 char *zNow;
21052106
 int nChng = 0;
21062107
@@ -2303,13 +2304,15 @@
23032304
 @ <input type="checkbox" name="c%d(tagid)" />
23042305
 }
23052306
 if( strncmp(zTagName, "sym-", 4)==0 ){
23062307
 @ Cancel tag <b>%h(&zTagName[4])</b></label>
23072308
 }else{
2308
- if( strcmp(zTagName, "hidden")==0 ){
2309
+ if( tagid==TAG_HIDDEN ){
23092310
 fHasHidden = 1;
2310
- }else if( strcmp(zTagName, "branch")==0 ){
2311
+ }else if( tagid==TAG_CLOSED ){
2312
+ fHasClosed = 1;
2313
+ }else if( tagid==TAG_BRANCH ){
23112314
 const char *value = db_column_text(&q, 2);
23122315
 /* Protect "trunk" nodes from ever being hidden! */
23132316
 if( strcmp(value, db_get("main-branch", "trunk"))!=0 ){
23142317
 zBranchName = mprintf("%s", value);
23152318
 }
@@ -2329,21 +2332,17 @@
23292332
 @ </td></tr>
23302333
23312334
 if( !fHasHidden && zBranchName ){
23322335
 @ <tr><th align="right" valign="top">Branch Hiding:</th>
23332336
 @ <td valign="top">
2334
- @ <label><input type="checkbox" name="hidden"%s(zHiddenFlag) />
2337
+ @ <label><input type="checkbox" name="hide"%s(zHiddenFlag) />
23352338
 @ Hide branch <b>%s(zBranchName)</b> from the timeline starting from this
23362339
 @ check-in and make sure it is closed</label>
23372340
 @ </td></tr>
23382341
 }
23392342
2340
- if( is_a_leaf(rid)
2341
- && !db_exists("SELECT 1 FROM tagxref "
2342
- " WHERE tagid=%d AND rid=%d AND tagtype>0",
2343
- TAG_CLOSED, rid)
2344
- ){
2343
+ if( !fHasClosed && is_a_leaf(rid) ){
23452344
 @ <tr><th align="right" valign="top">Leaf Closure:</th>
23462345
 @ <td valign="top">
23472346
 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
23482347
 @ Mark this leaf as "closed" so that it no longer appears on the
23492348
 @ "leaves" page and is no longer labeled as a "<b>Leaf</b>"</label>
23502349
--- src/info.c
+++ src/info.c
@@ -2054,11 +2054,12 @@
2054 const char *zNewBranch;
2055 const char *zCloseFlag;
2056 const char *zHiddenFlag;
2057 int fPropagateColor; /* True if color propagates before edit */
2058 int fNewPropagateColor; /* True if color propagates after edit */
2059 int fHasHidden = 0; /* True hidden flag already set */
 
2060 const char *zChngTime = 0; /* Value of chngtime= query param, if any */
2061 char *zUuid;
2062 Blob comment;
2063 const char *zBranchName = 0;
2064 Stmt q;
@@ -2096,11 +2097,11 @@
2096 zNewTagFlag = P("newtag") ? " checked" : "";
2097 zNewTag = PDT("tagname","");
2098 zNewBrFlag = P("newbr") ? " checked" : "";
2099 zNewBranch = PDT("brname","");
2100 zCloseFlag = P("close") ? " checked" : "";
2101 zHiddenFlag = P("hidden") ? " checked" : "";
2102 if( P("apply") ){
2103 Blob ctrl;
2104 char *zNow;
2105 int nChng = 0;
2106
@@ -2303,13 +2304,15 @@
2303 @ <input type="checkbox" name="c%d(tagid)" />
2304 }
2305 if( strncmp(zTagName, "sym-", 4)==0 ){
2306 @ Cancel tag <b>%h(&zTagName[4])</b></label>
2307 }else{
2308 if( strcmp(zTagName, "hidden")==0 ){
2309 fHasHidden = 1;
2310 }else if( strcmp(zTagName, "branch")==0 ){
 
 
2311 const char *value = db_column_text(&q, 2);
2312 /* Protect "trunk" nodes from ever being hidden! */
2313 if( strcmp(value, db_get("main-branch", "trunk"))!=0 ){
2314 zBranchName = mprintf("%s", value);
2315 }
@@ -2329,21 +2332,17 @@
2329 @ </td></tr>
2330
2331 if( !fHasHidden && zBranchName ){
2332 @ <tr><th align="right" valign="top">Branch Hiding:</th>
2333 @ <td valign="top">
2334 @ <label><input type="checkbox" name="hidden"%s(zHiddenFlag) />
2335 @ Hide branch <b>%s(zBranchName)</b> from the timeline starting from this
2336 @ check-in and make sure it is closed</label>
2337 @ </td></tr>
2338 }
2339
2340 if( is_a_leaf(rid)
2341 && !db_exists("SELECT 1 FROM tagxref "
2342 " WHERE tagid=%d AND rid=%d AND tagtype>0",
2343 TAG_CLOSED, rid)
2344 ){
2345 @ <tr><th align="right" valign="top">Leaf Closure:</th>
2346 @ <td valign="top">
2347 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
2348 @ Mark this leaf as "closed" so that it no longer appears on the
2349 @ "leaves" page and is no longer labeled as a "<b>Leaf</b>"</label>
2350
--- src/info.c
+++ src/info.c
@@ -2054,11 +2054,12 @@
2054 const char *zNewBranch;
2055 const char *zCloseFlag;
2056 const char *zHiddenFlag;
2057 int fPropagateColor; /* True if color propagates before edit */
2058 int fNewPropagateColor; /* True if color propagates after edit */
2059 int fHasHidden = 0; /* True if hidden tag already set */
2060 int fHasClosed = 0; /* True if closed tag already set */
2061 const char *zChngTime = 0; /* Value of chngtime= query param, if any */
2062 char *zUuid;
2063 Blob comment;
2064 const char *zBranchName = 0;
2065 Stmt q;
@@ -2096,11 +2097,11 @@
2097 zNewTagFlag = P("newtag") ? " checked" : "";
2098 zNewTag = PDT("tagname","");
2099 zNewBrFlag = P("newbr") ? " checked" : "";
2100 zNewBranch = PDT("brname","");
2101 zCloseFlag = P("close") ? " checked" : "";
2102 zHiddenFlag = P("hide") ? " checked" : "";
2103 if( P("apply") ){
2104 Blob ctrl;
2105 char *zNow;
2106 int nChng = 0;
2107
@@ -2303,13 +2304,15 @@
2304 @ <input type="checkbox" name="c%d(tagid)" />
2305 }
2306 if( strncmp(zTagName, "sym-", 4)==0 ){
2307 @ Cancel tag <b>%h(&zTagName[4])</b></label>
2308 }else{
2309 if( tagid==TAG_HIDDEN ){
2310 fHasHidden = 1;
2311 }else if( tagid==TAG_CLOSED ){
2312 fHasClosed = 1;
2313 }else if( tagid==TAG_BRANCH ){
2314 const char *value = db_column_text(&q, 2);
2315 /* Protect "trunk" nodes from ever being hidden! */
2316 if( strcmp(value, db_get("main-branch", "trunk"))!=0 ){
2317 zBranchName = mprintf("%s", value);
2318 }
@@ -2329,21 +2332,17 @@
2332 @ </td></tr>
2333
2334 if( !fHasHidden && zBranchName ){
2335 @ <tr><th align="right" valign="top">Branch Hiding:</th>
2336 @ <td valign="top">
2337 @ <label><input type="checkbox" name="hide"%s(zHiddenFlag) />
2338 @ Hide branch <b>%s(zBranchName)</b> from the timeline starting from this
2339 @ check-in and make sure it is closed</label>
2340 @ </td></tr>
2341 }
2342
2343 if( !fHasClosed && is_a_leaf(rid) ){
 
 
 
 
2344 @ <tr><th align="right" valign="top">Leaf Closure:</th>
2345 @ <td valign="top">
2346 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
2347 @ Mark this leaf as "closed" so that it no longer appears on the
2348 @ "leaves" page and is no longer labeled as a "<b>Leaf</b>"</label>
2349
M src/info.c
+9 -10
--- src/info.c
+++ src/info.c
@@ -2054,11 +2054,12 @@
20542054
 const char *zNewBranch;
20552055
 const char *zCloseFlag;
20562056
 const char *zHiddenFlag;
20572057
 int fPropagateColor; /* True if color propagates before edit */
20582058
 int fNewPropagateColor; /* True if color propagates after edit */
2059
- int fHasHidden = 0; /* True hidden flag already set */
2059
+ int fHasHidden = 0; /* True if hidden tag already set */
2060
+ int fHasClosed = 0; /* True if closed tag already set */
20602061
 const char *zChngTime = 0; /* Value of chngtime= query param, if any */
20612062
 char *zUuid;
20622063
 Blob comment;
20632064
 const char *zBranchName = 0;
20642065
 Stmt q;
@@ -2096,11 +2097,11 @@
20962097
 zNewTagFlag = P("newtag") ? " checked" : "";
20972098
 zNewTag = PDT("tagname","");
20982099
 zNewBrFlag = P("newbr") ? " checked" : "";
20992100
 zNewBranch = PDT("brname","");
21002101
 zCloseFlag = P("close") ? " checked" : "";
2101
- zHiddenFlag = P("hidden") ? " checked" : "";
2102
+ zHiddenFlag = P("hide") ? " checked" : "";
21022103
 if( P("apply") ){
21032104
 Blob ctrl;
21042105
 char *zNow;
21052106
 int nChng = 0;
21062107
@@ -2303,13 +2304,15 @@
23032304
 @ <input type="checkbox" name="c%d(tagid)" />
23042305
 }
23052306
 if( strncmp(zTagName, "sym-", 4)==0 ){
23062307
 @ Cancel tag <b>%h(&zTagName[4])</b></label>
23072308
 }else{
2308
- if( strcmp(zTagName, "hidden")==0 ){
2309
+ if( tagid==TAG_HIDDEN ){
23092310
 fHasHidden = 1;
2310
- }else if( strcmp(zTagName, "branch")==0 ){
2311
+ }else if( tagid==TAG_CLOSED ){
2312
+ fHasClosed = 1;
2313
+ }else if( tagid==TAG_BRANCH ){
23112314
 const char *value = db_column_text(&q, 2);
23122315
 /* Protect "trunk" nodes from ever being hidden! */
23132316
 if( strcmp(value, db_get("main-branch", "trunk"))!=0 ){
23142317
 zBranchName = mprintf("%s", value);
23152318
 }
@@ -2329,21 +2332,17 @@
23292332
 @ </td></tr>
23302333
23312334
 if( !fHasHidden && zBranchName ){
23322335
 @ <tr><th align="right" valign="top">Branch Hiding:</th>
23332336
 @ <td valign="top">
2334
- @ <label><input type="checkbox" name="hidden"%s(zHiddenFlag) />
2337
+ @ <label><input type="checkbox" name="hide"%s(zHiddenFlag) />
23352338
 @ Hide branch <b>%s(zBranchName)</b> from the timeline starting from this
23362339
 @ check-in and make sure it is closed</label>
23372340
 @ </td></tr>
23382341
 }
23392342
2340
- if( is_a_leaf(rid)
2341
- && !db_exists("SELECT 1 FROM tagxref "
2342
- " WHERE tagid=%d AND rid=%d AND tagtype>0",
2343
- TAG_CLOSED, rid)
2344
- ){
2343
+ if( !fHasClosed && is_a_leaf(rid) ){
23452344
 @ <tr><th align="right" valign="top">Leaf Closure:</th>
23462345
 @ <td valign="top">
23472346
 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
23482347
 @ Mark this leaf as "closed" so that it no longer appears on the
23492348
 @ "leaves" page and is no longer labeled as a "<b>Leaf</b>"</label>
23502349
--- src/info.c
+++ src/info.c
@@ -2054,11 +2054,12 @@
2054 const char *zNewBranch;
2055 const char *zCloseFlag;
2056 const char *zHiddenFlag;
2057 int fPropagateColor; /* True if color propagates before edit */
2058 int fNewPropagateColor; /* True if color propagates after edit */
2059 int fHasHidden = 0; /* True hidden flag already set */
 
2060 const char *zChngTime = 0; /* Value of chngtime= query param, if any */
2061 char *zUuid;
2062 Blob comment;
2063 const char *zBranchName = 0;
2064 Stmt q;
@@ -2096,11 +2097,11 @@
2096 zNewTagFlag = P("newtag") ? " checked" : "";
2097 zNewTag = PDT("tagname","");
2098 zNewBrFlag = P("newbr") ? " checked" : "";
2099 zNewBranch = PDT("brname","");
2100 zCloseFlag = P("close") ? " checked" : "";
2101 zHiddenFlag = P("hidden") ? " checked" : "";
2102 if( P("apply") ){
2103 Blob ctrl;
2104 char *zNow;
2105 int nChng = 0;
2106
@@ -2303,13 +2304,15 @@
2303 @ <input type="checkbox" name="c%d(tagid)" />
2304 }
2305 if( strncmp(zTagName, "sym-", 4)==0 ){
2306 @ Cancel tag <b>%h(&zTagName[4])</b></label>
2307 }else{
2308 if( strcmp(zTagName, "hidden")==0 ){
2309 fHasHidden = 1;
2310 }else if( strcmp(zTagName, "branch")==0 ){
 
 
2311 const char *value = db_column_text(&q, 2);
2312 /* Protect "trunk" nodes from ever being hidden! */
2313 if( strcmp(value, db_get("main-branch", "trunk"))!=0 ){
2314 zBranchName = mprintf("%s", value);
2315 }
@@ -2329,21 +2332,17 @@
2329 @ </td></tr>
2330
2331 if( !fHasHidden && zBranchName ){
2332 @ <tr><th align="right" valign="top">Branch Hiding:</th>
2333 @ <td valign="top">
2334 @ <label><input type="checkbox" name="hidden"%s(zHiddenFlag) />
2335 @ Hide branch <b>%s(zBranchName)</b> from the timeline starting from this
2336 @ check-in and make sure it is closed</label>
2337 @ </td></tr>
2338 }
2339
2340 if( is_a_leaf(rid)
2341 && !db_exists("SELECT 1 FROM tagxref "
2342 " WHERE tagid=%d AND rid=%d AND tagtype>0",
2343 TAG_CLOSED, rid)
2344 ){
2345 @ <tr><th align="right" valign="top">Leaf Closure:</th>
2346 @ <td valign="top">
2347 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
2348 @ Mark this leaf as "closed" so that it no longer appears on the
2349 @ "leaves" page and is no longer labeled as a "<b>Leaf</b>"</label>
2350
--- src/info.c
+++ src/info.c
@@ -2054,11 +2054,12 @@
2054 const char *zNewBranch;
2055 const char *zCloseFlag;
2056 const char *zHiddenFlag;
2057 int fPropagateColor; /* True if color propagates before edit */
2058 int fNewPropagateColor; /* True if color propagates after edit */
2059 int fHasHidden = 0; /* True if hidden tag already set */
2060 int fHasClosed = 0; /* True if closed tag already set */
2061 const char *zChngTime = 0; /* Value of chngtime= query param, if any */
2062 char *zUuid;
2063 Blob comment;
2064 const char *zBranchName = 0;
2065 Stmt q;
@@ -2096,11 +2097,11 @@
2097 zNewTagFlag = P("newtag") ? " checked" : "";
2098 zNewTag = PDT("tagname","");
2099 zNewBrFlag = P("newbr") ? " checked" : "";
2100 zNewBranch = PDT("brname","");
2101 zCloseFlag = P("close") ? " checked" : "";
2102 zHiddenFlag = P("hide") ? " checked" : "";
2103 if( P("apply") ){
2104 Blob ctrl;
2105 char *zNow;
2106 int nChng = 0;
2107
@@ -2303,13 +2304,15 @@
2304 @ <input type="checkbox" name="c%d(tagid)" />
2305 }
2306 if( strncmp(zTagName, "sym-", 4)==0 ){
2307 @ Cancel tag <b>%h(&zTagName[4])</b></label>
2308 }else{
2309 if( tagid==TAG_HIDDEN ){
2310 fHasHidden = 1;
2311 }else if( tagid==TAG_CLOSED ){
2312 fHasClosed = 1;
2313 }else if( tagid==TAG_BRANCH ){
2314 const char *value = db_column_text(&q, 2);
2315 /* Protect "trunk" nodes from ever being hidden! */
2316 if( strcmp(value, db_get("main-branch", "trunk"))!=0 ){
2317 zBranchName = mprintf("%s", value);
2318 }
@@ -2329,21 +2332,17 @@
2332 @ </td></tr>
2333
2334 if( !fHasHidden && zBranchName ){
2335 @ <tr><th align="right" valign="top">Branch Hiding:</th>
2336 @ <td valign="top">
2337 @ <label><input type="checkbox" name="hide"%s(zHiddenFlag) />
2338 @ Hide branch <b>%s(zBranchName)</b> from the timeline starting from this
2339 @ check-in and make sure it is closed</label>
2340 @ </td></tr>
2341 }
2342
2343 if( !fHasClosed && is_a_leaf(rid) ){
 
 
 
 
2344 @ <tr><th align="right" valign="top">Leaf Closure:</th>
2345 @ <td valign="top">
2346 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
2347 @ Mark this leaf as "closed" so that it no longer appears on the
2348 @ "leaves" page and is no longer labeled as a "<b>Leaf</b>"</label>
2349
M src/sqlite3.c
+4 -7
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -135,11 +135,11 @@
135135
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
136136
 ** [sqlite_version()] and [sqlite_source_id()].
137137
 */
138138
 #define SQLITE_VERSION "3.8.2"
139139
 #define SQLITE_VERSION_NUMBER 3008002
140
-#define SQLITE_SOURCE_ID "2013-12-03 02:52:11 7d99858bec699dface548c77649dfc50e7fb50d8"
140
+#define SQLITE_SOURCE_ID "2013-12-03 10:35:00 e4164fd8f75ce1c8d63bec70db7049b68208c12c"
141141
142142
 /*
143143
 ** CAPI3REF: Run-Time Library Version Numbers
144144
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
145145
 **
@@ -64125,11 +64125,12 @@
6412564125
6412664126
 idx1 = getVarint32(aKey1, szHdr1);
6412764127
 d1 = szHdr1;
6412864128
 assert( pKeyInfo->nField+pKeyInfo->nXField>=pPKey2->nField || CORRUPT_DB );
6412964129
 assert( pKeyInfo->aSortOrder!=0 );
64130
- assert( (idx1<=szHdr1 && i<pPKey2->nField) || CORRUPT_DB );
64130
+ assert( pKeyInfo->nField>0 );
64131
+ assert( idx1<=szHdr1 || CORRUPT_DB );
6413164132
 do{
6413264133
 u32 serial_type1;
6413364134
6413464135
 /* Read the serial types for the next element in each key. */
6413564136
 idx1 += getVarint32( aKey1+idx1, serial_type1 );
@@ -106290,15 +106291,11 @@
106290106291
 /* If changing the record number, delete the old record. */
106291106292
 if( hasFK || chngKey || pPk!=0 ){
106292106293
 sqlite3VdbeAddOp2(v, OP_Delete, iDataCur, 0);
106293106294
 }
106294106295
 if( bReplace || chngKey ){
106295
- if( sqlite3VdbeCurrentAddr(v)==j1+1 ){
106296
- sqlite3VdbeChangeToNoop(v, j1);
106297
- }else{
106298
- sqlite3VdbeJumpHere(v, j1);
106299
- }
106296
+ sqlite3VdbeJumpHere(v, j1);
106300106297
 }
106301106298
106302106299
 if( hasFK ){
106303106300
 sqlite3FkCheck(pParse, pTab, 0, regNewRowid, aXRef, chngKey);
106304106301
 }
106305106302
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -135,11 +135,11 @@
135 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
136 ** [sqlite_version()] and [sqlite_source_id()].
137 */
138 #define SQLITE_VERSION "3.8.2"
139 #define SQLITE_VERSION_NUMBER 3008002
140 #define SQLITE_SOURCE_ID "2013-12-03 02:52:11 7d99858bec699dface548c77649dfc50e7fb50d8"
141
142 /*
143 ** CAPI3REF: Run-Time Library Version Numbers
144 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
145 **
@@ -64125,11 +64125,12 @@
64125
64126 idx1 = getVarint32(aKey1, szHdr1);
64127 d1 = szHdr1;
64128 assert( pKeyInfo->nField+pKeyInfo->nXField>=pPKey2->nField || CORRUPT_DB );
64129 assert( pKeyInfo->aSortOrder!=0 );
64130 assert( (idx1<=szHdr1 && i<pPKey2->nField) || CORRUPT_DB );
 
64131 do{
64132 u32 serial_type1;
64133
64134 /* Read the serial types for the next element in each key. */
64135 idx1 += getVarint32( aKey1+idx1, serial_type1 );
@@ -106290,15 +106291,11 @@
106290 /* If changing the record number, delete the old record. */
106291 if( hasFK || chngKey || pPk!=0 ){
106292 sqlite3VdbeAddOp2(v, OP_Delete, iDataCur, 0);
106293 }
106294 if( bReplace || chngKey ){
106295 if( sqlite3VdbeCurrentAddr(v)==j1+1 ){
106296 sqlite3VdbeChangeToNoop(v, j1);
106297 }else{
106298 sqlite3VdbeJumpHere(v, j1);
106299 }
106300 }
106301
106302 if( hasFK ){
106303 sqlite3FkCheck(pParse, pTab, 0, regNewRowid, aXRef, chngKey);
106304 }
106305
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -135,11 +135,11 @@
135 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
136 ** [sqlite_version()] and [sqlite_source_id()].
137 */
138 #define SQLITE_VERSION "3.8.2"
139 #define SQLITE_VERSION_NUMBER 3008002
140 #define SQLITE_SOURCE_ID "2013-12-03 10:35:00 e4164fd8f75ce1c8d63bec70db7049b68208c12c"
141
142 /*
143 ** CAPI3REF: Run-Time Library Version Numbers
144 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
145 **
@@ -64125,11 +64125,12 @@
64125
64126 idx1 = getVarint32(aKey1, szHdr1);
64127 d1 = szHdr1;
64128 assert( pKeyInfo->nField+pKeyInfo->nXField>=pPKey2->nField || CORRUPT_DB );
64129 assert( pKeyInfo->aSortOrder!=0 );
64130 assert( pKeyInfo->nField>0 );
64131 assert( idx1<=szHdr1 || CORRUPT_DB );
64132 do{
64133 u32 serial_type1;
64134
64135 /* Read the serial types for the next element in each key. */
64136 idx1 += getVarint32( aKey1+idx1, serial_type1 );
@@ -106290,15 +106291,11 @@
106291 /* If changing the record number, delete the old record. */
106292 if( hasFK || chngKey || pPk!=0 ){
106293 sqlite3VdbeAddOp2(v, OP_Delete, iDataCur, 0);
106294 }
106295 if( bReplace || chngKey ){
106296 sqlite3VdbeJumpHere(v, j1);
 
 
 
 
106297 }
106298
106299 if( hasFK ){
106300 sqlite3FkCheck(pParse, pTab, 0, regNewRowid, aXRef, chngKey);
106301 }
106302
M src/sqlite3.h
+1 -1
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -107,11 +107,11 @@
107107
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108108
 ** [sqlite_version()] and [sqlite_source_id()].
109109
 */
110110
 #define SQLITE_VERSION "3.8.2"
111111
 #define SQLITE_VERSION_NUMBER 3008002
112
-#define SQLITE_SOURCE_ID "2013-12-03 02:52:11 7d99858bec699dface548c77649dfc50e7fb50d8"
112
+#define SQLITE_SOURCE_ID "2013-12-03 10:35:00 e4164fd8f75ce1c8d63bec70db7049b68208c12c"
113113
114114
 /*
115115
 ** CAPI3REF: Run-Time Library Version Numbers
116116
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117117
 **
118118
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -107,11 +107,11 @@
107 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108 ** [sqlite_version()] and [sqlite_source_id()].
109 */
110 #define SQLITE_VERSION "3.8.2"
111 #define SQLITE_VERSION_NUMBER 3008002
112 #define SQLITE_SOURCE_ID "2013-12-03 02:52:11 7d99858bec699dface548c77649dfc50e7fb50d8"
113
114 /*
115 ** CAPI3REF: Run-Time Library Version Numbers
116 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117 **
118
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -107,11 +107,11 @@
107 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108 ** [sqlite_version()] and [sqlite_source_id()].
109 */
110 #define SQLITE_VERSION "3.8.2"
111 #define SQLITE_VERSION_NUMBER 3008002
112 #define SQLITE_SOURCE_ID "2013-12-03 10:35:00 e4164fd8f75ce1c8d63bec70db7049b68208c12c"
113
114 /*
115 ** CAPI3REF: Run-Time Library Version Numbers
116 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117 **
118

Keyboard Shortcuts

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