From 719c0d2030f295b19ea01dcbbd7d992eb1cee603 Mon Sep 17 00:00:00 2001
From: Erik Krogh Kristensen <erik-krogh@github.com>
Date: Fri, 4 Sep 2020 11:51:58 +0200
Subject: [PATCH] renamed "hasPrivateKeyword" to "has_private_keyword"

---
 .../extractor/src/com/semmle/js/ast/DeclarationFlags.java    | 2 +-
 javascript/ql/src/semmle/javascript/Aliases.qll              | 5 +++++
 javascript/ql/src/semmle/javascript/Classes.qll              | 2 +-
 javascript/ql/src/semmlecode.javascript.dbscheme             | 2 +-
 javascript/ql/src/semmlecode.javascript.dbscheme.stats       | 2 +-
 .../upgrade.properties                                       | 2 ++
 6 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/javascript/extractor/src/com/semmle/js/ast/DeclarationFlags.java b/javascript/extractor/src/com/semmle/js/ast/DeclarationFlags.java
index 46d5968b6d4..3331da66758 100644
--- a/javascript/extractor/src/com/semmle/js/ast/DeclarationFlags.java
+++ b/javascript/extractor/src/com/semmle/js/ast/DeclarationFlags.java
@@ -42,7 +42,7 @@ public class DeclarationFlags {
           "is_static",
           "hasReadonlyKeyword",
           "has_public_keyword",
-          "hasPrivateKeyword",
+          "has_private_keyword",
           "hasProtectedKeyword",
           "isOptionalMember",
           "hasDefiniteAssignmentAssertion",
diff --git a/javascript/ql/src/semmle/javascript/Aliases.qll b/javascript/ql/src/semmle/javascript/Aliases.qll
index 44abab50000..130594599de 100644
--- a/javascript/ql/src/semmle/javascript/Aliases.qll
+++ b/javascript/ql/src/semmle/javascript/Aliases.qll
@@ -175,3 +175,8 @@ deprecated predicate isAbstractClass(ClassDeclStmt id) { is_abstract_class(id) }
  * Use `MemberDeclaration#hasPublicKeyword() instead.
  */ 
 deprecated predicate hasPublicKeyword(Property prop) { has_public_keyword(prop) }
+/**
+ * Alias for the predicate `has_private_keyword` defined in the .dbscheme.
+ * Use `MemberDeclaration#isPrivate() instead.
+ */ 
+deprecated predicate hasPrivateKeyword(Property prop) { has_private_keyword(prop) }
diff --git a/javascript/ql/src/semmle/javascript/Classes.qll b/javascript/ql/src/semmle/javascript/Classes.qll
index 2b91bc0bdc0..d6b0167465e 100644
--- a/javascript/ql/src/semmle/javascript/Classes.qll
+++ b/javascript/ql/src/semmle/javascript/Classes.qll
@@ -497,7 +497,7 @@ class MemberDeclaration extends @property, Documentable {
   /**
    * Holds if this is a TypeScript member annotated with the `private` keyword.
    */
-  predicate isPrivate() { hasPrivateKeyword(this) }
+  predicate isPrivate() { has_private_keyword(this) }
 
   /**
    * Holds if this is a TypeScript member annotated with the `protected` keyword.
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme
index 406a7d1136d..04fd5f739a2 100644
--- a/javascript/ql/src/semmlecode.javascript.dbscheme
+++ b/javascript/ql/src/semmlecode.javascript.dbscheme
@@ -521,7 +521,7 @@ is_const_enum (int id: @enumdeclaration ref);
 is_abstract_class (int id: @classdeclstmt ref);
 
 has_public_keyword (int id: @property ref);
-hasPrivateKeyword (int id: @property ref);
+has_private_keyword (int id: @property ref);
 hasProtectedKeyword (int id: @property ref);
 hasReadonlyKeyword (int id: @property ref);
 hasTypeKeyword (int id: @import_or_export_declaration ref);
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
index c7b46860393..6e5f53a8d5b 100644
--- a/javascript/ql/src/semmlecode.javascript.dbscheme.stats
+++ b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
@@ -7963,7 +7963,7 @@
 <dependencies/>
 </relation>
 <relation>
-<name>hasPrivateKeyword</name>
+<name>has_private_keyword</name>
 <cardinality>11391</cardinality>
 <columnsizes>
 <e>
diff --git a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
index 7c362e02323..b76c8ccc3b5 100644
--- a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
+++ b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
@@ -44,3 +44,5 @@ is_abstract_class.rel: reorder isAbstractClass.rel(int id) id
 isAbstractClass.rel: delete
 has_public_keyword.rel: reorder hasPublicKeyword.rel(int prop) prop
 hasPublicKeyword.rel: delete
+has_private_keyword.rel: reorder hasPrivateKeyword.rel(int prop) prop
+hasPrivateKeyword.rel: delete