Merge lp:~mmcm/akiban-client-tools/generated-always into lp:~akiban-technologies/akiban-client-tools/trunk

[Mike McMahon]

Change how GENERATED ALWAYS gets dumped with data.

GENERATED BY DEFAULT is reasonable: it just puts the current sequence state (presumably after all the data) into the initial definition.

GENERATED ALWAYS needs to arrange for the actual values to get loaded and only then so something similar, via ALTER TABLE ALTER COLUMN.

A test can be added once the server stops ignoring the auto-increment clause in the alter.

[Nathan Williams (nwilliams)]

Looks good.

Will add a story for test.

review: Approve

=== modified file 'src/main/java/com/akiban/client/dump/DumpClient.java'
--- src/main/java/com/akiban/client/dump/DumpClient.java	2013-02-19 01:29:11 +0000
+++ src/main/java/com/akiban/client/dump/DumpClient.java	2013-04-11 19:46:30 +0000
@@ -37,6 +37,7 @@
     private Map<String,Map<String,Table>> schemas = new TreeMap<String,Map<String,Table>>();
     private Map<String, Map<String,Sequence>> sequences = new TreeMap<String,Map<String, Sequence>>();
     private Map<String,Map<String,View>> views = new TreeMap<String,Map<String, View>>();
+    private Queue<String> afterDataStatements = new ArrayDeque<String>();
     private int insertMaxRowCount = DEFAULT_INSERT_MAX_ROW_COUNT;
     private String defaultSchema = null;
     private Writer output;
@@ -464,6 +465,13 @@
         }
         if (dumpData) {
             dumpData(table);
+            if (!afterDataStatements.isEmpty()) {
+                String stmt;
+                while ((stmt = afterDataStatements.poll()) != null) {
+                    output.write(stmt);
+                }
+                output.write(NL);
+            }
         }
     }
 
@@ -557,9 +565,20 @@
                 String sequenceSchema = rs.getString(9);
                 String sequenceName = rs.getString(10);
                 Sequence seq = sequences.get(sequenceSchema).get(sequenceName);
-                sql.append(" GENERATED ").append(identityGenerate);
-                sql.append(" AS IDENTITY (START WITH ").append(seq.startWith);
-                sql.append(", INCREMENT BY ").append(seq.incrementBy).append (")");
+                String generated = " GENERATED " + identityGenerate +
+                    " AS IDENTITY (START WITH " + seq.startWith +
+                    ", INCREMENT BY " + seq.incrementBy + ")";
+                if (dumpData && "ALWAYS".equals(identityGenerate)) {
+                    StringBuilder sql2 = new StringBuilder("ALTER TABLE ");
+                    qualifiedName(table, sql2);
+                    sql2.append(" ALTER COLUMN ");
+                    identifier(column, sql2, false);
+                    sql2.append(" SET").append(generated).append(";").append(NL);
+                    afterDataStatements.add(sql2.toString());
+                }
+                else {
+                    sql.append(generated);
+                }
             }
             
             if (pkey != null) {