Use upstream tree-sitter-ql

This gets rid of all of the `dbscheme` and YAML bits. These will be
added in later commits. (Doing it all in one go made for an unreadable
diff.)

Also modifies `create-extractor-path.sh` to automatically install
`gh codeql` if there is no CodeQL CLI available for autoformatting.

Author: tausbn

ql/Cargo.lock

@@ -11,4 +11,4 @@ clap = "2.33"
 node-types = { path = "../node-types" }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3.3", features = ["env-filter"] }
-tree-sitter-ql = { git = "https://github.com/erik-krogh/tree-sitter-ql.git", rev = "343cc5873e20510586ade803659ef8ce153bd603" }
+tree-sitter-ql = { git = "https://github.com/tree-sitter/tree-sitter-ql.git" }

ql/generator/Cargo.toml

@@ -405,250 +405,6 @@ module QL {
     final override AstNode getAFieldOrChild() { ql_datatype_branches_child(this, _, result) }
   }
 
-  /** A class representing `db_annotation` nodes. */
-  class DbAnnotation extends @ql_db_annotation, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DbAnnotation" }
-
-    /** Gets the node corresponding to the field `argsAnnotation`. */
-    final DbArgsAnnotation getArgsAnnotation() { ql_db_annotation_args_annotation(this, result) }
-
-    /** Gets the node corresponding to the field `simpleAnnotation`. */
-    final AnnotName getSimpleAnnotation() { ql_db_annotation_simple_annotation(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      ql_db_annotation_args_annotation(this, result) or
-      ql_db_annotation_simple_annotation(this, result)
-    }
-  }
-
-  /** A class representing `db_argsAnnotation` nodes. */
-  class DbArgsAnnotation extends @ql_db_args_annotation, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DbArgsAnnotation" }
-
-    /** Gets the node corresponding to the field `name`. */
-    final AnnotName getName() { ql_db_args_annotation_def(this, result) }
-
-    /** Gets the `i`th child of this node. */
-    final SimpleId getChild(int i) { ql_db_args_annotation_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      ql_db_args_annotation_def(this, result) or ql_db_args_annotation_child(this, _, result)
-    }
-  }
-
-  /** A class representing `db_boolean` tokens. */
-  class DbBoolean extends @ql_token_db_boolean, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DbBoolean" }
-  }
-
-  /** A class representing `db_branch` nodes. */
-  class DbBranch extends @ql_db_branch, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DbBranch" }
-
-    /** Gets the node corresponding to the field `qldoc`. */
-    final Qldoc getQldoc() { ql_db_branch_qldoc(this, result) }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { ql_db_branch_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      ql_db_branch_qldoc(this, result) or ql_db_branch_child(this, _, result)
-    }
-  }
-
-  /** A class representing `db_case` tokens. */
-  class DbCase extends @ql_token_db_case, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DbCase" }
-  }
-
-  /** A class representing `db_caseDecl` nodes. */
-  class DbCaseDecl extends @ql_db_case_decl, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DbCaseDecl" }
-
-    /** Gets the node corresponding to the field `base`. */
-    final Dbtype getBase() { ql_db_case_decl_def(this, result, _) }
-
-    /** Gets the node corresponding to the field `discriminator`. */
-    final SimpleId getDiscriminator() { ql_db_case_decl_def(this, _, result) }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { ql_db_case_decl_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      ql_db_case_decl_def(this, result, _) or
-      ql_db_case_decl_def(this, _, result) or
-      ql_db_case_decl_child(this, _, result)
-    }
-  }
-
-  /** A class representing `db_colType` nodes. */
-  class DbColType extends @ql_db_col_type, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DbColType" }
-
-    /** Gets the child of this node. */
-    final AstNode getChild() { ql_db_col_type_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { ql_db_col_type_def(this, result) }
-  }
-
-  /** A class representing `db_column` nodes. */
-  class DbColumn extends @ql_db_column, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DbColumn" }
-
-    /** Gets the node corresponding to the field `colName`. */
-    final SimpleId getColName() { ql_db_column_def(this, result, _, _) }
-
-    /** Gets the node corresponding to the field `colType`. */
-    final DbColType getColType() { ql_db_column_def(this, _, result, _) }
-
-    /** Gets the node corresponding to the field `isRef`. */
-    final DbRef getIsRef() { ql_db_column_is_ref(this, result) }
-
-    /** Gets the node corresponding to the field `isUnique`. */
-    final DbUnique getIsUnique() { ql_db_column_is_unique(this, result) }
-
-    /** Gets the node corresponding to the field `qldoc`. */
-    final Qldoc getQldoc() { ql_db_column_qldoc(this, result) }
-
-    /** Gets the node corresponding to the field `reprType`. */
-    final DbReprType getReprType() { ql_db_column_def(this, _, _, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      ql_db_column_def(this, result, _, _) or
-      ql_db_column_def(this, _, result, _) or
-      ql_db_column_is_ref(this, result) or
-      ql_db_column_is_unique(this, result) or
-      ql_db_column_qldoc(this, result) or
-      ql_db_column_def(this, _, _, result)
-    }
-  }
-
-  /** A class representing `db_date` tokens. */
-  class DbDate extends @ql_token_db_date, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DbDate" }
-  }
-
-  /** A class representing `db_entry` nodes. */
-  class DbEntry extends @ql_db_entry, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DbEntry" }
-
-    /** Gets the child of this node. */
-    final AstNode getChild() { ql_db_entry_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { ql_db_entry_def(this, result) }
-  }
-
-  /** A class representing `db_float` tokens. */
-  class DbFloat extends @ql_token_db_float, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DbFloat" }
-  }
-
-  /** A class representing `db_int` tokens. */
-  class DbInt extends @ql_token_db_int, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DbInt" }
-  }
-
-  /** A class representing `db_ref` tokens. */
-  class DbRef extends @ql_token_db_ref, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DbRef" }
-  }
-
-  /** A class representing `db_reprType` nodes. */
-  class DbReprType extends @ql_db_repr_type, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DbReprType" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { ql_db_repr_type_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { ql_db_repr_type_child(this, _, result) }
-  }
-
-  /** A class representing `db_string` tokens. */
-  class DbString extends @ql_token_db_string, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DbString" }
-  }
-
-  /** A class representing `db_table` nodes. */
-  class DbTable extends @ql_db_table, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DbTable" }
-
-    /** Gets the node corresponding to the field `tableName`. */
-    final DbTableName getTableName() { ql_db_table_def(this, result) }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { ql_db_table_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      ql_db_table_def(this, result) or ql_db_table_child(this, _, result)
-    }
-  }
-
-  /** A class representing `db_tableName` nodes. */
-  class DbTableName extends @ql_db_table_name, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DbTableName" }
-
-    /** Gets the child of this node. */
-    final SimpleId getChild() { ql_db_table_name_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { ql_db_table_name_def(this, result) }
-  }
-
-  /** A class representing `db_unionDecl` nodes. */
-  class DbUnionDecl extends @ql_db_union_decl, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DbUnionDecl" }
-
-    /** Gets the node corresponding to the field `base`. */
-    final Dbtype getBase() { ql_db_union_decl_def(this, result) }
-
-    /** Gets the `i`th child of this node. */
-    final Dbtype getChild(int i) { ql_db_union_decl_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      ql_db_union_decl_def(this, result) or ql_db_union_decl_child(this, _, result)
-    }
-  }
-
-  /** A class representing `db_unique` tokens. */
-  class DbUnique extends @ql_token_db_unique, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DbUnique" }
-  }
-
-  /** A class representing `db_varchar` tokens. */
-  class DbVarchar extends @ql_token_db_varchar, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "DbVarchar" }
-  }
-
   /** A class representing `dbtype` tokens. */
   class Dbtype extends @ql_token_dbtype, Token {
     /** Gets the name of the primary QL class for this element. */
@@ -1188,7 +944,7 @@ module QL {
     final override string getAPrimaryQlClass() { result = "Ql" }
 
     /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { ql_ql_child(this, i, result) }
+    final ModuleMember getChild(int i) { ql_ql_child(this, i, result) }
 
     /** Gets a field or child node of this node. */
     final override AstNode getAFieldOrChild() { ql_ql_child(this, _, result) }
@@ -1524,75 +1280,4 @@ module QL {
     /** Gets a field or child node of this node. */
     final override AstNode getAFieldOrChild() { ql_variable_def(this, result) }
   }
-
-  /** A class representing `yaml_comment` nodes. */
-  class YamlComment extends @ql_yaml_comment, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "YamlComment" }
-
-    /** Gets the child of this node. */
-    final YamlValue getChild() { ql_yaml_comment_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { ql_yaml_comment_def(this, result) }
-  }
-
-  /** A class representing `yaml_entry` nodes. */
-  class YamlEntry extends @ql_yaml_entry, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "YamlEntry" }
-
-    /** Gets the child of this node. */
-    final AstNode getChild() { ql_yaml_entry_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { ql_yaml_entry_def(this, result) }
-  }
-
-  /** A class representing `yaml_key` nodes. */
-  class YamlKey extends @ql_yaml_key, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "YamlKey" }
-
-    /** Gets the `i`th child of this node. */
-    final AstNode getChild(int i) { ql_yaml_key_child(this, i, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { ql_yaml_key_child(this, _, result) }
-  }
-
-  /** A class representing `yaml_keyvaluepair` nodes. */
-  class YamlKeyvaluepair extends @ql_yaml_keyvaluepair, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "YamlKeyvaluepair" }
-
-    /** Gets the node corresponding to the field `key`. */
-    final YamlKey getKey() { ql_yaml_keyvaluepair_def(this, result, _) }
-
-    /** Gets the node corresponding to the field `value`. */
-    final YamlValue getValue() { ql_yaml_keyvaluepair_def(this, _, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() {
-      ql_yaml_keyvaluepair_def(this, result, _) or ql_yaml_keyvaluepair_def(this, _, result)
-    }
-  }
-
-  /** A class representing `yaml_listitem` nodes. */
-  class YamlListitem extends @ql_yaml_listitem, AstNode {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "YamlListitem" }
-
-    /** Gets the child of this node. */
-    final YamlValue getChild() { ql_yaml_listitem_def(this, result) }
-
-    /** Gets a field or child node of this node. */
-    final override AstNode getAFieldOrChild() { ql_yaml_listitem_def(this, result) }
-  }
-
-  /** A class representing `yaml_value` tokens. */
-  class YamlValue extends @ql_token_yaml_value, Token {
-    /** Gets the name of the primary QL class for this element. */
-    final override string getAPrimaryQlClass() { result = "YamlValue" }
-  }
 }