Merge pull request #17451 from igfoo/igfoo/dbscheme

Java: Remove deprecated elements from dbscheme

java/downgrades/376ce7dad79375c0772b8edb938da82ca5271ba1/typeVars.ql

@@ -0,0 +1,11 @@
+class TypeVariable extends @typevariable {
+  string toString() { none() }
+}
+
+class ClassOrInterfaceOrCallable extends @classorinterfaceorcallable {
+  string toString() { none() }
+}
+
+from TypeVariable id, string nodeName, int pos, ClassOrInterfaceOrCallable parentid
+where typeVars(id, nodeName, pos, parentid)
+select id, nodeName, pos, 0, parentid

java/downgrades/376ce7dad79375c0772b8edb938da82ca5271ba1/upgrade.properties

@@ -0,0 +1,3 @@
+description: Remove deprecated entries
+compatibility: partial
+typeVars.rel: run typeVars.qlo

java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt

@@ -325,7 +325,7 @@ open class KotlinFileExtractor(
             // parameter S of
             // `class Generic<T> { public <S> Generic(T t, S s) { ... } }` will have `tp.index` 1,
             // not 0).
-            tw.writeTypeVars(id, tp.name.asString(), apparentIndex, 0, parentId)
+            tw.writeTypeVars(id, tp.name.asString(), apparentIndex, parentId)
             val locId = tw.getLocation(tp)
             tw.writeHasLocation(id, locId)
 

java/ql/lib/config/semmlecode.dbscheme

@@ -138,21 +138,6 @@ compilation_time(
     float seconds : float ref
 );
 
-/**
- * An error or warning generated by the extractor.
- * The diagnostic message `diagnostic` was generated during compiler
- * invocation `compilation`, and is the `file_number_diagnostic_number`th
- * message generated while extracting the `file_number`th file of that
- * invocation.
- */
-#keyset[compilation, file_number, file_number_diagnostic_number]
-diagnostic_for(
-    unique int diagnostic : @diagnostic ref,
-    int compilation : @compilation ref,
-    int file_number : int ref,
-    int file_number_diagnostic_number : int ref
-);
-
 /**
  * The `cpu_seconds` and `elapsed_seconds` are the CPU time and elapsed
  * time (respectively) that the original compilation (not the extraction)
@@ -191,6 +176,21 @@ diagnostics(
     int location: @location_default ref
 );
 
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
 /*
  * External artifacts
  */
@@ -202,41 +202,10 @@ externalData(
   string value : string ref
 );
 
-snapshotDate(
-  unique date snapshotDate : date ref
-);
-
 sourceLocationPrefix(
   string prefix : string ref
 );
 
-/*
- * Duplicate code
- */
-
-duplicateCode(
-  unique int id : @duplication,
-  string relativePath : string ref,
-  int equivClass : int ref
-);
-
-similarCode(
-  unique int id : @similarity,
-  string relativePath : string ref,
-  int equivClass : int ref
-);
-
-@duplication_or_similarity = @duplication | @similarity
-
-tokens(
-  int id : @duplication_or_similarity ref,
-  int offset : int ref,
-  int beginLine : int ref,
-  int beginColumn : int ref,
-  int endLine : int ref,
-  int endColumn : int ref
-);
-
 /*
  * SMAP
  */
@@ -516,7 +485,6 @@ typeVars(
   unique int id: @typevariable,
   string nodeName: string ref,
   int pos: int ref,
-  int kind: int ref, // deprecated
   int parentid: @classorinterfaceorcallable ref
 );