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

[Mike McMahon]

Server side for parsing more types.

Most notable for actual users is that TEXT is now allowed in DDL and not just in higher-level layers.

Also includes the MySQL sized types, because they are known to the AIS, so this is mostly harmless.

The remaining exceptional types are:
* TIMESTAMP. As far as I know, we do not implement MySQL TIMESTAMP semantics on INSERT/UPDATE, even though we track the type for replication. So, TIMESTAMP on CREATE TABLE turns into DATETIME. We do not want to sacrifice the TIMESTAMP keyword (which is standard SQL for an instance within a day). So, if we did implement the semantics, we'd need a new name like MYSQL_TIMESTAMP.
* FLOAT. This will load as DOUBLE, because FLOAT in Derby takes precision. So, it needs to dump as REAL, thereby preserving the semantics at the expense of not having the same syntax.
* BLOB. This turns into LONGBLOB on load. Not that we care, but that better represents to the adapter what we want that standard type to be. So, a MySQL BLOB will load larger than it was if dumped and restored through PSQL.

I think these are reasonable tradeoffs, but I could be persuaded to take a different approach.

[Nathan Williams (nwilliams)]

Your tradeoffs make sense to me.

There's a workaround TODO on TableDDL.java#285. Can that be removed after your associated parser change?

Looks fine otherwise.

review: Needs Information

[Mike McMahon (mmcm)]

Quite right. That isn't needed any more.

review: Needs Resubmitting

[Nathan Williams (nwilliams)]

Splendid.

review: Approve

[Akiban Build User (build-akiban)]

There were 2 failures during build/test:

* job server-build failed at build number 4000: http://172.16.20.104:8080/job/server-build/4000/

* view must-pass failed: server-build is yellow

review: Needs Fixing

[lp:~mmcm/akiban-server/sql-more-types]

2646. By Mike McMahon on 2013-04-25

Update test.

=== modified file 'src/main/java/com/akiban/sql/aisddl/TableDDL.java'
--- src/main/java/com/akiban/sql/aisddl/TableDDL.java	2013-04-23 19:22:46 +0000
+++ src/main/java/com/akiban/sql/aisddl/TableDDL.java	2013-04-25 22:47:29 +0000
@@ -282,10 +282,6 @@
     static Type columnType(DataTypeDescriptor type, Long[] typeParameters,
                            String schemaName, String tableName, String columnName) {
         Type builderType = typeMap.get(type.getTypeId());
-        // TODO: Parser doesn't map tinyint properly
-        if (builderType == null && Types.TINYINT.name().equalsIgnoreCase(type.getTypeName())) {
-            builderType = typeMap.get(TypeId.TINYINT_ID);
-        }
         if (builderType == null) {
             throw new UnsupportedDataTypeException(new TableName(schemaName, tableName), columnName, type.getTypeName());
         }
@@ -539,6 +535,13 @@
         
         types.put(TypeId.BLOB_ID, Types.LONGBLOB);
         types.put(TypeId.CLOB_ID, Types.LONGTEXT);
+        types.put(TypeId.TEXT_ID, Types.TEXT);
+        types.put(TypeId.TINYBLOB_ID, Types.TINYBLOB);
+        types.put(TypeId.TINYTEXT_ID, Types.TINYTEXT);
+        types.put(TypeId.MEDIUMBLOB_ID, Types.MEDIUMBLOB);
+        types.put(TypeId.MEDIUMTEXT_ID, Types.MEDIUMTEXT);
+        types.put(TypeId.LONGBLOB_ID, Types.LONGBLOB);
+        types.put(TypeId.LONGTEXT_ID, Types.LONGTEXT);
         return Collections.unmodifiableMap(types);
         
     }        

=== modified file 'src/test/resources/com/akiban/sql/pg/yaml/functional/test-create-table.yaml'
--- src/test/resources/com/akiban/sql/pg/yaml/functional/test-create-table.yaml	2013-03-19 05:13:37 +0000
+++ src/test/resources/com/akiban/sql/pg/yaml/functional/test-create-table.yaml	2013-04-25 22:47:29 +0000
@@ -28,6 +28,12 @@
 # mediumint is now supported
 - CreateTable: table_mediumint (mediumint_field mediumint)
 ---
+# text is now supported
+- CreateTable: table_text (text_field text)
+---
+
+# Test not yet supported types
+
 # enum is not supported
 - CreateTable: table_enum (enum_field enum)
 - error: [50008]
@@ -36,14 +42,6 @@
 - CreateTable: table_xml (xml_field xml)
 - error: [50008]
 ---
-
-# Test not yet supported types
-
-# text is not supported yet
-- CreateTable: table_text (text_field text)
-- error: [50008]
----
-
 # Bug 941657 -- number of fk columns != number of pk columns
 - CreateTable: parent (pid int not null, primary key(pid))
 ---