Merge pull request github#2084 from matt-gretton-dann/cpp-445-synthetic_destructor_call-INVALID_KEY-warnings

Update keysets for synthetic_destructor_call and *variables tuple

Author: ian-semmle

cpp/ql/src/semmlecode.cpp.dbscheme

@@ -521,18 +521,21 @@ params(
 
 overrides(int new: @function ref, int old: @function ref);
 
+#keyset[id, type_id]
 membervariables(
-    unique int id: @membervariable,
+    int id: @membervariable,
     int type_id: @type ref,
     string name: string ref
 );
 
+#keyset[id, type_id]
 globalvariables(
-    unique int id: @globalvariable,
+    int id: @globalvariable,
     int type_id: @type ref,
     string name: string ref
 );
 
+#keyset[id, type_id]
 localvariables(
     int id: @localvariable,
     int type_id: @type ref,
@@ -1061,10 +1064,12 @@ compgenerated(unique int id: @element ref);
  * destructed in reverse construction order, so for a given `element`
  * these should be called from highest to lowest `i`.
  */
+#keyset[element, destructor_call]
+#keyset[element, i]
 synthetic_destructor_call(
     int element: @element ref,
     int i: int ref,
-    unique int destructor_call: @routineexpr ref
+    int destructor_call: @routineexpr ref
 );
 
 namespaces(