diff --git a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
index 0028abdd584..5258f03e60c 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
@@ -939,7 +939,7 @@ public class ASTExtractor {
// Extract optional parameters
if (nd.getOptionalParameterIndices().contains(i)) {
- trapwriter.addTuple("isOptionalParameterDeclaration", paramKey);
+ trapwriter.addTuple("is_optional_parameter_declaration", paramKey);
}
++i;
}
diff --git a/javascript/ql/src/semmle/javascript/Aliases.qll b/javascript/ql/src/semmle/javascript/Aliases.qll
index d8a71937d1f..ba1c75d21de 100644
--- a/javascript/ql/src/semmle/javascript/Aliases.qll
+++ b/javascript/ql/src/semmle/javascript/Aliases.qll
@@ -205,3 +205,8 @@ deprecated predicate isOptionalMember(Property id) { is_optional_member(id) }
* Use the `hasDefiniteAssignmentAssertion` method on the `FieldDeclaration`/`VariableDeclarator` classes instead.
*/
deprecated predicate hasDefiniteAssignmentAssertion(ASTNode id) { has_definite_assignment_assertion(id) }
+/**
+ * Alias for the predicate `is_optional_parameter_declaration` defined in the .dbscheme.
+ * Use `Parameter#isDeclaredOptional()` instead.
+ */
+deprecated predicate isOptionalParameterDeclaration(Parameter parameter) { is_optional_parameter_declaration(parameter) }
diff --git a/javascript/ql/src/semmle/javascript/Variables.qll b/javascript/ql/src/semmle/javascript/Variables.qll
index adb433deb12..9e45cb69310 100644
--- a/javascript/ql/src/semmle/javascript/Variables.qll
+++ b/javascript/ql/src/semmle/javascript/Variables.qll
@@ -782,7 +782,7 @@ class Parameter extends BindingPattern {
* function f(x?: number) {}
* ```
*/
- predicate isDeclaredOptional() { isOptionalParameterDeclaration(this) }
+ predicate isDeclaredOptional() { is_optional_parameter_declaration(this) }
}
/**
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme
index 7094f895327..444ad8f2b17 100644
--- a/javascript/ql/src/semmlecode.javascript.dbscheme
+++ b/javascript/ql/src/semmlecode.javascript.dbscheme
@@ -527,7 +527,7 @@ has_readonly_keyword (int id: @property ref);
has_type_keyword (int id: @import_or_export_declaration ref);
is_optional_member (int id: @property ref);
has_definite_assignment_assertion (int id: @field_or_vardeclarator ref);
-isOptionalParameterDeclaration (unique int parameter: @pattern ref);
+is_optional_parameter_declaration (unique int parameter: @pattern ref);
#keyset[constructor, param_index]
parameter_fields(
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
index b6d37e176e4..272436c454d 100644
--- a/javascript/ql/src/semmlecode.javascript.dbscheme.stats
+++ b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
@@ -8029,7 +8029,7 @@
-isOptionalParameterDeclaration
+is_optional_parameter_declaration
3966
diff --git a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
index 8675148972c..21a4a4fcba7 100644
--- a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
+++ b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
@@ -56,3 +56,5 @@ is_optional_member.rel: reorder isOptionalMember.rel(int id) id
isOptionalMember.rel: delete
has_definite_assignment_assertion.rel: reorder hasDefiniteAssignmentAssertion.rel(int id) id
hasDefiniteAssignmentAssertion.rel: delete
+is_optional_parameter_declaration.rel: reorder isOptionalParameterDeclaration.rel(int parameter) parameter
+isOptionalParameterDeclaration.rel: delete