You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by pc...@apache.org on 2026/08/11 19:49:03 UTC

(openjpa) branch OPENJPA-2940 updated: [OPENJPA-2940] Fixing SchemaTool stripComment function for inline comments

This is an automated email from the ASF dual-hosted git repository.

cristof pushed a commit to branch OPENJPA-2940
in repository https://gitbox.apache.org/repos/asf/openjpa.git


The following commit(s) were added to refs/heads/OPENJPA-2940 by this push:
     new baf4752c4 [OPENJPA-2940] Fixing SchemaTool stripComment function for inline comments
baf4752c4 is described below

commit baf4752c4ea9e4ac429081ffc15e61bdca9c060e
Author: Paulo Cristovão de Araújo Silva Filho <pc...@gmail.com>
AuthorDate: Tue Aug 11 16:48:54 2026 -0300

    [OPENJPA-2940] Fixing SchemaTool stripComment function for inline comments
---
 .../src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java        | 2 +-
 .../src/test/java/org/apache/openjpa/jdbc/meta/TestSchemaTool.java      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java
index dc4704313..f82b237ee 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java
@@ -593,7 +593,7 @@ public class SchemaTool {
                         int cutStart = multiStartIdx > -1 ? multiStartIdx : 0;
                         if (multiEndIdx > -1) {
                             inside = false;
-                            str = str.substring(cutStart, multiEndIdx);
+                            str = str.substring(0, cutStart) + str.substring(multiEndIdx + 2);
                         } else {
                             str = str.substring(0, cutStart);
                         }
diff --git a/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestSchemaTool.java b/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestSchemaTool.java
index bb2f4aa7e..0c8bc57db 100644
--- a/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestSchemaTool.java
+++ b/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestSchemaTool.java
@@ -49,6 +49,7 @@ public class TestSchemaTool {
           {"org/apache/openjpa/jdbc/meta/testScript4", List.of()},
           {"org/apache/openjpa/jdbc/meta/testScriptMulti1", List.of("SELECT * FROM MyTable")},
           {"org/apache/openjpa/jdbc/meta/testScriptMulti2", List.of()},
+          {"org/apache/openjpa/jdbc/meta/testScriptCommented", List.of("SELECT * FROM Customer c  WHERE c.id = 1")}
       });
     }
     @Parameter(0)