Merge pull request #52 from zendesk/ben/inline_comments

Ben/inline comments
zendesk · May 26, 2015 · 813f641 · 813f641
2 parents 246b702 + 8e0db34
commit 813f641
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/docs/docs/quickstart.md b/docs/docs/quickstart.md
@@ -23,9 +23,9 @@ mysql> GRANT SELECT, REPLICATION CLIENT, REPLICATION SLAVE on *.* to 'maxwell'@'
 You'll need a version 7 of a JVM.
 
 ```
-curl -sLo - https://github.com/zendesk/maxwell/releases/download/v0.7.0/maxwell-0.7.0.tar.gz \
+curl -sLo - https://github.com/zendesk/maxwell/releases/download/v0.7.1/maxwell-0.7.1.tar.gz \
        | tar zxvf -
-cd maxwell-0.7.0
+cd maxwell-0.7.1
 ```
 
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.zendesk</groupId>
   <artifactId>maxwell</artifactId>
-  <version>0.7.0</version>
+  <version>0.7.1</version>
   <packaging>jar</packaging>
 
   <name>maxwell</name>

diff --git a/src/main/antlr4/imports/mysql_idents.g4 b/src/main/antlr4/imports/mysql_idents.g4
@@ -10,6 +10,7 @@ integer: INTEGER_LITERAL;
 charset_name: (IDENT | STRING_LITERAL | QUOTED_IDENT);
 
 SQL_COMMENT: '/*' (.)*? '*/' -> skip;
+SQL_LINE_COMMENT: ('#' | '--') (~'\n')* ('\n' | EOF) -> skip;
 
 STRING_LITERAL: TICK ('\\\'' | '\'\'' | ~('\''))* TICK;
 

diff --git a/src/test/java/com/zendesk/maxwell/schema/ddl/DDLParserTest.java b/src/test/java/com/zendesk/maxwell/schema/ddl/DDLParserTest.java
@@ -346,6 +346,12 @@ public void testCommentSyntax() {
 		assertThat(changes.size(), is(1));
 	}
 
+	@Test
+	public void testCommentSyntax2() {
+		List<SchemaChange> changes = parse("CREATE DATABASE if not exists `foo` -- inline comment!\n default character # another one\nset='latin1' --one at the end");
+		assertThat(changes.size(), is(1));
+	}
+
 	@Test
 	public void testCurrentTimestamp() {
 		List<SchemaChange> changes = parse("CREATE TABLE `foo` ( `id` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP )");