Merge lp:~tjoneslo/akiban-server/rest-parse-dates-timestamp into lp:~akiban-technologies/akiban-server/trunk

[Thomas Jones-Low]

Add datetime discovery for the REST EntityParser.

Now performs two checks on strings to see if they might be, and exactly match, a ISO formatted date time. If so, create the column as a timestamp rather than a string.

[Nathan Williams (nwilliams)]

TIMESTAMP is a little funny, so we may want to add a colDatetime to get a DATETIME instead. Otherwise looks as I would expect.

review: Needs Fixing

[lp:~tjoneslo/akiban-server/rest-parse-dates-timestamp]

2612. By Thomas Jones-Low on 2013-04-01

Add colDateTime to AISBuilder, use in EntityParser

[Thomas Jones-Low (tjoneslo)]

Update per comments, now creates a DateTime column for the entity.

review: Needs Resubmitting

[Nathan Williams (nwilliams)]

Excellent. Thanks.

review: Approve

=== modified file 'src/main/java/com/akiban/ais/model/aisb2/AISBBasedBuilder.java'
--- src/main/java/com/akiban/ais/model/aisb2/AISBBasedBuilder.java	2013-03-25 22:50:36 +0000
+++ src/main/java/com/akiban/ais/model/aisb2/AISBBasedBuilder.java	2013-04-01 18:38:20 +0000
@@ -19,10 +19,8 @@
 
 import com.akiban.ais.model.AISBuilder;
 import com.akiban.ais.model.AkibanInformationSchema;
-import com.akiban.ais.model.DefaultNameGenerator;
 import com.akiban.ais.model.Group;
 import com.akiban.ais.model.Index;
-import com.akiban.ais.model.NameGenerator;
 import com.akiban.ais.model.Parameter;
 import com.akiban.ais.model.Routine;
 import com.akiban.ais.model.TableName;
@@ -55,7 +53,7 @@
         return new ActualBuilder().defaultSchema(defaultSchema);
     }
 
