Merge pull request #386 from mkurz/evolutions_sql92_comment_syntax

Use SQL92 comment syntax
playframework · Aug 14, 2023 · 89571c4 · 89571c4
2 parents fc1a3f0 + 7e600cf
commit 89571c4
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/play-ebean/src/main/java/play/db/ebean/EbeanDynamicEvolutions.java b/play-ebean/src/main/java/play/db/ebean/EbeanDynamicEvolutions.java
@@ -71,7 +71,9 @@ public void create() {
                   content =
                       new String(Files.readAllBytes(evolutions.toPath()), StandardCharsets.UTF_8);
                 }
-                if (content.isEmpty() || content.startsWith("# --- Created by Ebean DDL")) {
+                if (content.isEmpty()
+                    || content.startsWith("# --- Created by Ebean DDL")
+                    || content.startsWith("-- Created by Ebean DDL")) {
                   environment.getFile("conf/evolutions/" + key).mkdirs();
                   if (!content.equals(evolutionScript)) {
                     Files.write(
@@ -104,14 +106,14 @@ private static String generateScript(SpiEbeanServer spiServer) {
       return null;
     }
 
-    return "# --- Created by Ebean DDL\r\n"
-        + "# To stop Ebean DDL generation, remove this comment and start using Evolutions\r\n"
+    return "-- Created by Ebean DDL\r\n"
+        + "-- To stop Ebean DDL generation, remove this comment (both lines) and start using Evolutions\r\n"
         + "\r\n"
-        + "# --- !Ups\r\n"
+        + "-- !Ups\r\n"
         + "\r\n"
         + ups
         + "\r\n"
-        + "# --- !Downs\r\n"
+        + "-- !Downs\r\n"
         + "\r\n"
         + downs;
   }