From 82ddbc3b47211b871e97d573ccb7ff5cf59c65dd Mon Sep 17 00:00:00 2001
From: Erik Krogh Kristensen <erik-krogh@github.com>
Date: Fri, 4 Sep 2020 11:51:57 +0200
Subject: [PATCH] renamed "hasPublicKeyword" to "has_public_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 42d97281d13..46d5968b6d4 100644
--- a/javascript/extractor/src/com/semmle/js/ast/DeclarationFlags.java
+++ b/javascript/extractor/src/com/semmle/js/ast/DeclarationFlags.java
@@ -41,7 +41,7 @@ public class DeclarationFlags {
           "is_abstract_member",
           "is_static",
           "hasReadonlyKeyword",
-          "hasPublicKeyword",
+          "has_public_keyword",
           "hasPrivateKeyword",
           "hasProtectedKeyword",
           "isOptionalMember",
diff --git a/javascript/ql/src/semmle/javascript/Aliases.qll b/javascript/ql/src/semmle/javascript/Aliases.qll
index 20e7892d140..44abab50000 100644
--- a/javascript/ql/src/semmle/javascript/Aliases.qll
+++ b/javascript/ql/src/semmle/javascript/Aliases.qll
@@ -170,3 +170,8 @@ deprecated predicate isConstEnum(EnumDeclaration id) { is_const_enum(id) }
  * Use `ClassDefinition#isAbstract()` instead.
  */ 
 deprecated predicate isAbstractClass(ClassDeclStmt id) { is_abstract_class(id) }
+/**
+ * Alias for the predicate `has_public_keyword` defined in the .dbscheme.
+ * Use `MemberDeclaration#hasPublicKeyword() instead.
+ */ 
+deprecated predicate hasPublicKeyword(Property prop) { has_public_keyword(prop) }
diff --git a/javascript/ql/src/semmle/javascript/Classes.qll b/javascript/ql/src/semmle/javascript/Classes.qll
index a391027c762..2b91bc0bdc0 100644
--- a/javascript/ql/src/semmle/javascript/Classes.qll
+++ b/javascript/ql/src/semmle/javascript/Classes.qll
@@ -492,7 +492,7 @@ class MemberDeclaration extends @property, Documentable {
   /**
    * Holds if this is a TypeScript member explicitly annotated with the `public` keyword.
    */
-  predicate hasPublicKeyword() { hasPublicKeyword(this) }
+  predicate hasPublicKeyword() { has_public_keyword(this) }
 
   /**
    * Holds if this is a TypeScript member annotated with the `private` keyword.
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme
index 814b2dd8c2e..406a7d1136d 100644
--- a/javascript/ql/src/semmlecode.javascript.dbscheme
+++ b/javascript/ql/src/semmlecode.javascript.dbscheme
@@ -520,7 +520,7 @@ is_abstract_member (int id: @property ref);
 is_const_enum (int id: @enumdeclaration ref);
 is_abstract_class (int id: @classdeclstmt ref);
 
-hasPublicKeyword (int id: @property ref);
+has_public_keyword (int id: @property ref);
 hasPrivateKeyword (int id: @property ref);
 hasProtectedKeyword (int id: @property ref);
 hasReadonlyKeyword (int id: @property ref);
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
index bf22097fd75..c7b46860393 100644
--- a/javascript/ql/src/semmlecode.javascript.dbscheme.stats
+++ b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
@@ -7952,7 +7952,7 @@
 <dependencies/>
 </relation>
 <relation>
-<name>hasPublicKeyword</name>
+<name>has_public_keyword</name>
 <cardinality>9297</cardinality>
 <columnsizes>
 <e>
diff --git a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
index 52df860c1f3..7c362e02323 100644
--- a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
+++ b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
@@ -42,3 +42,5 @@ is_const_enum.rel: reorder isConstEnum.rel(int id) id
 isConstEnum.rel: delete
 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