Rename db types relating to local classes

These now all refer to types or classes-or-interfaces.

java/upgrades/b4e689c90426b017ad550e30a439cab2763ff424/semmlecode.dbscheme

@@ -440,10 +440,10 @@ isAnonymClass(
   int parent: @classinstancexpr ref
 );
 
-#keyset[classid] #keyset[parent]
-isLocalClass(
-  int classid: @classorinterface ref,
-  int parent: @localclassdeclstmt ref
+#keyset[typeid] #keyset[parent]
+isLocalClassOrInterface(
+  int typeid: @classorinterface ref,
+  int parent: @localtypedeclstmt ref
 );
 
 isDefConstr(
@@ -526,7 +526,7 @@ case @stmt.kind of
 | 15 = @labeledstmt
 | 16 = @assertstmt
 | 17 = @localvariabledeclstmt
-| 18 = @localclassdeclstmt
+| 18 = @localtypedeclstmt
 | 19 = @constructorinvocationstmt
 | 20 = @superconstructorinvocationstmt
 | 21 = @case

java/upgrades/b4e689c90426b017ad550e30a439cab2763ff424/upgrade.properties

@@ -1,2 +1,4 @@
 description: Java 16: allow local interfaces
 compatibility: backwards
+isLocalClassOrInterface.rel: reorder isLocalClass.rel(int id, int parent) id parent
+isLocalClass.rel: delete