Merge lp:~mmcm/akiban-client-tools/more-types into lp:~akiban-technologies/akiban-client-tools/trunk

[Mike McMahon]

Handling remaining type special cases (name from AIS doesn't match what needs to be dumped) and add a test for most of the types that should now pass through okay.

[Nathan Williams (nwilliams)]

As described.

review: Approve

=== modified file 'src/main/java/com/akiban/client/dump/DumpClient.java'
--- src/main/java/com/akiban/client/dump/DumpClient.java	2013-04-11 19:17:41 +0000
+++ src/main/java/com/akiban/client/dump/DumpClient.java	2013-04-25 20:33:26 +0000
@@ -630,11 +630,15 @@
             sql.append(type.toUpperCase());
             sql.append('(').append(length).append(')');
         }
-        else if ("varbinary".equals(type)) {
-            sql.append("VARCHAR");
+        else if ("varbinary".equals(type) ||
+                 "binary".equals(type)) {
+            sql.append("binary".equals(type) ? "CHAR" : "VARCHAR");
             sql.append('(').append(length).append(')');
             sql.append(" FOR BIT DATA");
         }
+        else if ("float".equals(type)) {
+            sql.append("REAL");
+        }
         else {
             // Fixed-size numerics have a length, but it doesn't mean much.
             sql.append(type.toUpperCase());

=== modified file 'src/test/resources/com/akiban/client/dump/extra.sql'
--- src/test/resources/com/akiban/client/dump/extra.sql	2012-10-08 22:22:52 +0000
+++ src/test/resources/com/akiban/client/dump/extra.sql	2013-04-25 20:33:26 +0000
@@ -12,12 +12,42 @@
 INSERT INTO x_pk VALUES('alfa'),
                        ('bravo');
 
---- x_unsigned
-
-DROP TABLE IF EXISTS x_unsigned;
-
-CREATE TABLE x_unsigned(
-  n DECIMAL(10,2) UNSIGNED
+--- x_types
+
+DROP TABLE IF EXISTS x_types;
+
+CREATE TABLE x_types(
+  c1 BIGINT,
+  c2 BIGINT UNSIGNED,
+  c3 DOUBLE,
+  c4 DOUBLE UNSIGNED,
+  c5 REAL,
+  c6 REAL UNSIGNED,
+  c7 INT,
+  c8 INT UNSIGNED,
+  c9 MEDIUMINT,
+  c10 MEDIUMINT UNSIGNED,
+  c11 SMALLINT,
+  c12 SMALLINT UNSIGNED,
+  c13 TINYINT,
+  c14 TINYINT UNSIGNED,
+  c15 DATE,
+  c16 DATETIME,
+  c17 YEAR,
+  c18 TIME,
+  c20 VARCHAR(128) FOR BIT DATA,
+  c21 CHAR(128) FOR BIT DATA,
+  c22 VARCHAR(128) CHARACTER SET latin1 COLLATE latin1_swedish_ci,
+  c23 CHAR(128) CHARACTER SET latin1 COLLATE latin1_swedish_ci,
+  c24 TINYBLOB CHARACTER SET utf8 COLLATE utf8_bin,
+  c25 TINYTEXT CHARACTER SET utf8 COLLATE utf8_bin,
+  c27 TEXT CHARACTER SET utf8 COLLATE utf8_bin,
+  c28 MEDIUMBLOB CHARACTER SET utf8 COLLATE utf8_bin,
+  c29 MEDIUMTEXT CHARACTER SET utf8 COLLATE utf8_bin,
+  c30 LONGBLOB CHARACTER SET utf8 COLLATE utf8_bin,
+  c31 LONGTEXT CHARACTER SET utf8 COLLATE utf8_bin,
+  c32 DECIMAL(10,3),
+  c33 DECIMAL(10,3) UNSIGNED
 );