/ Check-in [713fe86b]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Remove redundant code resulting from a merge error on the previous check-in.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 713fe86b8c9f3c9ef8af952019e99ba2f4741326226264de6a66baaeb1803d2a
User & Date: drh 2019-10-26 18:56:12
References
2019-10-26
21:26 Ticket [3ea17551] REINDEX causes "UNIQUE constraint failed" error for generated column status still Open with 3 other changes artifact: bc78fd24 user: mrigger
Context
2019-10-26
23:51
Remove code from the constraint checker that generates virtual column values with the incorrect time. Turns out the the regular code for all other columns works correctly and so the incorrect special-case code is not actually needed. Fix for ticket [3ea175512444b0d1]. check-in: 5b4c0f2d user: drh tags: trunk
18:56
Remove redundant code resulting from a merge error on the previous check-in. check-in: 713fe86b user: drh tags: trunk
18:47
Add support for generated columns. check-in: b855acf1 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/insert.c.

1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
      if( i==pTab->iPKey ){
        continue;        /* ROWID is never NULL */
      }
      if( aiChng && aiChng[i]<0 ){
        /* Don't bother checking for NOT NULL on columns that do not change */
        continue;
      }
      onError = pTab->aCol[i].notNull;
      if( onError==OE_None ) continue;  /* This column is allowed to be NULL */
      if( overrideError!=OE_Default ){
        onError = overrideError;
      }else if( onError==OE_Default ){
        onError = OE_Abort;
      }
      if( onError==OE_Replace && pTab->aCol[i].pDflt==0 ){
        onError = OE_Abort;







<
<







1493
1494
1495
1496
1497
1498
1499


1500
1501
1502
1503
1504
1505
1506
      if( i==pTab->iPKey ){
        continue;        /* ROWID is never NULL */
      }
      if( aiChng && aiChng[i]<0 ){
        /* Don't bother checking for NOT NULL on columns that do not change */
        continue;
      }


      if( overrideError!=OE_Default ){
        onError = overrideError;
      }else if( onError==OE_Default ){
        onError = OE_Abort;
      }
      if( onError==OE_Replace && pTab->aCol[i].pDflt==0 ){
        onError = OE_Abort;