SQl-Parser:

- optionally set pointer behind matches
- added detection for incomplete statements

SQl-Browser / SQL-Box:
-  output error message if query is incomplete

library/Msd/Sql/Parser/Statement/Alter.php

@@ -30,7 +30,7 @@ class Msd_Sql_Parser_Statement_Alter implements Msd_Sql_Parser_Interface
         $sql->setState('Alter');
         $endOfStatement = $sql->getPosition(';');
         $statement = $sql->getData($endOfStatement);
-        $sql->setPointer($endOfStatement+1);
+        $sql->setPointer($endOfStatement);
         return $statement;
     }
 }

library/Msd/Sql/Parser/Statement/Comment.php

@@ -25,8 +25,31 @@ class Msd_Sql_Parser_Statement_Comment implements Msd_Sql_Parser_Interface
      *
      * @return void
      */
-    public function parse(Msd_Sql_Object$statement)
+    public function parse(Msd_Sql_Object $sql)
     {
-        return $statement;
+        $sql->setState('Comment');
+        $firstChars = $sql->getData(3);
+        $returnStatement = false;
+        if (substr($firstChars, 0, 2) == '--' || substr($firstChars, 0, 1) == '#') {
+            // one line comment -> match new line
+            $match = "\n";
+        } else {
+            if ($firstChars == '/*!') {
+                // conditionial statement
+                $match = '*/;';
+                $returnStatement = true;
+            } else {
+                // multi line comment
+                $match = '*/';
+            }
+        }
+        $endOfStatement = $sql->getPosition($match);
+        $statement = $sql->getData($endOfStatement);
+        $sql->setPointer($endOfStatement);
+        if ($returnStatement === true) {
+            return $statement;
+        } else {
+            return false;
+        }
     }
 }

library/Msd/Sql/Parser/Statement/Create.php

@@ -30,7 +30,7 @@ class Msd_Sql_Parser_Statement_Create implements Msd_Sql_Parser_Interface
         $sql->setState('Create');
         $endOfStatement = $sql->getPosition(';');
         $statement = $sql->getData($endOfStatement);
-        $sql->setPointer($endOfStatement+1);
+        $sql->setPointer($endOfStatement);
         return $statement;
     }
 }

library/Msd/Sql/Parser/Statement/Drop.php

@@ -30,7 +30,7 @@ class Msd_Sql_Parser_Statement_Drop implements Msd_Sql_Parser_Interface
         $sql->setState('Drop');
         $endOfStatement = $sql->getPosition(';');
         $statement = $sql->getData($endOfStatement);
-        $sql->setPointer($endOfStatement+1);
+        $sql->setPointer($endOfStatement);
         return $statement;
     }
 }

library/Msd/Sql/Parser/Statement/Insert.php

@@ -30,7 +30,7 @@ class Msd_Sql_Parser_Statement_Insert implements Msd_Sql_Parser_Interface
         $sql->setState('Insert');
         $endOfStatement = $sql->getPosition(';');
         $statement = $sql->getData($endOfStatement);
-        $sql->setPointer($endOfStatement+1);
+        $sql->setPointer($endOfStatement);
         return $statement;
     }
 }

library/Msd/Sql/Parser/Statement/Lock.php

@@ -30,7 +30,7 @@ class Msd_Sql_Parser_Statement_Lock implements Msd_Sql_Parser_Interface
         $sql->setState('Lock');
         $endOfStatement = $sql->getPosition(';');
         $statement = $sql->getData($endOfStatement);
-        $sql->setPointer($endOfStatement+1);
+        $sql->setPointer($endOfStatement);
         return $statement;
     }
 }

library/Msd/Sql/Parser/Statement/Unlock.php

@@ -30,7 +30,7 @@ class Msd_Sql_Parser_Statement_Unlock implements Msd_Sql_Parser_Interface
         $sql->setState('Unlock');
         $endOfStatement = $sql->getPosition(';');
         $statement = $sql->getData($endOfStatement);
-        $sql->setPointer($endOfStatement+1);
+        $sql->setPointer($endOfStatement);
         return $statement;
     }
 }