Merge branch 'master' into v0_11

Dockerfile

@@ -5,9 +5,9 @@ RUN apt-get update && apt-get install -y openjdk-7-jre curl
 RUN mkdir /app
 WORKDIR /app
 
-RUN curl -sLo - https://github.com/zendesk/maxwell/releases/download/v0.9.4/maxwell-0.9.4.tar.gz | tar zxvf -
+RUN curl -sLo - https://github.com/zendesk/maxwell/releases/download/v0.10.0/maxwell-0.10.0.tar.gz | tar zxvf -
 
-WORKDIR /app/maxwell-0.9.4
+WORKDIR /app/maxwell-0.10.0
 
 ADD REVISION /
 

LICENSE

@@ -0,0 +1,13 @@
+Copyright 2015 Zendesk
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

docs/docs/quickstart.md

@@ -30,9 +30,9 @@ mysql> GRANT ALL on maxwell.* to 'maxwell'@'localhost';
 You'll need a version 7 of a JVM.
 
 ```
-curl -sLo - https://github.com/zendesk/maxwell/releases/download/v0.9.4/maxwell-0.9.4.tar.gz \
+curl -sLo - https://github.com/zendesk/maxwell/releases/download/v0.10.0/maxwell-0.10.0.tar.gz \
        | tar zxvf -
-cd maxwell-0.9.4
+cd maxwell-0.10.0
 ```
 
 

docs/site/quickstart/index.html

@@ -114,9 +114,9 @@ <h3 id="grant-permissions">Grant permissions</h3>
 
 <h3 id="install-maxwell">Install maxwell</h3>
 <p>You'll need a version 7 of a JVM.</p>
-<pre><code>curl -sLo - https://github.com/zendesk/maxwell/releases/download/v0.9.4/maxwell-0.9.4.tar.gz \
+<pre><code>curl -sLo - https://github.com/zendesk/maxwell/releases/download/v0.10.0/maxwell-0.10.0.tar.gz \
        | tar zxvf -
-cd maxwell-0.9.4
+cd maxwell-0.10.0
 </code></pre>
 
 <h3 id="run-with-stdout-producer">Run with stdout producer</h3>

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.zendesk</groupId>
   <artifactId>maxwell</artifactId>
-  <version>0.11.0-PRE4</version>
+  <version>0.11.0-PRE5</version>
   <packaging>jar</packaging>
 
   <name>maxwell</name>
@@ -70,7 +70,7 @@
     <dependency>
     	<groupId>com.zendesk</groupId>
     	<artifactId>open-replicator</artifactId>
-    	<version>1.3.0-RC2</version>
+    	<version>1.3.0</version>
     </dependency>
     <dependency>
     	<groupId>net.sf.jopt-simple</groupId>

src/main/antlr4/imports/column_definitions.g4

@@ -77,5 +77,5 @@ nullability: (NOT NULL | NULL);
 default_value: DEFAULT (literal | NULL | CURRENT_TIMESTAMP);
 length: '(' INTEGER_LITERAL ')';
 int_flags: ( UNSIGNED | ZEROFILL );
-decimal_length: '(' INTEGER_LITERAL ',' INTEGER_LITERAL ')';
+decimal_length: '(' INTEGER_LITERAL ( ',' INTEGER_LITERAL )? ')';
 

src/main/java/com/zendesk/maxwell/schema/columndef/ColumnDef.java

@@ -56,6 +56,7 @@ public static ColumnDef build(String tableName, String name, String encoding, St
 		case "longblob":
 			return new StringColumnDef(tableName, name, type, pos, "binary");
 		case "real":
+		case "numeric":
 			type = "double";
 			// fall through
 		case "float":

src/test/java/com/zendesk/maxwell/schema/ddl/DDLParserTest.java

@@ -310,6 +310,24 @@ public void testCreateTableWithOptions() {
 		assertThat(c, not(nullValue()));
 	}
 
+	@Test
+	public void testDecimalWithSingleDigitPrecsion() {
+		TableCreate c = parseCreate( "CREATE TABLE test.chk (  group_name DECIMAL(8) NOT NULL)  ");
+		assertThat(c, not(nullValue()));
+	}
+
+	@Test
+	public void testDecimalWithDoubleDigitPrecision() {
+		TableCreate c = parseCreate( "CREATE TABLE test.chk (  group_name DECIMAL(8, 2) NOT NULL)  ");
+		assertThat(c, not(nullValue()));
+	}
+
+	@Test
+	public void testNumericType() {
+		TableCreate c = parseCreate( "CREATE TABLE test.chk (  group_name NUMERIC(8) NOT NULL)  ");
+		assertThat(c, not(nullValue()));
+	}
+
 	@Test
 	public void testCreateTableLikeTable() {
 		TableCreate c = parseCreate("CREATE TABLE `foo` LIKE `bar`.`baz`");