Adjusted code

propelorm · Mar 29, 2024 · d7b87fd · d7b87fd
1 parent 94561f5
commit d7b87fd
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/Propel/Generator/Util/SqlParser.php b/src/Propel/Generator/Util/SqlParser.php
@@ -239,25 +239,28 @@ public function getNextStatement(): string
         $lowercaseString = ''; // helper variable for performance sake
         while ($this->pos <= $this->len) {
             $char = $this->sql[$this->pos] ?? '';
+
+            $newLine = !isset($this->sql[$this->pos - 1]) || $this->sql[$this->pos - 1] === PHP_EOL;
+
             // Skip comments
-            if ($isCommentLine === true && $char !== PHP_EOL) {
+            if ($isCommentLine === true) {
                 $this->pos++;
+                if ($char === PHP_EOL) {
+                    $isCommentLine = false; // end of comments line
+                }
 
                 continue;
             }
             // check flags for strings or escaper
             switch ($char) {
                 case '#':
                     // detect comment line
-                    if ($this->sql[$this->pos--] === PHP_EOL) {
+                    if ($newLine === true && $isCommentLine === false) {
+                        $this->pos++;
                         $isCommentLine = true;
 
                         continue 2;
                     }
-                case "\n":
-                    if ($isCommentLine === true) {
-                        $isCommentLine = false;
-                    }
 
                     break;
                 case '\\':