fix: scrub all comment end markers from comments (#10163)

This was only removing the first comment end marker, so it was still possible to generate invalid SQL with the comment method.
typeorm · Aug 19, 2023 · d937f61 · d937f61
1 parent 9f8899f
commit d937f61
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/query-builder/QueryBuilder.ts b/src/query-builder/QueryBuilder.ts
@@ -829,7 +829,7 @@ export abstract class QueryBuilder<Entity extends ObjectLiteral> {
         // to scrub "ending" characters from the SQL but otherwise we can leave everything else
         // as-is and it should be valid.
 
-        return `/* ${this.expressionMap.comment.replace("*/", "")} */ `
+        return `/* ${this.expressionMap.comment.replace(/\*\//g, "")} */ `
     }
 
     /**

diff --git a/test/functional/query-builder/comment/query-builder-comment.ts b/test/functional/query-builder/comment/query-builder-comment.ts
@@ -24,10 +24,10 @@ describe("query builder > comment", () => {
             connections.map(async (connection) => {
                 const sql = connection.manager
                     .createQueryBuilder(Test, "test")
-                    .comment("Hello World */")
+                    .comment("Hello World */ */")
                     .getSql()
 
-                expect(sql).to.match(/^\/\* Hello World  \*\/ /)
+                expect(sql).to.match(/^\/\* Hello World   \*\/ /)
             }),
         ))