Merge lp:~mmcm/akiban-sql-parser/more-types into lp:~akiban-technologies/akiban-sql-parser/trunk

[Mike McMahon]

Handle more data types that the server already has (mostly for MySQL compatibility).

This one of a trio of branches: the others are for the server and the dumper. The overall goal is to always dump something that can be parsed (didn't used to be true) and come reasonably close to dumping something that reflects what's in the AIS. (The exceptional cases are noted in another branch.)

Just parse the {TINY,MEDIUM,LONG}{INT,BLOB,TEXT} that MySQL has.
Parse TEXT that many databases have like CLOB.

None of these need to be reserved words (some of them were before this branch), so there isn't any real harm here, it's just trading off a parse error in the declaration.

[Nathan Williams (nwilliams)]

Simple enough.

review: Approve

=== modified file 'src/main/java/com/akiban/sql/types/TypeId.java'
--- src/main/java/com/akiban/sql/types/TypeId.java	2013-01-19 23:01:16 +0000
+++ src/main/java/com/akiban/sql/types/TypeId.java	2013-04-25 20:26:25 +0000
@@ -186,6 +186,13 @@
     public static final String BLOB_NAME = "BLOB";
     public static final String CLOB_NAME = "CLOB";
     public static final String NCLOB_NAME = "NCLOB";
+    public static final String TEXT_NAME = "TEXT";
+    public static final String TINYBLOB_NAME = "TINYBLOB";
+    public static final String TINYTEXT_NAME = "TINYTEXT";
+    public static final String MEDIUMBLOB_NAME = "MEDIUMBLOB";
+    public static final String MEDIUMTEXT_NAME = "MEDIUMTEXT";
+    public static final String LONGBLOB_NAME = "LONGBLOB";
+    public static final String LONGTEXT_NAME = "LONGTEXT";
     public static final String INTERVAL_YEAR_NAME = "INTERVAL YEAR";
     public static final String INTERVAL_MONTH_NAME = "INTERVAL MONTH";
     public static final String INTERVAL_YEAR_MONTH_NAME = "INTERVAL YEAR TO MONTH";
@@ -343,6 +350,14 @@
     public static final TypeId DATETIME_ID = new TypeId(FormatIds.TIMESTAMP_TYPE_ID, DATETIME_NAME);
     public static final TypeId YEAR_ID = new TypeId(FormatIds.SMALLINT_TYPE_ID, YEAR_NAME);
 
+    public static final TypeId TEXT_ID = new TypeId(FormatIds.CLOB_TYPE_ID, TEXT_NAME);
+    public static final TypeId TINYBLOB_ID = new TypeId(FormatIds.BLOB_TYPE_ID, TINYBLOB_NAME);
+    public static final TypeId TINYTEXT_ID = new TypeId(FormatIds.CLOB_TYPE_ID, TINYTEXT_NAME);
+    public static final TypeId MEDIUMBLOB_ID = new TypeId(FormatIds.BLOB_TYPE_ID, MEDIUMBLOB_NAME);
+    public static final TypeId MEDIUMTEXT_ID = new TypeId(FormatIds.CLOB_TYPE_ID, MEDIUMTEXT_NAME);
+    public static final TypeId LONGBLOB_ID = new TypeId(FormatIds.BLOB_TYPE_ID, LONGBLOB_NAME);
+    public static final TypeId LONGTEXT_ID = new TypeId(FormatIds.CLOB_TYPE_ID, LONGTEXT_NAME);
+
     private static final TypeId[] ALL_BUILTIN_TYPE_IDS = {
         BOOLEAN_ID,
         SMALLINT_ID,
@@ -391,6 +406,14 @@
         NUMERIC_UNSIGNED_ID,
         DATETIME_ID,
         YEAR_ID,
+
+        TEXT_ID,
+        TINYBLOB_ID,
+        TINYTEXT_ID,
+        MEDIUMBLOB_ID,
+        MEDIUMTEXT_ID,
+        LONGBLOB_ID,
+        LONGTEXT_ID,
     };
 
     /*
@@ -681,6 +704,27 @@
         if (SQLTypeName.equals(CLOB_NAME)) {
             return CLOB_ID;
         }
+        if (SQLTypeName.equals(TEXT_NAME)) {
+            return TEXT_ID;
+        }
+        if (SQLTypeName.equals(TINYBLOB_NAME)) {
+            return TINYBLOB_ID;
+        }
+        if (SQLTypeName.equals(TINYTEXT_NAME)) {
+            return TINYTEXT_ID;
+        }
+        if (SQLTypeName.equals(MEDIUMBLOB_NAME)) {
+            return MEDIUMBLOB_ID;
+        }
+        if (SQLTypeName.equals(MEDIUMTEXT_NAME)) {
+            return MEDIUMTEXT_ID;
+        }
+        if (SQLTypeName.equals(LONGBLOB_NAME)) {
+            return LONGBLOB_ID;
+        }
+        if (SQLTypeName.equals(LONGTEXT_NAME)) {
+            return LONGTEXT_ID;
+        }
         if (SQLTypeName.equals(XML_NAME)) {
             return XML_ID;
         }

=== modified file 'src/main/javacc/SQLGrammar.jj'
--- src/main/javacc/SQLGrammar.jj	2013-04-13 22:25:50 +0000
+++ src/main/javacc/SQLGrammar.jj	2013-04-25 20:26:25 +0000
@@ -498,6 +498,7 @@
         case VARCHAR:
         case INTEGER:
         case MEDIUMINT:
+        case TINYINT:
         case INT:
         case SMALLINT:
         case LONGINT:
@@ -1051,6 +1052,7 @@
         case DEC:
         case INTEGER:
         case MEDIUMINT:
+        case TINYINT:
         case INT:
         case SMALLINT:
         case LONGINT:
@@ -1064,6 +1066,13 @@
         case BLOB:
         case CLOB:
         case NCLOB:
+        case TEXT:
+        case MEDIUMBLOB:
+        case MEDIUMTEXT:
+        case TINYBLOB:
+        case TINYTEXT:
+        case LONGBLOB:
+        case LONGTEXT:
         case BINARY: // LARGE OBJECT
         case XML:
         case INTERVAL:
@@ -2151,7 +2160,6 @@
 | <INSERT: "insert">
 | <INT: "int">
 | <INTEGER: "integer">
-| <MEDIUMINT: "mediumint">
 | <INTERSECT: "intersect">
 | <INTO: "into">
 | <IS: "is">
@@ -2378,7 +2386,6 @@
 | <GROUPING: "grouping">
 | <EXPLAIN: "explain">
 | <LIMIT: "limit">
-| <LONGINT: "bigint">
 | <LONG: "long">
 | <LTRIM: "ltrim">
 | <NONE: "none">
@@ -2450,6 +2457,12 @@
 | <LCASE: "lcase">
 | <LOCATE: "locate">
 | <LOCK: "lock">
+| <LONGBLOB: "longblob">
+| <LONGINT: "bigint">
+| <LONGTEXT: "longtext">
+| <MEDIUMBLOB: "mediumblob">
+| <MEDIUMINT: "mediumint">
+| <MEDIUMTEXT: "mediumtext">
 | <MESSAGE_LOCALE: "message_locale">
 | <METHOD: "method">
 | <MICROSECOND: "microsecond">
@@ -2497,6 +2510,10 @@
 | <STDOUT: "stdout">
 | <STRIP: "strip">
 | <STYLE: "style">
+| <TEXT:  "text">
+| <TINYBLOB: "tinyblob">
+| <TINYINT: "tinyint">
+| <TINYTEXT: "tinytext">
 | <TRIGGER: "trigger">
 | <TRUNCATE_END: "truncate_end">
 | <UCASE: "ucase">
@@ -4103,6 +4120,7 @@
 {
     int length = 0x80000000-1;      // default to 2GB-1 if no length specified
     String type;
+    CharacterTypeAttributes characterAttributes;
 }
 {
 (
@@ -4116,6 +4134,11 @@
         type = TypeId.CLOB_NAME;
     }
 |
+    <TEXT> [ length = lengthAndModifier() ]
+    {
+        type = TypeId.TEXT_NAME;
+    }
+|
     <NCLOB> length = lengthAndModifier()
     {
         type = TypeId.NCLOB_NAME;
@@ -4135,9 +4158,42 @@
     {
         type = TypeId.NCLOB_NAME;
     }
+|
+    <TINYBLOB> [ length = lengthAndModifier() ]
+    {
+        type = TypeId.TINYBLOB_NAME;
+    }
+|
+    <TINYTEXT> [ length = lengthAndModifier() ]
+    {
+        type = TypeId.TINYTEXT_NAME;
+    }
+|
+    <MEDIUMBLOB> [ length = lengthAndModifier() ]
+    {
+        type = TypeId.MEDIUMBLOB_NAME;
+    }
+|
+    <MEDIUMTEXT> [ length = lengthAndModifier() ]
+    {
+        type = TypeId.MEDIUMTEXT_NAME;
+    }
+|
+    <LONGBLOB> [ length = lengthAndModifier() ]
+    {
+        type = TypeId.LONGBLOB_NAME;
+    }
+|
+    <LONGTEXT> [ length = lengthAndModifier() ]
+    {
+        type = TypeId.LONGTEXT_NAME;
+    }
 )
+    characterAttributes = characterTypeAttributes()
     {
         DataTypeDescriptor dtd = DataTypeDescriptor.getBuiltInDataTypeDescriptor(type, length);
+        if (characterAttributes != null)
+            dtd = new DataTypeDescriptor(dtd, characterAttributes);
         return dtd;
     }
 }
@@ -4150,8 +4206,6 @@
 }
 {
 (
-    <MEDIUMINT> {typeDescriptor = DataTypeDescriptor.MEDIUMINT;}
-|
     typeDescriptor = exactNumericType()
 |
     typeDescriptor = approximateNumericType()
@@ -4225,11 +4279,17 @@
     {
         return DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.INTEGER);
     }
+|
     <MEDIUMINT>
     {
         return DataTypeDescriptor.MEDIUMINT;
     }
 |
+    <TINYINT>
+    {
+        return DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.TINYINT);
+    }
+|
     <SMALLINT>
     {
         return DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.SMALLINT);
@@ -14634,7 +14694,6 @@
 | tok = <INSERT>
 | tok = <INT>
 | tok = <INTEGER>
-| tok = <MEDIUMINT>
 | tok = <INTERSECT>
 | tok = <INTERVAL>
 | tok = <INTO>
@@ -14746,7 +14805,6 @@
 | tok = <CURRENT_SCHEMA>
 | tok = <EXPLAIN>
 | tok = <GROUPING>
-| tok = <LONGINT>
 | tok = <LTRIM>
 | tok = <RTRIM>
 | tok = <TRIM>
@@ -14857,6 +14915,12 @@
 | tok = <LOCKSIZE>
 | tok = <LOGGED>
 | tok = <LONG>
+| tok = <LONGBLOB>
+| tok = <LONGINT>
+| tok = <LONGTEXT>
+| tok = <MEDIUMBLOB>
+| tok = <MEDIUMINT>
+| tok = <MEDIUMTEXT>
 | tok = <MESSAGE_LOCALE>
 | tok = <METHOD>
 | tok = <MICROSECOND>
@@ -14950,11 +15014,15 @@
 | tok = <SYNONYM>
 | tok = <STYLE>
 | tok = <T>
+| tok = <TEXT>
 | tok = <THEN>
 | tok = <TIME>
 | tok = <TIMESTAMP>
 | tok = <TIMESTAMPADD>
 | tok = <TIMESTAMPDIFF>
+| tok = <TINYBLOB>
+| tok = <TINYINT>
+| tok = <TINYTEXT>
 | tok = <TRIGGER>
 | tok = <TRUNCATE>
 | tok = <TRUNCATE_END>