merge ENGINE-74
authorKrista Grothoff <krista@pep-project.org>
Tue, 15 Nov 2016 20:06:08 +0100
branchENGINE-74
changeset 1398b1c1c1db2754
parent 1397 0a64816a6e37
parent 1393 ee4bf9e19635
child 1399 b77bc137c471
merge
src/pEpEngine.c
     1.1 --- a/src/pEpEngine.c	Tue Nov 15 18:16:58 2016 +0100
     1.2 +++ b/src/pEpEngine.c	Tue Nov 15 20:06:08 2016 +0100
     1.3 @@ -134,7 +134,7 @@
     1.4      sqlite3_busy_timeout(_session->system_db, 1000);
     1.5  
     1.6  // increment this when patching DDL
     1.7 -#define _DDL_USER_VERSION "3"
     1.8 +#define _DDL_USER_VERSION "4"
     1.9  
    1.10      if (in_first) {
    1.11  
    1.12 @@ -165,8 +165,6 @@
    1.13                  ");\n"
    1.14                  "create table if not exists pgp_keypair (\n"
    1.15                  "   fpr text primary key,\n"
    1.16 -                "   public_id text unique,\n"
    1.17 -                "   private_id text,\n"
    1.18                  "   created integer,\n"
    1.19                  "   expires integer,\n"
    1.20                  "   comment text,\n"