JavaScript: Drop redundant columns from files and folders relations

Author: hvitved

javascript/extractor/src/com/semmle/js/extractor/test/TrapTests.java

@@ -11,6 +11,7 @@
 import com.semmle.util.data.StringUtil;
 import com.semmle.util.extraction.ExtractorOutputConfig;
 import com.semmle.util.io.WholeIO;
+import com.semmle.util.process.Env;
 import com.semmle.util.srcarchive.DummySourceArchive;
 import com.semmle.util.trap.ITrapWriterFactory;
 import com.semmle.util.trap.TrapWriter;
@@ -21,6 +22,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map.Entry;
 import org.junit.AfterClass;
@@ -140,6 +142,10 @@ public void runtest() {
       options.add(inputFile.getAbsolutePath());
     }
 
+    LinkedHashMap<String, String> vars = new LinkedHashMap<>();
+		vars.put("CODEQL_REDUCE_FILES_FOLDERS_RELATIONS", "true");
+    Env.systemEnv().pushEnvironmentContext(vars);
+
     final List<Pair<String, String>> expectedVsActual = new ArrayList<Pair<String, String>>();
     Main main =
         new Main(

javascript/ql/lib/semmle/javascript/Files.qll

@@ -156,7 +156,7 @@ abstract class Container extends @container {
 
 /** A folder. */
 class Folder extends Container, @folder {
-  override string getAbsolutePath() { folders(this, result, _) }
+  override string getAbsolutePath() { folders(this, result) }
 
   /** Gets the file or subfolder in this folder that has the given `name`, if any. */
   Container getChildContainer(string name) {
@@ -203,7 +203,7 @@ class File extends Container, @file {
    */
   Location getLocation() { hasLocation(this, result) }
 
-  override string getAbsolutePath() { files(this, result, _, _, _) }
+  override string getAbsolutePath() { files(this, result) }
 
   /** Gets the number of lines in this file. */
   int getNumberOfLines() { result = sum(int loc | numlines(this, loc, _, _) | loc) }

javascript/ql/lib/semmlecode.javascript.dbscheme

@@ -20,21 +20,11 @@ numlines(int element_id: @sourceline ref,
          int num_comment: int ref
         );
 
- 
-/*
-  fromSource(0) = unknown,
-  fromSource(1) = from source,
-  fromSource(2) = from library
-*/
 files(unique int id: @file,
-      varchar(900) name: string ref,
-      varchar(900) simple: string ref,
-      varchar(900) ext: string ref,
-      int fromSource: int ref);
+      varchar(900) name: string ref);
 
 folders(unique int id: @folder,
-        varchar(900) name: string ref,
-        varchar(900) simple: string ref);
+        varchar(900) name: string ref);
 
 
 @container = @folder | @file ;