-    private static class ActualBuilder implements NewAISBuilder, NewViewBuilder, NewAkibanJoinBuilder, NewRoutineBuilder, NewSQLJJarBuilder {
+    private static class ActualBuilder implements NewViewBuilder, NewAkibanJoinBuilder, NewRoutineBuilder, NewSQLJJarBuilder {
 
         // NewAISProvider interface
 
@@ -326,6 +324,18 @@
             aisb.column(schema, userTable, name, uTableColumnPos++, "TEXT", null, null, nullable, false, null, null);
             return this;
         }
+        
+        @Override
+        public NewUserTableBuilder colDateTime (String name) {
+            return colDateTime(name, NULLABLE_DEFAULT);
+        }
+        
+        @Override
+        public NewUserTableBuilder colDateTime (String name, boolean nullable) {
+            aisb.column(schema, userTable, name, uTableColumnPos++, "DATETIME", null, null, nullable, false, null, null);
+            return this;
+        }
+
 
         @Override
         public NewUserTableBuilder pk(String... columns) {
@@ -552,7 +562,7 @@
             catch (MalformedURLException ex1) {
                 File file = new File(value);
                 try {
-                    url = file.toURL();
+                    url = file.toURI().toURL();
                 }
                 catch (MalformedURLException ex2) {
                     // Report original failure.

=== modified file 'src/main/java/com/akiban/ais/model/aisb2/NewUserTableBuilder.java'
--- src/main/java/com/akiban/ais/model/aisb2/NewUserTableBuilder.java	2013-03-25 22:50:36 +0000
+++ src/main/java/com/akiban/ais/model/aisb2/NewUserTableBuilder.java	2013-04-01 18:38:20 +0000
@@ -122,6 +122,9 @@
     
     NewUserTableBuilder colText(String name);
     NewUserTableBuilder colText(String name, boolean nullable);
+    
+    NewUserTableBuilder colDateTime (String name);
+    NewUserTableBuilder colDateTime (String name, boolean nullable);
 
     /**
      * Adds a PK

=== modified file 'src/main/java/com/akiban/server/entity/changes/EntityParser.java'
--- src/main/java/com/akiban/server/entity/changes/EntityParser.java	2013-03-26 16:44:27 +0000
+++ src/main/java/com/akiban/server/entity/changes/EntityParser.java	2013-04-01 18:38:20 +0000
@@ -19,8 +19,11 @@
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.Map.Entry;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.codehaus.jackson.JsonNode;
+import org.joda.time.format.ISODateTimeFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -152,11 +155,25 @@
             }
         }
     }
-    
+    private static final Pattern DATE_PATTERN = Pattern.compile("^((\\d+)-(\\d+)-(\\d+)).*");    
     private void addColumnToTable (JsonNode node, String name, NewUserTableBuilder table) {
         if (node.isTextual()) {
-            int  len = Math.max(node.asText().length(), stringWidth);
-            table.colString(name, len, true);
+            boolean dateColumn = false;
+            // Do a simple "could be a date" check first, if so, do an exact verify.
+            Matcher m = DATE_PATTERN.matcher(node.asText().trim());
+            if (m.matches()) {
+                try {
+                    ISODateTimeFormat.dateTimeParser().parseDateTime(node.asText());
+                    table.colDateTime(name, true);
+                    dateColumn = true;
+                } catch (IllegalArgumentException ex) {
+                    dateColumn = false;
+                }
+            }
+            if (!dateColumn) {
+                int  len = Math.max(node.asText().length(), stringWidth);
+                table.colString(name, len, true);
+            }
         } else if (node.isIntegralNumber()) {
             table.colBigInt(name, true);
         } else if (node.isDouble()) {

=== modified file 'src/test/java/com/akiban/server/entity/changes/EntityParserIT.java'
--- src/test/java/com/akiban/server/entity/changes/EntityParserIT.java	2013-03-26 16:02:35 +0000
+++ src/test/java/com/akiban/server/entity/changes/EntityParserIT.java	2013-04-01 18:38:20 +0000
@@ -28,8 +28,6 @@
 import org.codehaus.jackson.JsonProcessingException;
 import org.junit.Before;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.akiban.ais.model.AkibanInformationSchema;
 import com.akiban.ais.model.Join;
@@ -39,7 +37,6 @@
 import com.akiban.server.test.it.ITBase;
 
 public class EntityParserIT extends ITBase {
-    private static final Logger LOG = LoggerFactory.getLogger(EntityParserIT.class);
 
     private EntityParser parser;
     
@@ -68,7 +65,7 @@
     @Test
     public void testOrders() throws JsonProcessingException, IOException {
         TableName tableName = new TableName ("test", "orders");
-        String postInput = "{\"oid\" : 103, \"cid\" : 2, \"odate\": \"2012-12-31 12:00:00\"}";
+        String postInput = "{\"oid\" : 103, \"cid\" : 2, \"odate\": \"2012-12-31T12:00:00\"}";
         AkibanInformationSchema ais = processParse(tableName, postInput);
 
         assertTrue(ais.getTable(tableName).getColumns().size() == 3);
@@ -128,7 +125,7 @@
         TableName tableName = new TableName ("test", "customers");
         String postInput ="{\"cid\": 6, \"first_name\": \"John\",\"last_name\": \"Smith\"," +
                 "\"addresses\": {\"aid\": 104, \"cid\": 6, \"state\": \"MA\", \"city\": \"Boston\"}," +
-                "\"orders\": {\"oid\" : 103, \"cid\" : 2, \"odate\": \"2012-12-31 12:00:00\"}}";
+                "\"orders\": {\"oid\" : 103, \"cid\" : 2, \"odate\": \"2012-12-31T12:00:00\"}}";
         AkibanInformationSchema ais = processParse(tableName, postInput);
         
         UserTable c = ais.getUserTable(tableName);
@@ -288,6 +285,28 @@
         assertTrue(ais.getTable(tableName).getColumn(1).getType().equals(Types.BOOLEAN));
     }
 
+    @Test
+    public void testDateGood() throws IOException {
+        TableName tableName = new TableName ("test", "customers");
+        String postInput = "{\"cid\":6, \"order_date\":\"1970-01-01T00:00:01Z\"}";
+        
+        AkibanInformationSchema ais = processParse (tableName, postInput);
+        assertTrue(ais.getTable(tableName).getColumns().size() == 2);
+        assertTrue(ais.getTable(tableName).getColumn(0).getType().equals(Types.BIGINT));
+        assertTrue(ais.getTable(tableName).getColumn(1).getType().equals(Types.DATETIME));
+    }
+    
+    @Test
+    public void testDateBad() throws IOException {
+        TableName tableName = new TableName ("test", "customers");
+        String postInput = "{\"cid\":6, \"phone-number\":\"802-555-1212\", \"ssn\": \"000-41-9999\"}";
+        AkibanInformationSchema ais = processParse (tableName, postInput);
+        assertTrue(ais.getTable(tableName).getColumns().size() == 3);
+        assertTrue(ais.getTable(tableName).getColumn(0).getType().equals(Types.BIGINT));
+        assertTrue(ais.getTable(tableName).getColumn(1).getType().equals(Types.VARCHAR));
+        assertTrue(ais.getTable(tableName).getColumn(2).getType().equals(Types.VARCHAR));
+    }
+    
     private AkibanInformationSchema processParse (TableName tableName, String postInput) throws JsonProcessingException, IOException{
         JsonNode node = readTree(postInput);
         parser.parseAndCreate(ddl(), session(), tableName, node);