SQLite: Check-in [32956519]

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

Overview

Comment:	Fix the build for SQLITE_OMIT_UPSERT
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| upsert
Files:	files \| file ages \| folders
SHA3-256:	32956519173ee49ec9dd9aa7952278eb4effe567493c6cb304e16f887df6bafa
User & Date:	drh 2018-04-18 15:33:21

Context

2018-04-18
16:03		Add support for PostgreSQL UPSERT syntax and functionality. (check-in: fba24aec user: drh tags: trunk)
15:33		Fix the build for SQLITE_OMIT_UPSERT (Closed-Leaf check-in: 32956519 user: drh tags: upsert)
01:34		Add new testcase() macros and fix a bug that was revealed when trying to cover all the new test cases. (check-in: 266a99f7 user: drh tags: upsert)

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/sqliteInt.h.

  4291   4291   #ifndef SQLITE_OMIT_UPSERT
  4292   4292     Upsert *sqlite3UpsertNew(sqlite3*,ExprList*,Expr*,ExprList*,Expr*);
  4293   4293     void sqlite3UpsertDelete(sqlite3*,Upsert*);
  4294   4294     Upsert *sqlite3UpsertDup(sqlite3*,Upsert*);
  4295   4295     int sqlite3UpsertAnalyzeTarget(Parse*,SrcList*,Upsert*);
  4296   4296     void sqlite3UpsertDoUpdate(Parse*,Upsert*,Table*,Index*,int);
  4297   4297   #else
  4298         -#define sqlite3UpsertNew(x,y,z,w) ((Upsert*)0)
         4298  +#define sqlite3UpsertNew(v,w,x,y,z) ((Upsert*)0)
  4299   4299   #define sqlite3UpsertDelete(x,y)
  4300         -#define sqlite3UpsertDup(x,y)     ((Upsert*)0)
         4300  +#define sqlite3UpsertDup(x,y)       ((Upsert*)0)
  4301   4301   #endif
  4302   4302   
  4303   4303   
  4304   4304   /* Declarations for functions in fkey.c. All of these are replaced by
  4305   4305   ** no-op macros if OMIT_FOREIGN_KEY is defined. In this case no foreign
  4306   4306   ** key functionality is available. If OMIT_TRIGGER is defined but
  4307   4307   ** OMIT_FOREIGN_KEY is not, only some of the functions are no-oped. In