From b2dd29ff0590a8d89206d07113195f09a2402c77 Mon Sep 17 00:00:00 2001
From: Michael Nebel <michaelnebel@github.com>
Date: Wed, 30 Nov 2022 10:43:50 +0100
Subject: [PATCH] Java/C#: Update conversion script to also produce negative
 models.

---
 misc/scripts/models-as-data/convert_extensions.py             | 3 ++-
 misc/scripts/models-as-data/generate_flow_model_extensions.py | 2 +-
 misc/scripts/models-as-data/helpers.py                        | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/misc/scripts/models-as-data/convert_extensions.py b/misc/scripts/models-as-data/convert_extensions.py
index ff5d5ee6cd5..6a05ba62238 100644
--- a/misc/scripts/models-as-data/convert_extensions.py
+++ b/misc/scripts/models-as-data/convert_extensions.py
@@ -74,7 +74,8 @@ class Converter:
         summaries = self.getAddsTo("ExtractSummaries.ql", helpers.summaryModelPredicate)
         sources = self.getAddsTo("ExtractSources.ql", helpers.sourceModelPredicate)
         sinks = self.getAddsTo("ExtractSinks.ql", helpers.sinkModelPredicate)
-        return merge(sources, sinks, summaries)
+        negativeSummaries = self.getAddsTo("ExtractNegativeSummaries.ql", helpers.negativeSummaryModelPredicate)
+        return merge(sources, sinks, summaries, negativeSummaries)
 
 
     def save(self, extensions):
diff --git a/misc/scripts/models-as-data/generate_flow_model_extensions.py b/misc/scripts/models-as-data/generate_flow_model_extensions.py
index c06e4eaeb62..fd015ee419e 100644
--- a/misc/scripts/models-as-data/generate_flow_model_extensions.py
+++ b/misc/scripts/models-as-data/generate_flow_model_extensions.py
@@ -169,7 +169,7 @@ Requirements: `codeql` should both appear on your path.
             sourceAddsTo = ""
 
         if self.generateNegativeSummaries:
-            negativeSummaryAddsTo = self.getAddsTo("CaptureNegativeSummaryModels.ql", "extNegativeSummaryModel")
+            negativeSummaryAddsTo = self.getAddsTo("CaptureNegativeSummaryModels.ql", helpers.negativeSummaryModelPredicate)
         else:
             negativeSummaryAddsTo = ""
         
diff --git a/misc/scripts/models-as-data/helpers.py b/misc/scripts/models-as-data/helpers.py
index cc69cee53c0..94bf16527de 100644
--- a/misc/scripts/models-as-data/helpers.py
+++ b/misc/scripts/models-as-data/helpers.py
@@ -7,6 +7,7 @@ import subprocess
 summaryModelPredicate = "extSummaryModel"
 sinkModelPredicate = "extSinkModel"
 sourceModelPredicate = "extSourceModel"
+negativeSummaryModelPredicate = "extNegativeSummaryModel"
 addsToTemplate = """  - addsTo:
       pack: {0}
       extensible: {1}