support BOOL, BOOLEAN

Ben Osheroff · Ben Osheroff · commit 87ee756977e8 · 2015-06-18T14:54:18.000-07:00
these two are SQL-syntax-only aliases for a TINYINT(1) column
diff --git a/src/main/antlr4/imports/column_definitions.g4 b/src/main/antlr4/imports/column_definitions.g4
@@ -21,10 +21,11 @@ data_type:
 // from http://dev.mysql.com/doc/refman/5.1/en/create-table.html
 generic_type: // types from which we're going to ignore any flags/length 
 	  col_type=(BIT | BINARY | YEAR) length?
-	| col_type=(DATE | TIME | TIMESTAMP | DATETIME | TINYBLOB | MEDIUMBLOB | LONGBLOB | BLOB )
+	| col_type=(DATE | TIME | TIMESTAMP | DATETIME | TINYBLOB | MEDIUMBLOB | LONGBLOB | BLOB |  BOOLEAN | BOOL )
 	| col_type=VARBINARY length
 	;
 
+
 signed_type: // we need the UNSIGNED flag here
       col_type=(TINYINT | INT1 | SMALLINT | INT2 | MEDIUMINT | INT3 | INT | INTEGER | INT4 | BIGINT | INT8 )
                 length? 
diff --git a/src/main/antlr4/imports/generate_tokens.rb b/src/main/antlr4/imports/generate_tokens.rb
@@ -158,6 +158,9 @@
 NULL
 NO
 ACTION
+
+BOOL
+BOOLEAN
 )
 
 tokens_allowed_in_names = []
diff --git a/src/main/antlr4/imports/mysql_literal_tokens.g4 b/src/main/antlr4/imports/mysql_literal_tokens.g4
@@ -1,6 +1,6 @@
 grammar mysql_literal_tokens;
 
-tokens_available_for_names: (ACTION | AFTER | AUTO_INCREMENT | AVG_ROW_LENGTH | BEGIN | BIT | BTREE | CHARSET | CHECKSUM | COLUMN_FORMAT | COMMENT | COMPACT | COMPRESSED | CONNECTION | DATA | DATE | DATETIME | DELAY_KEY_WRITE | DIRECTORY | DISABLE | DISK | DYNAMIC | ENABLE | ENGINE | ENUM | FIRST | FIXED | FULL | HASH | INSERT_METHOD | KEY_BLOCK_SIZE | LAST | MAX_ROWS | MEMORY | MIN_ROWS | MODIFY | NO | OFFLINE | ONLINE | PACK_KEYS | PARSER | PARTIAL | PASSWORD | REDUNDANT | ROW_FORMAT | SIMPLE | STORAGE | TABLESPACE | TEMPORARY | TEXT | TIME | TIMESTAMP | YEAR);
+tokens_available_for_names: (ACTION | AFTER | AUTO_INCREMENT | AVG_ROW_LENGTH | BEGIN | BIT | BOOL | BOOLEAN | BTREE | CHARSET | CHECKSUM | COLUMN_FORMAT | COMMENT | COMPACT | COMPRESSED | CONNECTION | DATA | DATE | DATETIME | DELAY_KEY_WRITE | DIRECTORY | DISABLE | DISK | DYNAMIC | ENABLE | ENGINE | ENUM | FIRST | FIXED | FULL | HASH | INSERT_METHOD | KEY_BLOCK_SIZE | LAST | MAX_ROWS | MEMORY | MIN_ROWS | MODIFY | NO | OFFLINE | ONLINE | PACK_KEYS | PARSER | PARTIAL | PASSWORD | REDUNDANT | ROW_FORMAT | SIMPLE | STORAGE | TABLESPACE | TEMPORARY | TEXT | TIME | TIMESTAMP | YEAR);
 
 
 INT1: I N T '1';
@@ -21,6 +21,8 @@ BIGINT: B I G I N T;
 BINARY: B I N A R Y;
 BIT: B I T;
 BLOB: B L O B;
+BOOL: B O O L;
+BOOLEAN: B O O L E A N;
 BTREE: B T R E E;
 BY: B Y;
 CASCADE: C A S C A D E;
diff --git a/src/main/java/com/zendesk/maxwell/schema/columndef/ColumnDef.java b/src/main/java/com/zendesk/maxwell/schema/columndef/ColumnDef.java
@@ -32,6 +32,10 @@ public static ColumnDef build(String tableName, String name, String encoding, St
 		type = unalias_type(type);
 
 		switch(type) {
+		case "bool":
+		case "boolean":
+			type = "tinyint";
+			// fallthrough
 		case "tinyint":
 		case "smallint":
 		case "mediumint":
diff --git a/src/test/java/com/zendesk/maxwell/schema/ddl/DDLIntegrationTest.java b/src/test/java/com/zendesk/maxwell/schema/ddl/DDLIntegrationTest.java
@@ -154,4 +154,13 @@ public void testYearWithLength() throws Exception {
 
 		testIntegration(sql);
 	}
+
+	@Test
+	public void testBooleans() throws Exception {
+		String sql[] = {
+			"create TABLE `test_boolean` ( b1 bool, b2 boolean )"
+		};
+
+		testIntegration(sql);
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,9 @@`
`158`	`158`	`NULL`
`159`	`159`	`NO`
`160`	`160`	`ACTION`
	`161`	`+`
	`162`	`+BOOL`
	`163`	`+BOOLEAN`
`161`	`164`	`)`
`162`	`165`
`163`	`166`	`tokens_allowed_in_names = []`
Original file line number	Diff line number	Diff line change
`@@ -154,4 +154,13 @@ public void testYearWithLength() throws Exception {`
`154`	`154`
`155`	`155`	`testIntegration(sql);`
`156`	`156`	`}`
	`157`	`+`
	`158`	`+ @Test`
	`159`	`+ public void testBooleans() throws Exception {`
	`160`	`+ String sql[] = {`
	`161`	+ "create TABLE `test_boolean` ( b1 bool, b2 boolean )"
	`162`	`+ };`
	`163`	`+`
	`164`	`+ testIntegration(sql);`
	`165`	`+ }`
`157`	`166`	`}`