Merge pull request #80 from github/aibaars/revert-dup-code

Updates after CodeQL upgrade to 2.4.1

Author: nickrolfe

generator/src/main.rs

@@ -275,141 +275,9 @@ fn convert_nodes<'a>(nodes: &'a node_types::NodeTypeMap) -> Vec<dbscheme::Entry<
         name: "ast_node_parent",
         members: ["ast_node", "file"].iter().cloned().collect(),
     }));
-
-    // TODO: remove
-    // Add duplicate code tables
-    entries.extend(duplicate_code_entries());
-
     entries
 }
 
-fn duplicate_code_entries() -> Vec<dbscheme::Entry<'static>> {
-    vec![
-        //  duplicateCode(
-        //     unique int id: @duplication,
-        //     string relativePath: string ref,
-        //     int equivClass: int ref);
-        dbscheme::Entry::Table(dbscheme::Table {
-            name: "duplicateCode",
-            keysets: None,
-            columns: vec![
-                dbscheme::Column {
-                    db_type: dbscheme::DbColumnType::Int,
-                    name: "id",
-                    unique: true,
-                    ql_type: ql::Type::AtType("duplication"),
-                    ql_type_is_ref: false,
-                },
-                dbscheme::Column {
-                    db_type: dbscheme::DbColumnType::String,
-                    name: "relativePath",
-                    unique: false,
-                    ql_type: ql::Type::String,
-                    ql_type_is_ref: true,
-                },
-                dbscheme::Column {
-                    db_type: dbscheme::DbColumnType::Int,
-                    name: "equivClass",
-                    unique: false,
-                    ql_type: ql::Type::Int,
-                    ql_type_is_ref: true,
-                },
-            ],
-        }),
-        //   similarCode(
-        //     unique int id: @similarity,
-        //     string relativePath: string ref,
-        //     int equivClass: int ref);
-        dbscheme::Entry::Table(dbscheme::Table {
-            name: "similarCode",
-            keysets: None,
-            columns: vec![
-                dbscheme::Column {
-                    db_type: dbscheme::DbColumnType::Int,
-                    name: "id",
-                    unique: true,
-                    ql_type: ql::Type::AtType("similarity"),
-                    ql_type_is_ref: false,
-                },
-                dbscheme::Column {
-                    db_type: dbscheme::DbColumnType::String,
-                    name: "relativePath",
-                    unique: false,
-                    ql_type: ql::Type::String,
-                    ql_type_is_ref: true,
-                },
-                dbscheme::Column {
-                    db_type: dbscheme::DbColumnType::Int,
-                    name: "equivClass",
-                    unique: false,
-                    ql_type: ql::Type::Int,
-                    ql_type_is_ref: true,
-                },
-            ],
-        }),
-        //   @duplication_or_similarity = @duplication | @similarity
-        dbscheme::Entry::Union(dbscheme::Union {
-            name: "duplication_or_similarity",
-            members: ["duplication", "similarity"].iter().cloned().collect(),
-        }),
-        //   tokens(
-        //     int id: @duplication_or_similarity ref,
-        //     int offset: int ref,
-        //     int beginLine: int ref,
-        //     int beginColumn: int ref,
-        //     int endLine: int ref,
-        //     int endColumn: int ref);
-        dbscheme::Entry::Table(dbscheme::Table {
-            name: "tokens",
-            keysets: None,
-            columns: vec![
-                dbscheme::Column {
-                    db_type: dbscheme::DbColumnType::Int,
-                    name: "id",
-                    unique: false,
-                    ql_type: ql::Type::AtType("duplication_or_similarity"),
-                    ql_type_is_ref: true,
-                },
-                dbscheme::Column {
-                    db_type: dbscheme::DbColumnType::Int,
-                    name: "offset",
-                    unique: false,
-                    ql_type: ql::Type::Int,
-                    ql_type_is_ref: true,
-                },
-                dbscheme::Column {
-                    db_type: dbscheme::DbColumnType::Int,
-                    name: "beginLine",
-                    unique: false,
-                    ql_type: ql::Type::Int,
-                    ql_type_is_ref: true,
-                },
-                dbscheme::Column {
-                    db_type: dbscheme::DbColumnType::Int,
-                    name: "beginColumn",
-                    unique: false,
-                    ql_type: ql::Type::Int,
-                    ql_type_is_ref: true,
-                },
-                dbscheme::Column {
-                    db_type: dbscheme::DbColumnType::Int,
-                    name: "endLine",
-                    unique: false,
-                    ql_type: ql::Type::Int,
-                    ql_type_is_ref: true,
-                },
-                dbscheme::Column {
-                    db_type: dbscheme::DbColumnType::Int,
-                    name: "endColumn",
-                    unique: false,
-                    ql_type: ql::Type::Int,
-                    ql_type_is_ref: true,
-                },
-            ],
-        }),
-    ]
-}
-
 fn create_tokeninfo<'a>(
     token_kinds: Map<&'a str, usize>,
 ) -> (dbscheme::Case<'a>, dbscheme::Table<'a>) {

ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll

@@ -1067,9 +1067,8 @@ module Trees {
       // completion from the body
       c =
         any(NestedEnsureCompletion nec |
-          this
-              .lastEnsure(last, nec.getAnInnerCompatibleCompletion(), nec.getOuterCompletion(),
-                nec.getNestLevel())
+          this.lastEnsure(last, nec.getAnInnerCompatibleCompletion(), nec.getOuterCompletion(),
+            nec.getNestLevel())
         )
       or
       not exists(this.getBodyChild(_, _)) and

ql/src/ruby.dbscheme

@@ -1483,26 +1483,3 @@ case @token.kind of
 
 @ast_node_parent = @ast_node | @file
 
-duplicateCode(
-  unique int id: @duplication,
-  string relativePath: string ref,
-  int equivClass: int ref
-);
-
-similarCode(
-  unique int id: @similarity,
-  string relativePath: string ref,
-  int equivClass: int ref
-);
-
-@duplication_or_similarity = @duplication | @similarity
-
-tokens(
-  int id: @duplication_or_similarity ref,
-  int offset: int ref,
-  int beginLine: int ref,
-  int beginColumn: int ref,
-  int endLine: int ref,
-  int endColumn: int ref
-);
-