Merge lp:~nwilliams/akiban-server/remove-modelbuilder-jonquil into lp:~akiban-technologies/akiban-server/trunk

[Nathan Williams]

Remove ModelBuilder and Jonquil REST endpoints.

Entirely minus aside from import tweaks due to Jonquil dependency no longer bringing in two versions of Jackson.

[Mike McMahon (mmcm)]

As agreed.

review: Approve

=== modified file 'pom.xml'
--- pom.xml	2013-06-14 11:23:11 +0000
+++ pom.xml	2013-07-29 15:32:48 +0000
@@ -52,11 +52,6 @@
     
     <dependencies>
         <dependency>
-            <groupId>com.akiban</groupId>
-            <artifactId>jonquil</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-math</artifactId>
             <version>2.2</version>

=== modified file 'src/main/java/com/akiban/rest/RestResponseBuilder.java'
--- src/main/java/com/akiban/rest/RestResponseBuilder.java	2013-04-26 15:25:38 +0000
+++ src/main/java/com/akiban/rest/RestResponseBuilder.java	2013-07-29 15:32:48 +0000
@@ -26,7 +26,7 @@
 import com.akiban.server.error.NoSuchRoutineException;
 import com.akiban.server.error.NoSuchTableException;
 import com.akiban.util.AkibanAppender;
-import org.codehaus.jackson.JsonParseException;
+import com.fasterxml.jackson.core.JsonParseException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

=== modified file 'src/main/java/com/akiban/rest/RestServiceImpl.java'
--- src/main/java/com/akiban/rest/RestServiceImpl.java	2013-06-11 16:32:59 +0000
+++ src/main/java/com/akiban/rest/RestServiceImpl.java	2013-07-29 15:32:48 +0000
@@ -109,7 +109,6 @@
                 new VersionResource(reqs),
                 new DirectResource(reqs),
                 new ViewResource(reqs),
-                new BuilderResource(reqs),
                 // This must be last to capture anything not handled above
                 new DefaultResource()
         ));

=== removed file 'src/main/java/com/akiban/rest/resources/BuilderResource.java'
--- src/main/java/com/akiban/rest/resources/BuilderResource.java	2013-06-11 16:30:17 +0000
+++ src/main/java/com/akiban/rest/resources/BuilderResource.java	1970-01-01 00:00:00 +0000
@@ -1,218 +0,0 @@
-/**
- * Copyright (C) 2009-2013 Akiban Technologies, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.akiban.rest.resources;
-
-import com.akiban.ais.model.TableName;
-import com.akiban.rest.ResourceRequirements;
-import com.akiban.rest.RestResponseBuilder;
-import com.akiban.server.service.restdml.ModelBuilder;
-import com.akiban.server.service.restdml.RestDMLService;
-import com.akiban.server.service.security.SecurityService;
-import com.akiban.util.JsonUtils;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-import java.io.PrintWriter;
-
-import static com.akiban.rest.resources.ResourceHelper.IDENTIFIERS_MULTI;
-import static com.akiban.rest.resources.ResourceHelper.MEDIATYPE_JSON_JAVASCRIPT;
-import static com.akiban.rest.resources.ResourceHelper.checkTableAccessible;
-import static com.akiban.rest.resources.ResourceHelper.getPKString;
-import static com.akiban.rest.resources.ResourceHelper.parseTableName;
-
-@Path("/builder")
-public class BuilderResource {
-    private final SecurityService securityService;
-    private final RestDMLService restDMLService;
-    private final ModelBuilder modelBuilder;
-    
-    public BuilderResource(ResourceRequirements reqs) {
-        this.securityService = reqs.securityService;
-        this.restDMLService = reqs.restDMLService;
-        this.modelBuilder = new ModelBuilder(
-                reqs.sessionService,
-                reqs.transactionService,
-                reqs.dxlService,
-                reqs.store,
-                restDMLService
-        );
-    }
-
-    @GET
-    @Path("/entity/{entity}")
-    @Produces(MEDIATYPE_JSON_JAVASCRIPT)
-    public Response getAll(@Context HttpServletRequest request,
-                           @PathParam("entity") String entityName) {
-        final TableName tableName = parseTableName(request, entityName);
-        checkTableAccessible(securityService, request, tableName);
-        return RestResponseBuilder
-                .forRequest(request)
-                .body(new RestResponseBuilder.BodyGenerator() {
-                    @Override
-                    public void write(PrintWriter writer) throws Exception {
-                        modelBuilder.getAll(writer, tableName);
-                    }
-                })
-                .build();
-    }
-
-    @GET
-    @Path("/entity/{entity}/" + IDENTIFIERS_MULTI)
-    @Produces(MEDIATYPE_JSON_JAVASCRIPT)
-    public Response getSingle(@Context HttpServletRequest request,
-                              @PathParam("entity") String entityName,
-                              @Context final UriInfo uri) {
-        final TableName tableName = parseTableName(request, entityName);
-        checkTableAccessible(securityService, request, tableName);
-        return RestResponseBuilder
-                .forRequest(request)
-                .body(new RestResponseBuilder.BodyGenerator() {
-                    @Override
-                    public void write(PrintWriter writer) throws Exception {
-                        modelBuilder.getKeys(writer, tableName, getPKString(uri));
-                    }
-                })
-                .build();
-    }
-
-    @POST
-    @Path("/entity/{entity}")
-    @Produces(MEDIATYPE_JSON_JAVASCRIPT)
-    public Response post(@Context HttpServletRequest request,
-                         @PathParam("entity") String entityName,
-                         final String entityData) {
-        final TableName tableName = parseTableName(request, entityName);
-        checkTableAccessible(securityService, request, tableName);
-        return RestResponseBuilder
-                .forRequest(request)
-                .body(new RestResponseBuilder.BodyGenerator() {
-                    @Override
-                    public void write(PrintWriter writer) throws Exception {
-                        modelBuilder.insert(writer, tableName, entityData);
-                    }
-                })
-                .build();
-    }
-
-    @PUT
-    @Path("/entity/{entity}/" + IDENTIFIERS_MULTI)
-    @Produces(MEDIATYPE_JSON_JAVASCRIPT)
-    public Response put(@Context HttpServletRequest request,
-                        @PathParam("entity") String entityName,
-                        @Context final UriInfo uri,
-                        final String entityData) {
-        final TableName tableName = parseTableName(request, entityName);
-        checkTableAccessible(securityService, request, tableName);
-        return RestResponseBuilder
-                .forRequest(request)
-                .body(new RestResponseBuilder.BodyGenerator() {
-                    @Override
-                    public void write(PrintWriter writer) throws Exception {
-                        modelBuilder.update(writer, tableName, getPKString(uri), entityData);
-                    }
-                })
-                .build();
-    }
-
-    @DELETE
-    @Path("/entity/{entity}/" + IDENTIFIERS_MULTI)
-    public Response delete(@Context HttpServletRequest request,
-                           @PathParam("entity") String entityName,
-                           @Context final UriInfo uri) {
-        final TableName tableName = parseTableName(request, entityName);
-        checkTableAccessible(securityService, request, tableName);
-        try {
-            modelBuilder.create(tableName);
-            restDMLService.delete(tableName, getPKString(uri));
-            return RestResponseBuilder
-                    .forRequest(request)
-                    .status(Response.Status.NO_CONTENT)
-                    .build();
-        } catch (Exception e) {
-            throw RestResponseBuilder.forRequest(request).wrapException(e);
-        }
-    }
-
-    @GET
-    @Path("/is_builder/{entity}")
-    @Produces(MEDIATYPE_JSON_JAVASCRIPT)
-    public Response isBuilder(@Context HttpServletRequest request,
-                              @PathParam("entity") final String entityName) {
-        final TableName tableName = parseTableName(request, entityName);
-        checkTableAccessible(securityService, request, tableName);
-        return RestResponseBuilder
-                .forRequest(request)
-                .body(new RestResponseBuilder.BodyGenerator() {
-                    @Override
-                    public void write(PrintWriter writer) throws Exception {
-                        boolean isBuilder = modelBuilder.isBuilderTable(tableName);
-                        ObjectNode node = JsonUtils.mapper.createObjectNode();
-                        node.put("entity", entityName);
-                        node.put("is_builder", isBuilder);
-                        writer.append(node.toString());
-                    }
-                })
-                .build();
-    }
-
-    @POST
-    @Path("/explode/{entity}")
-    @Produces(MEDIATYPE_JSON_JAVASCRIPT)
-    public Response explode(@Context HttpServletRequest request,
-                            @PathParam("entity") String entityName) {
-        final TableName tableName = parseTableName(request, entityName);
-        checkTableAccessible(securityService, request, tableName);
-        return RestResponseBuilder
-                .forRequest(request)
-                .body(new RestResponseBuilder.BodyGenerator() {
-                    @Override
-                    public void write(PrintWriter writer) throws Exception {
-                        modelBuilder.explode(writer, tableName);
-                    }
-                })
-                .build();
-    }
-
-    @POST
-    @Path("/implode/{entity}")
-    @Produces(MEDIATYPE_JSON_JAVASCRIPT)
-    public Response implode(@Context HttpServletRequest request,
-                            @PathParam("entity") String entityName) {
-        final TableName tableName = parseTableName(request, entityName);
-        checkTableAccessible(securityService, request, tableName);
-        return RestResponseBuilder
-                .forRequest(request)
-                .body(new RestResponseBuilder.BodyGenerator() {
-                    @Override
-                    public void write(PrintWriter writer) throws Exception {
-                        modelBuilder.implode(writer, tableName);
-                    }
-                })
-                .build();
-    }
-}

=== modified file 'src/main/java/com/akiban/rest/resources/EntityResource.java'
--- src/main/java/com/akiban/rest/resources/EntityResource.java	2013-04-23 14:20:47 +0000
+++ src/main/java/com/akiban/rest/resources/EntityResource.java	2013-07-29 15:32:48 +0000
@@ -95,45 +95,6 @@
     }
 
     @POST
-    @Path("/jonquil/to-sql")
-    @Consumes(MEDIATYPE_JSON_JAVASCRIPT)
-    public Response jonquilToSQL(@Context final HttpServletRequest request,
-                                 @PathParam("entity") String entity,
-                                 final String query) {
-        final TableName tableName = parseTableName(request, entity);
-        checkTableAccessible(reqs.securityService, request, tableName);
-        return RestResponseBuilder
-                .forRequest(request)
-                .body(new RestResponseBuilder.BodyGenerator() {
-                    @Override
-                    public void write(PrintWriter writer) throws Exception {
-                        writer.write(reqs.restDMLService.jonquilToSQL(tableName, query));
-                    }
-                })
-                .build();
-    }
-
-    @POST
-    @Path("/jonquil/query")
-    @Produces(MEDIATYPE_JSON_JAVASCRIPT)
-    public Response jonquilQuery(@Context final HttpServletRequest request,
-                                 @PathParam("entity") String entity,
-                                 final String query) {
-        final TableName tableName = parseTableName(request, entity);
-        checkTableAccessible(reqs.securityService, request, tableName);
-        return RestResponseBuilder
-                .forRequest(request)
-                .body(new RestResponseBuilder.BodyGenerator() {
-                    @Override
-                    public void write(PrintWriter writer) throws Exception {
-                        String sql = reqs.restDMLService.jonquilToSQL(tableName, query);
-                        reqs.restDMLService.runSQL(writer, request, sql, tableName.getSchemaName());
-                    }
-                })
-                .build();
-    }
-
-    @POST
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MEDIATYPE_JSON_JAVASCRIPT)
     public Response createEntity(@Context HttpServletRequest request,

=== modified file 'src/main/java/com/akiban/server/error/ErrorCode.java'
--- src/main/java/com/akiban/server/error/ErrorCode.java	2013-07-19 19:40:21 +0000
+++ src/main/java/com/akiban/server/error/ErrorCode.java	2013-07-29 15:32:48 +0000
@@ -374,7 +374,7 @@
     ALTER_MADE_NO_CHANGE    ("50", "023", Importance.DEBUG, AlterMadeNoChangeException.class),
     INVALID_ROUTINE         ("50", "024", Importance.DEBUG, InvalidRoutineException.class),
     INVALID_INDEX_ID        ("50", "025", Importance.DEBUG, InvalidIndexIDException.class),
-    MODEL_BUILDER_ERROR     ("50", "026", Importance.DEBUG, ModelBuilderException.class),
+    // 50026 available
     COLUMN_NOT_GENERATED    ("50", "027", Importance.DEBUG, ColumnNotGeneratedException.class),
     COLUMN_ALREADY_GENERATED ("50", "028", Importance.DEBUG, ColumnAlreadyGeneratedException.class),
     DROP_SEQUENCE_NOT_ALLOWED ("50", "029", Importance.DEBUG, DropSequenceNotAllowedException.class),

=== removed file 'src/main/java/com/akiban/server/error/ModelBuilderException.java'
--- src/main/java/com/akiban/server/error/ModelBuilderException.java	2013-03-25 22:53:24 +0000
+++ src/main/java/com/akiban/server/error/ModelBuilderException.java	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-/**
- * Copyright (C) 2009-2013 Akiban Technologies, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.akiban.server.error;
-
-import com.akiban.ais.model.TableName;
-
-public class ModelBuilderException extends InvalidOperationException {
-    public ModelBuilderException(TableName tableName, String message) {
-        super(ErrorCode.MODEL_BUILDER_ERROR,
-              tableName.getSchemaName(),
-              tableName.getTableName(),
-              message
-        );
-    }
-}

=== removed file 'src/main/java/com/akiban/server/service/restdml/ModelBuilder.java'
--- src/main/java/com/akiban/server/service/restdml/ModelBuilder.java	2013-07-23 21:24:34 +0000
+++ src/main/java/com/akiban/server/service/restdml/ModelBuilder.java	1970-01-01 00:00:00 +0000
@@ -1,441 +0,0 @@
-/**
- * Copyright (C) 2009-2013 Akiban Technologies, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.akiban.server.service.restdml;
-
-import com.akiban.ais.model.AkibanInformationSchema;
-import com.akiban.ais.model.Join;
-import com.akiban.ais.model.TableName;
-import com.akiban.ais.model.UserTable;
-import com.akiban.ais.model.aisb2.AISBBasedBuilder;
-import com.akiban.ais.model.aisb2.NewAISBuilder;
-import com.akiban.qp.expression.IndexKeyRange;
-import com.akiban.qp.operator.API;
-import com.akiban.qp.operator.Cursor;
-import com.akiban.qp.operator.Operator;
-import com.akiban.qp.operator.QueryBindings;
-import com.akiban.qp.operator.QueryContext;
-import com.akiban.qp.operator.SimpleQueryContext;
-import com.akiban.qp.operator.StoreAdapter;
-import com.akiban.qp.row.Row;
-import com.akiban.qp.rowtype.IndexRowType;
-import com.akiban.qp.rowtype.Schema;
-import com.akiban.qp.util.SchemaCache;
-import com.akiban.server.api.DDLFunctions;
-import com.akiban.server.entity.changes.EntityParser;
-import com.akiban.server.error.ModelBuilderException;
-import com.akiban.server.service.dxl.DXLService;
-import com.akiban.server.service.externaldata.JsonRowWriter;
-import com.akiban.server.service.externaldata.TableRowTracker;
-import com.akiban.server.service.session.Session;
-import com.akiban.server.service.session.SessionService;
-import com.akiban.server.service.transaction.TransactionService;
-import com.akiban.server.store.Store;
-import com.akiban.server.types3.mcompat.mtypes.MString;
-import com.akiban.server.types3.pvalue.PValue;
-import com.akiban.sql.optimizer.rule.PlanGenerator;
-import com.akiban.util.AkibanAppender;
-import com.akiban.util.JsonUtils;
-import com.akiban.util.tap.InOutTap;
-import com.akiban.util.tap.Tap;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import static com.akiban.server.service.transaction.TransactionService.CloseableTransaction;
-
-public class ModelBuilder {
-    public static final String DATA_COL_NAME = "_data";
-    private static final InOutTap BUILDER_GET = Tap.createTimer("rest: builder GET");
-    private static final InOutTap BUILDER_GET_ALL = Tap.createTimer("rest: builder getall");
-    private static final InOutTap BUILDER_POST = Tap.createTimer("rest: builder POST");
-    private static final InOutTap BUILDER_PUT = Tap.createTimer("rest: builder PUT");
-    private static final InOutTap BUILDER_EXPLODE = Tap.createTimer("rest: builder explode");
-    private static final InOutTap BUILDER_IMPLODE = Tap.createTimer("rest: builder implode");
-
-
-    private final SessionService sessionService;
-    private final TransactionService txnService;
-    private final DDLFunctions ddlFunctions;
-    private final Store store;
-    private final RestDMLService restDMLService;
-
-    public ModelBuilder(SessionService sessionService,
-                        TransactionService txnService,
-                        DXLService dxlService,
-                        Store store,
-                        RestDMLService restDMLService) {
-        this.sessionService = sessionService;
-        this.txnService = txnService;
-        this.ddlFunctions = dxlService.ddlFunctions();
-        this.store = store;
-        this.restDMLService = restDMLService;
-    }
-
-    public void create(TableName tableName) {
-        try (Session session = sessionService.createSession();
-             CloseableTransaction txn = txnService.beginCloseableTransaction(session)) {
-            createInternal(session, tableName);
-            txn.commit();
-        }
-    }
-
-    public boolean isBuilderTable(TableName tableName) {
-        try (Session session = sessionService.createSession()) {
-            UserTable curTable = ddlFunctions.getUserTable(session, tableName);
-            return isBuilderTable(curTable);
-        }
-    }
-
-    public void getAll(PrintWriter writer, TableName tableName) throws IOException {
-        BUILDER_GET_ALL.in();
-        try (Session session = sessionService.createSession();
-             CloseableTransaction txn = txnService.beginCloseableTransaction(session)) {
-             createInternal(session, tableName);
-            Cursor cursor = groupScanCursor(session, tableName);
-            writer.append('[');
-            scanCursor(writer, cursor, true);
-            writer.append(']');
-        } finally {
-            BUILDER_GET_ALL.out();
-        }
-    }
-
-    public void getKeys(PrintWriter writer, TableName tableName, String identifiers) throws IOException {
-        BUILDER_GET.in();
-        try (Session session = sessionService.createSession();
-             CloseableTransaction txn = txnService.beginCloseableTransaction(session)) {
-            createInternal(session, tableName);
-            AkibanInformationSchema ais = ddlFunctions.getAIS(session);
-            UserTable table = ais.getUserTable(tableName);
-            List<List<String>> keys = PrimaryKeyParser.parsePrimaryKeys(identifiers, table.getPrimaryKey().getIndex());
-            Operator plan = PlanGenerator.generateBranchPlan(ais, table);
-            QueryContext context = queryContext(session, ais);
-            QueryBindings bindings = context.createBindings();
-            Cursor cursor = API.cursor(plan, context, bindings);
-            boolean first = true;
-            writer.append('[');
-            for(List<String> pk : keys) {
-                for(int i = 0; i < pk.size(); i++) {
-                    PValue pvalue = new PValue(MString.varchar());
-                    pvalue.putString(pk.get(i), null);
-                    bindings.setPValue(i, pvalue);
-                }
-                first = scanCursor(writer, cursor, first);
-            }
-            writer.append(']');
-            txn.commit();
-        } finally {
-            BUILDER_GET.out();
-        }
-    }
-
-    public void insert(PrintWriter writer, TableName tableName, String data) {
-        BUILDER_POST.in();
-        try (Session session = sessionService.createSession();
-             CloseableTransaction txn = txnService.beginCloseableTransaction(session)) {
-            createInternal(session, tableName);
-            ObjectNode node = JsonUtils.mapper.createObjectNode();
-            // Sequence will fill in ID
-            node.put(ModelBuilder.DATA_COL_NAME, data);
-            restDMLService.insertNoTxn(session, writer, tableName, node);
-            txn.commit();
-        } finally {
-            BUILDER_POST.out();
-        }
-    }
-
-    public void update(PrintWriter writer, TableName tableName, String id, String data) {
-        BUILDER_PUT.in();
-        try (Session session = sessionService.createSession();
-             CloseableTransaction txn = txnService.beginCloseableTransaction(session)) {
-            createInternal(session, tableName);
-            ObjectNode node = JsonUtils.mapper.createObjectNode();
-            node.put(EntityParser.PK_COL_NAME, id);
-            node.put(ModelBuilder.DATA_COL_NAME, data);
-            restDMLService.updateNoTxn(session, writer, tableName, id, node);
-            txn.commit();
-        } finally {
-            BUILDER_PUT.out();
-        }
-    }
-
-    public void explode(PrintWriter writer, TableName tableName) throws IOException {
-        BUILDER_EXPLODE.in();
-        try (Session session = sessionService.createSession()) {
-            // Find the last row
-            Row row = getLastRow(session, tableName);
-            if(row == null) {
-                throw new ModelBuilderException(tableName, "Entity has no rows");
-            }
-
-            // Parse that row
-            ObjectNode node = (ObjectNode)JsonUtils.readTree(row.pvalue(1).getString());
-            node.remove(EntityParser.PK_COL_NAME);
-
-            // Move builder out of the way and create exploded table(s)
-            EntityParser parser = new EntityParser(true);
-            UserTable explodedTable = parser.parse(tableName, node);
-            TableName tempName = new TableName(tableName.getSchemaName(), "__" + tableName.getTableName());
-            ddlFunctions.renameTable(session, tableName, tempName);
-            parser.create(ddlFunctions, session, explodedTable);
-
-            // Convert builder rows
-            int convertedRows = 0;
-            try(CloseableTransaction txn = txnService.beginCloseableTransaction(session)) {
-                Cursor cursor = groupScanCursor(session, tempName);
-                cursor.openTopLevel();
-                try {
-                    while((row = cursor.next()) != null) {
-                        node = (ObjectNode)JsonUtils.readTree(row.pvalue(1).getString());
-                        node.put(EntityParser.PK_COL_NAME, row.pvalue(0).getInt64());
-                        removeUnknownFields(explodedTable, node);
-                        restDMLService.insertNoTxn(session, null, tableName, node);
-                        ++convertedRows;
-                    }
-                    cursor.closeTopLevel();
-                } finally {
-                    cursor.destroy();
-                }
-                txn.commit();
-            }
-
-            // Remove builder table
-            ddlFunctions.dropTable(session, tempName);
-
-            ObjectNode summaryNode = JsonUtils.mapper.createObjectNode();
-            summaryNode.put("exploded", tableName.getTableName());
-            summaryNode.put("rows", convertedRows);
-            writer.append(summaryNode.toString());
-        } finally {
-            BUILDER_EXPLODE.out();
-        }
-    }
-
-    public void implode(PrintWriter writer, TableName tableName) {
-        BUILDER_IMPLODE.in();
-        try (Session session = sessionService.createSession()) {
-            UserTable curTable = ddlFunctions.getUserTable(session, tableName);
-            if(!curTable.isRoot()) {
-                throw new ModelBuilderException(tableName, "Cannot implode non-root table");
-            }
-            if(isBuilderTable(curTable)) {
-                throw new ModelBuilderException(tableName, "Table is already imploded");
-            }
-
-            // Rename current
-            TableName tempName = new TableName(tableName.getSchemaName(), "__" + tableName.getTableName());
-            ddlFunctions.renameTable(session, tableName, tempName);
-
-            // Create new
-            createInternal(session, tableName);
-
-            // Scan old into new
-            UserTable oldTable = ddlFunctions.getUserTable(session, tempName);
-            UserTable newTable = ddlFunctions.getUserTable(session, tableName);
-            ImplodeTracker tracker = new ImplodeTracker(newTable, oldTable, -1);
-            Cursor cursor = groupScanCursor(session, tempName);
-            try {
-                JsonRowWriter rowWriter = new JsonRowWriter(tracker);
-                rowWriter.writeRows(cursor, AkibanAppender.of(tracker.getStringBuilder()), "", new JsonRowWriter.WriteTableRow());
-            } finally {
-                cursor.destroy();
-            }
-
-            // drop old
-            ddlFunctions.dropGroup(session, tempName);
-
-            ObjectNode summaryNode = JsonUtils.mapper.createObjectNode();
-            summaryNode.put("imploded", tableName.getTableName());
-            summaryNode.put("rows", tracker.getRowCount());
-            writer.append(summaryNode.toString());
-        } finally {
-            BUILDER_IMPLODE.out();
-        }
-    }
-
-
-    private void createInternal(Session session, TableName tableName) {
-        AkibanInformationSchema curAIS = ddlFunctions.getAIS(session);
-        UserTable curTable = curAIS.getUserTable(tableName);
-        if(curTable == null) {
-            NewAISBuilder builder = AISBBasedBuilder.create();
-            builder.userTable(tableName)
-                    .autoIncLong(EntityParser.PK_COL_NAME, 1)
-                    .colString(DATA_COL_NAME, 65535, true)
-                    .pk(EntityParser.PK_COL_NAME);
-            ddlFunctions.createTable(session, builder.ais().getUserTable(tableName));
-        } else {
-            if(!isBuilderTable(curTable)) {
-                throw new ModelBuilderException(tableName, "Entity already exists as non-builder table");
-            }
-        }
-    }
-
-    private Row getLastRow(Session session, TableName tableName) {
-        UserTable table = ddlFunctions.getUserTable(session, tableName);
-        Schema schema = SchemaCache.globalSchema(table.getAIS());
-        IndexRowType indexRowType = schema.indexRowType(table.getPrimaryKey().getIndex());
-        Operator plan = API.groupLookup_Default(
-                API.indexScan_Default(
-                        indexRowType,
-                        true,
-                        IndexKeyRange.unbounded(indexRowType)
-                ),
-                table.getGroup(),
-                indexRowType,
-                Collections.singleton(schema.userTableRowType(table)),
-                API.InputPreservationOption.DISCARD_INPUT,
-                1
-        );
-        StoreAdapter adapter = store.createAdapter(session, schema);
-        QueryContext queryContext = new SimpleQueryContext(adapter);
-        QueryBindings queryBindings = queryContext.createBindings();
-        Cursor cursor = API.cursor(plan, queryContext, queryBindings);
-        cursor.openTopLevel();
-        try {
-            return cursor.next();
-        } finally {
-            cursor.destroy();
-        }
-    }
-
-    private QueryContext queryContext(Session session, AkibanInformationSchema ais) {
-        StoreAdapter adapter = store.createAdapter(session, SchemaCache.globalSchema(ais));
-        return new SimpleQueryContext(adapter);
-    }
-
-    private Cursor groupScanCursor(Session session, TableName tableName) {
-        UserTable table = ddlFunctions.getUserTable(session, tableName);
-        Operator plan = PlanGenerator.generateScanPlan(table.getAIS(), table);
-        QueryContext queryContext = queryContext(session, table.getAIS());
-        QueryBindings queryBindings = queryContext.createBindings();
-        return API.cursor(plan, queryContext, queryBindings);
-    }
-
-    private boolean scanCursor(PrintWriter writer, Cursor cursor, boolean first) throws IOException {
-        Row row;
-        cursor.openTopLevel();
-        try {
-            while((row = cursor.next()) != null) {
-                if(!first) {
-                    writer.append(",\n");
-                }
-                first = false;
-                long id = row.pvalue(0).getInt64();
-                String json = row.pvalue(1).getString();
-                ObjectNode node = (ObjectNode)JsonUtils.readTree(json);
-                node.put(EntityParser.PK_COL_NAME, id);
-                writer.write(node.toString());
-            }
-        } finally {
-            cursor.closeTopLevel();
-        }
-        return first;
-    }
-
-
-    private static UserTable findChildTable(UserTable parent, String childName) {
-        for(Join j : parent.getChildJoins()) {
-            UserTable child = j.getChild();
-            if(child.getName().getTableName().equals(childName)) {
-                return child;
-            }
-        }
-        return null;
-    }
-
-    private static void removeUnknownFields(UserTable table, JsonNode node) {
-        if(node.isArray()) {
-            Iterator<JsonNode> it = node.elements();
-            while(it.hasNext()) {
-                removeUnknownFields(table, it.next());
-            }
-        }
-        else {
-            Iterator<Map.Entry<String,JsonNode>> fieldIt = node.fields();
-            while(fieldIt.hasNext()) {
-                Map.Entry<String,JsonNode> pair = fieldIt.next();
-                String itName = pair.getKey();
-                JsonNode itNode = pair.getValue();
-                if(itNode.isContainerNode()) {
-                    UserTable child = findChildTable(table, itName);
-                    if(child != null) {
-                        removeUnknownFields(child, itNode);
-                    } else {
-                        fieldIt.remove();
-                    }
-                } else {
-                    if(table.getColumn(itName) == null) {
-                        fieldIt.remove();
-                    }
-                }
-            }
-        }
-    }
-
-    private static boolean isBuilderTable(UserTable table) {
-        return (table.getColumns().size() == 2) &&
-                EntityParser.PK_COL_NAME.equals(table.getColumn(0).getName()) &&
-                DATA_COL_NAME.equals(table.getColumn(1).getName());
-    }
-
-    private class ImplodeTracker extends TableRowTracker {
-        private final StringBuilder builder;
-        private final UserTable outTable;
-        private int rowCount = 0;
-        private int curDepth = 0;
-
-        public ImplodeTracker(UserTable outTable, UserTable inTable, int addlDepth) {
-            super(inTable, addlDepth);
-            assert inTable.isRoot() : "Expected root: "  + inTable;
-            this.builder = new StringBuilder();
-            this.outTable = outTable;
-        }
-
-        public StringBuilder getStringBuilder() {
-            return builder;
-        }
-
-        public int getRowCount() {
-            return rowCount;
-        }
-
-        @Override
-        public void pushRowType() {
-            super.pushRowType();
-            ++curDepth;
-        }
-
-        @Override
-        public void popRowType() {
-            super.popRowType();
-            if(--curDepth == 0) {
-                String json = (builder.charAt(0) == ',') ? builder.substring(1) : builder.toString();
-                ModelBuilder.this.insert(null, outTable.getName(), json);
-                builder.setLength(0);
-                ++rowCount;
-            }
-        }
-    }
-}

=== modified file 'src/main/java/com/akiban/server/service/restdml/RestDMLService.java'
--- src/main/java/com/akiban/server/service/restdml/RestDMLService.java	2013-04-17 17:29:33 +0000
+++ src/main/java/com/akiban/server/service/restdml/RestDMLService.java	2013-07-29 15:32:48 +0000
@@ -50,6 +50,4 @@
                               TableName procName, Map<String,List<String>> queryParams, String content) throws SQLException;
 
     public void fullTextSearch(PrintWriter writer, IndexName indexName, Integer depth, String query, Integer limit);
-
-    public String jonquilToSQL(TableName tableName, String jonquil) throws IOException;
 }

=== modified file 'src/main/java/com/akiban/server/service/restdml/RestDMLServiceImpl.java'
--- src/main/java/com/akiban/server/service/restdml/RestDMLServiceImpl.java	2013-07-10 21:42:55 +0000
+++ src/main/java/com/akiban/server/service/restdml/RestDMLServiceImpl.java	2013-07-29 15:32:48 +0000
@@ -18,27 +18,17 @@
 package com.akiban.server.service.restdml;
 
 import com.akiban.ais.model.AkibanInformationSchema;
-import com.akiban.ais.model.Column;
 import com.akiban.ais.model.Index;
 import com.akiban.ais.model.IndexName;
-import com.akiban.ais.model.Join;
-import com.akiban.ais.model.JoinColumn;
 import com.akiban.ais.model.Routine;
 import com.akiban.ais.model.TableName;
 import com.akiban.ais.model.UserTable;
-import com.akiban.jonquil.Jonquil;
-import com.akiban.jonquil.JonquilException;
-import com.akiban.jonquil.JonquilWriter;
-import com.akiban.jonquil.JoinFields;
-import com.akiban.jonquil.JoinStrategy;
-import com.akiban.jonquil.actions.Action;
 import com.akiban.server.Quote;
 import com.akiban.server.error.AkibanInternalException;
 import com.akiban.server.error.InvalidArgumentTypeException;
 import com.akiban.server.error.WrongExpressionArityException;
 import com.akiban.server.explain.format.JsonFormatter;
 import com.akiban.server.service.Service;
-import com.akiban.server.service.config.ConfigurationService;
 import com.akiban.server.service.dxl.DXLService;
 import com.akiban.server.service.externaldata.ExternalDataService;
 import com.akiban.server.service.externaldata.JsonRowWriter;
@@ -59,14 +49,7 @@
 import com.akiban.util.tap.Tap;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.google.common.base.Function;
-import com.google.common.base.Functions;
-import com.google.common.collect.Lists;
 import com.google.inject.Inject;
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonToken;
-import org.codehaus.jackson.map.ObjectMapper;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -78,13 +61,10 @@
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.NoSuchElementException;
 import java.util.Properties;
 
 import static com.akiban.server.service.transaction.TransactionService.CloseableTransaction;
@@ -426,74 +406,6 @@
         appender.append('}');
     }
 
-    @Override
-    public String jonquilToSQL(TableName tableName, String jonquil) throws IOException {
-        final AkibanInformationSchema ais;
-        try (Session session = sessionService.createSession();
-             CloseableTransaction txn = transactionService.beginCloseableTransaction(session)) {
-            ais = dxlService.ddlFunctions().getAIS(session);
-            txn.commit();
-        }
-        JsonParser json = oldJsonFactory.createJsonParser(jonquil);
-        final String schema = tableName.getSchemaName();
-        // the JoinStrategy will assume all tables are in the same schema
-        JoinStrategy joinStrategy = new JoinStrategy() {
-            @Override
-            public Collection<? extends JoinFields> getJoins(String parent, String child) {
-                UserTable parentTable = ais.getUserTable(schema, parent);
-                if (parentTable == null)
-                    throw new NoSuchElementException("parent table: " + parent);
-                Join groupingJoin = findGroupingJoin(parentTable, child);
-                return Lists.transform(groupingJoin.getJoinColumns(), new Function<JoinColumn, JoinFields>() {
-                    @Override
-                    public JoinFields apply(JoinColumn input) {
-                        return new JoinFields(input.getParent().getName(), input.getChild().getName());
-                    }
-                });
-            }
-
-            private Join findGroupingJoin(UserTable parentTable, String childTable) {
-                for (Join join : parentTable.getChildJoins()) {
-                    if (join.getChild().getName().getTableName().equals(childTable))
-                        return join;
-                }
-                throw new NoSuchElementException("no child named " + childTable + " for table " + parentTable);
-            }
-        };
-        Map<String, Action> additionalActionsMap = new HashMap<>();
-        additionalActionsMap.put("fields", new Action() {
-            @Override
-            public void apply(JsonParser input, JonquilWriter output, String tableName) throws IOException {
-                JsonToken token = input.nextToken();
-                if (token == JsonToken.VALUE_STRING) {
-                    String value = input.getText();
-                    if (value.equalsIgnoreCase("all")) {
-                        UserTable table = ais.getUserTable(schema, tableName);
-                        for (Column column : table.getColumns())
-                            output.addScalar(column.getName());
-                    }
-                    else {
-                        throw new JonquilException("illegal string value for @fields (must be \"all\"): " + value);
-                    }
-                }
-                else if (token == JsonToken.START_ARRAY) {
-                    while (input.nextToken() != JsonToken.END_ARRAY) {
-                        if (input.getCurrentToken() != JsonToken.VALUE_STRING) {
-                            throw new JonquilException("illegal value for @attributes list: "
-                                    + input.getText() + " (" + token + ')');
-                        }
-                        output.addScalar(input.getText());
-                    }
-                }
-                else {
-                    throw new JonquilException("illegal value for @fields: " + input.getText() + " (" + token + ')');
-                }
-            }
-        });
-        Function<String, Action> additionalActions = Functions.forMap(additionalActionsMap, null);
-        return Jonquil.createSQL(tableName.getTableName(), json, joinStrategy, additionalActions);
-    }
-
     public interface ProcessStatement {
         public Statement processStatement (int index) throws SQLException; 
     }
@@ -693,6 +605,4 @@
             ENTITY_TEXT.out();
         }
     }
-    
-     private static final JsonFactory oldJsonFactory = new JsonFactory(new ObjectMapper()); // for Jonquil
 }

=== modified file 'src/main/resources/com/akiban/server/error/error_code.properties'
--- src/main/resources/com/akiban/server/error/error_code.properties	2013-07-19 19:40:21 +0000
+++ src/main/resources/com/akiban/server/error/error_code.properties	2013-07-29 15:32:48 +0000
@@ -251,7 +251,6 @@
 ALTER_MADE_NO_CHANGE    = ALTER TABLE on `{0}.`{1}` made no change to the definition
 INVALID_ROUTINE         = Invalid procedure `{0}.`{1}`: {2}
 INVALID_INDEX_ID        = Index `{0}.`{1}`.`{2}` has an invalid ID: {3}
-MODEL_BUILDER_ERROR     = Error building model for `{0}`.`{1}`: {2}
 COLUMN_NOT_GENERATED     = Column `{0}`.`{1}`.`{2}` is not generated
 COLUMN_ALREADY_GENERATED = Column `{0}`.`{1}`.`{2}` already generated by sequence `{3}`.`{4}`
 DROP_SEQUENCE_NOT_ALLOWED = Sequence `{0}` is in use by table `{1}`.`{2}` and can not be dropped

=== modified file 'src/test/java/com/akiban/server/entity/changes/EntityParserIT.java'
--- src/test/java/com/akiban/server/entity/changes/EntityParserIT.java	2013-04-09 22:15:20 +0000
+++ src/test/java/com/akiban/server/entity/changes/EntityParserIT.java	2013-07-29 15:32:48 +0000
@@ -24,8 +24,8 @@
 
 import java.io.IOException;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
-import org.codehaus.jackson.JsonProcessingException;
 import org.junit.Before;
 import org.junit.Test;
 

=== removed file 'src/test/java/com/akiban/server/service/restdml/ModelBuilderIT.java'
--- src/test/java/com/akiban/server/service/restdml/ModelBuilderIT.java	2013-06-11 16:30:17 +0000
+++ src/test/java/com/akiban/server/service/restdml/ModelBuilderIT.java	1970-01-01 00:00:00 +0000
@@ -1,333 +0,0 @@
-/**
- * Copyright (C) 2009-2013 Akiban Technologies, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.akiban.server.service.restdml;
-
-import com.akiban.ais.model.TableName;
-import com.akiban.ais.model.UserTable;
-import com.akiban.server.entity.changes.EntityParser;
-import com.akiban.server.error.ModelBuilderException;
-import com.akiban.server.error.NoSuchTableException;
-import com.akiban.server.service.servicemanager.GuicedServiceManager;
-import com.akiban.server.test.it.ITBase;
-import com.akiban.util.JsonUtils;
-import com.fasterxml.jackson.databind.JsonNode;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-public class ModelBuilderIT extends ITBase {
-    private static final String SCHEMA = "test";
-    private static final String TABLE = "t";
-    private static final TableName TABLE_NAME = new TableName(SCHEMA, TABLE);
-    private static final String SIMPLE_JSON_1 = "{ \"name\": \"foo\" }";
-    private static final String SIMPLE_JSON_2 = "{ \"year\": \"2013\" }";
-
-    private static final PrintWriter NULL_WRITER = new PrintWriter(new Writer() {
-        @Override
-        public void write(char[] cbuf, int off, int len) {
-        }
-
-        @Override
-        public void flush() throws IOException {
-        }
-
-        @Override
-        public void close() throws IOException {
-        }
-    });
-
-
-    private ModelBuilder builder;
-
-    @Override
-    protected GuicedServiceManager.BindingsConfigurationProvider serviceBindingsProvider() {
-        return super.serviceBindingsProvider()
-                .bindAndRequire(RestDMLService.class, RestDMLServiceImpl.class);
-    }
-
-    @Override
-    protected Map<String, String> startupConfigProperties() {
-        return uniqueStartupConfigProperties(ModelBuilderIT.class);
-    }
-
-    @Before
-    public void createBuilder() {
-        RestDMLService restDMLService = serviceManager().getServiceByClass(RestDMLService.class);
-        builder = new ModelBuilder(
-            serviceManager().getSessionService(),
-            txnService(),
-            dxl(),
-            store(),
-            restDMLService
-        );
-    }
-
-
-    @Test
-    public void create() {
-        builder.create(TABLE_NAME);
-        assertNotNull("Created table", getUserTable(TABLE_NAME));
-    }
-
-    @Test
-    public void createAndCheckIsBuilderTable() {
-        builder.create(TABLE_NAME);
-        assertTrue("Is builder table", builder.isBuilderTable(TABLE_NAME));
-    }
-
-    @Test
-    public void isNotBuilderTable() {
-        createTable(SCHEMA, TABLE, "foo int");
-        assertFalse("Is builder table", builder.isBuilderTable(TABLE_NAME));
-    }
-
-    @Test
-    public void createMulti() {
-        builder.create(TABLE_NAME);
-        builder.create(TABLE_NAME);
-        assertTrue("Is builder table", builder.isBuilderTable(TABLE_NAME));
-    }
-
-    @Test
-    public void insertCreates() {
-        builder.insert(NULL_WRITER, TABLE_NAME, SIMPLE_JSON_1);
-        assertNotNull("Table exists after insert", getUserTable(TABLE_NAME));
-    }
-
-    @Test
-    public void insertAndCheckRow() {
-        builder.insert(NULL_WRITER, TABLE_NAME, SIMPLE_JSON_1);
-        updateAISGeneration();
-        int id = tableId(TABLE_NAME);
-        expectFullRows(id, createNewRow(id, 1L, SIMPLE_JSON_1));
-    }
-
-    @Test
-    public void updateNoMatchCreates() {
-        builder.update(NULL_WRITER, TABLE_NAME, "1", SIMPLE_JSON_1);
-        assertNotNull("Table exists after insert", getUserTable(TABLE_NAME));
-    }
-
-    @Test
-    public void insertUpdateCheckRow() {
-        builder.insert(NULL_WRITER, TABLE_NAME, SIMPLE_JSON_1);
-        builder.update(NULL_WRITER, TABLE_NAME, "1", SIMPLE_JSON_2);
-        updateAISGeneration();
-        int id = tableId(TABLE_NAME);
-        expectFullRows(id, createNewRow(id, 1L, SIMPLE_JSON_2));
-    }
-
-    @Test
-    public void explodeSingleRow() throws IOException {
-        builder.insert(NULL_WRITER, TABLE_NAME, SIMPLE_JSON_1);
-        builder.explode(NULL_WRITER, TABLE_NAME);
-        updateAISGeneration();
-        expectTables(TABLE);
-        UserTable table = getUserTable(TABLE_NAME);
-        assertEquals("Column count", 2, table.getColumns().size());
-        assertEquals("Column 0", EntityParser.PK_COL_NAME, table.getColumn(0).getName());
-        assertEquals("Column 1", "name", table.getColumn(1).getName());
-        expectFullRows(table.getTableId(), createNewRow(table.getTableId(), 1L, "foo"));
-    }
-
-    @Test
-    public void explodeMultiRowDifferentShapes() throws IOException {
-        builder.insert(NULL_WRITER, TABLE_NAME, SIMPLE_JSON_1);
-        builder.insert(NULL_WRITER, TABLE_NAME, SIMPLE_JSON_2);
-        builder.explode(NULL_WRITER, TABLE_NAME);
-        updateAISGeneration();
-        expectTables(TABLE);
-        UserTable table = getUserTable(TABLE_NAME);
-        assertEquals("Column count", 2, table.getColumns().size());
-        assertEquals("Column 0", EntityParser.PK_COL_NAME, table.getColumn(0).getName());
-        assertEquals("Column 1", "year", table.getColumn(1).getName());
-        expectFullRows(
-                table.getTableId(),
-                createNewRow(table.getTableId(), 1L, null),
-                createNewRow(table.getTableId(), 2L, "2013")
-        );
-    }
-
-    @Test
-    public void explodeMultiLevelDifferentShapes() throws IOException {
-        builder.insert(NULL_WRITER, TABLE_NAME, "{\"a\": 5}");
-        builder.insert(NULL_WRITER, TABLE_NAME, "{\"a\": \"five\", \"b\": 10}");
-        builder.insert(NULL_WRITER, TABLE_NAME, "{\"a\": \"six\", \"bs\": [{ \"x\" : 10}]}");
-        builder.insert(NULL_WRITER, TABLE_NAME, "{\"a\": \"seven\", \"bs\": [{ \"y\" : 20}]}");
-        builder.explode(NULL_WRITER, TABLE_NAME);
-        updateAISGeneration();
-        expectTables("bs", TABLE);
-        int tid = tableId(TABLE_NAME);
-        expectFullRows(
-            tid,
-            createNewRow(tid, 1L, "5"),
-            createNewRow(tid, 2L, "five"),
-            createNewRow(tid, 3L, "six"),
-            createNewRow(tid, 4L, "seven")
-        );
-        int bsid = tableId(SCHEMA, "bs");
-        expectFullRows(
-            bsid,
-            createNewRow(bsid, 1L, null, 3L),
-            createNewRow(bsid, 2L, 20L, 4L)
-        );
-    }
-
-    @Test
-    public void implodeEmptyTable() {
-        createTable(SCHEMA, TABLE, "foo int, bar int, zap int");
-        builder.implode(NULL_WRITER, TABLE_NAME);
-        expectTables(TABLE);
-        assertTrue("Is builder table", builder.isBuilderTable(TABLE_NAME));
-    }
-
-    @Test
-    public void implodeWithRows() {
-        int id = createTable(SCHEMA, TABLE, "name varchar(32)");
-        writeRow(id, "foo");
-        writeRow(id, new Object[]{null});
-        writeRow(id, "bar");
-        builder.implode(NULL_WRITER, TABLE_NAME);
-        updateAISGeneration();
-        assertTrue("Is builder table", builder.isBuilderTable(TABLE_NAME));
-        id = tableId(TABLE_NAME);
-        expectFullRows(
-                id,
-                createNewRow(id, 1L, "{\"name\":\"foo\"}"),
-                createNewRow(id, 2L, "{\"name\":null}"),
-                createNewRow(id, 3L, "{\"name\":\"bar\"}")
-        );
-    }
-
-    @Test
-    public void insertExplodeImplode() throws IOException {
-        builder.insert(NULL_WRITER, TABLE_NAME, SIMPLE_JSON_1);
-        int tid = tableId(TABLE_NAME);
-        updateAISGeneration();
-        expectFullRows(tid, createNewRow(tid, 1L, SIMPLE_JSON_1));
-
-        builder.explode(NULL_WRITER, TABLE_NAME);
-        tid = tableId(TABLE_NAME);
-        updateAISGeneration();
-        expectFullRows(tid, createNewRow(tid, 1L, "foo"));
-
-        builder.implode(NULL_WRITER, TABLE_NAME);
-        tid = tableId(TABLE_NAME);
-        updateAISGeneration();
-        // Same contents, but ID is present and server didn't output spaces
-        String expected = ("{\"_id\": 1," + SIMPLE_JSON_1.substring(1)).replaceAll(" ", "");
-        expectFullRows(tid, createNewRow(tid, 1L, expected));
-    }
-
-    @Test
-    public void getAll() throws IOException {
-        builder.insert(NULL_WRITER, TABLE_NAME, SIMPLE_JSON_1);
-        builder.insert(NULL_WRITER, TABLE_NAME, SIMPLE_JSON_1);
-
-        StringWriter writer = new StringWriter();
-        PrintWriter pw = new PrintWriter(writer);
-        builder.getAll(pw, TABLE_NAME);
-
-        String output = writer.toString();
-        JsonNode node = JsonUtils.readTree(output);
-        assertTrue("Array node type", node.isArray());
-        assertEquals("Array size", 2, node.size());
-        for(int i = 0; i < node.size(); ++i) {
-            JsonNode subNode = node.get(i);
-            assertEquals("field count", 2, subNode.size());
-            assertEquals("id value", i+1, subNode.get(EntityParser.PK_COL_NAME).asInt());
-            assertEquals("name value", "foo", subNode.get("name").asText());
-        }
-    }
-
-    @Test
-    public void getKeys() throws IOException {
-        builder.insert(NULL_WRITER, TABLE_NAME, SIMPLE_JSON_1);
-        builder.insert(NULL_WRITER, TABLE_NAME, SIMPLE_JSON_1);
-
-        StringWriter writer = new StringWriter();
-        PrintWriter pw = new PrintWriter(writer);
-        builder.getKeys(pw, TABLE_NAME, "2");
-
-        String output = writer.toString();
-        JsonNode node = JsonUtils.readTree(output);
-        assertTrue("Array node type", node.isArray());
-        assertEquals("Array size", 1, node.size());
-        JsonNode subNode = node.get(0);
-        assertEquals("field count", 2, subNode.size());
-        assertEquals("id value", 2, subNode.get(EntityParser.PK_COL_NAME).asInt());
-        assertEquals("name value", "foo", subNode.get("name").asText());
-    }
-
-    @Test(expected=ModelBuilderException.class)
-    public void implodeBuilderTable() {
-        builder.create(TABLE_NAME);
-        builder.implode(NULL_WRITER, TABLE_NAME);
-    }
-
-    @Test(expected=NoSuchTableException.class)
-    public void implodeNoSuchTable() {
-        builder.implode(NULL_WRITER, TABLE_NAME);
-    }
-
-    @Test(expected=ModelBuilderException.class)
-    public void explodeEmpty() throws IOException {
-        builder.create(TABLE_NAME);
-        builder.explode(NULL_WRITER, TABLE_NAME);
-    }
-
-    @Test(expected=NoSuchTableException.class)
-    public void explodeNoSuchTable() throws IOException {
-        builder.explode(NULL_WRITER, TABLE_NAME);
-    }
-
-    @Test(expected=NoSuchTableException.class)
-    public void checkNoSuchTable() {
-        builder.isBuilderTable(TABLE_NAME);
-    }
-
-    @Test(expected=ModelBuilderException.class)
-    public void createConflictsExisting() {
-        createTable(SCHEMA, TABLE, "foo int");
-        builder.create(TABLE_NAME);
-    }
-
-
-    private void expectTables(String... names) {
-        Set<String> nameSet = new TreeSet<>();
-        nameSet.addAll(Arrays.asList(names));
-        assertEquals(
-                "Tables in schema",
-                nameSet.toString(),
-                ais().getSchema(SCHEMA).getUserTables().keySet().toString()
-        );
-    }
-}

=== removed file 'src/test/resources/com/akiban/rest/caoi/builder-implode.body'
=== removed file 'src/test/resources/com/akiban/rest/caoi/builder-implode.check'
--- src/test/resources/com/akiban/rest/caoi/builder-implode.check	2013-03-26 20:32:58 +0000
+++ src/test/resources/com/akiban/rest/caoi/builder-implode.check	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-/builder/entity/test.customers
\ No newline at end of file

=== removed file 'src/test/resources/com/akiban/rest/caoi/builder-implode.check_expected'
--- src/test/resources/com/akiban/rest/caoi/builder-implode.check_expected	2013-04-15 21:43:37 +0000
+++ src/test/resources/com/akiban/rest/caoi/builder-implode.check_expected	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-[
-    {
-        "cid": 1,
-        "first_name": "John",
-        "last_name": "Smith",
-        "addresses": [
-            {
-                "aid": 101,
-                "cid": 1,
-                "state": "MA",
-                "city": "Boston"
-            }
-        ],
-        "orders": [
-            {
-                "oid": 101,
-                "cid": 1,
-                "odate": "2011-03-01 00:00:00",
-                "items": [
-                    {
-                        "iid": 1011,
-                        "oid": 101,
-                        "sku": 1234
-                    },
-                    {
-                        "iid": 1012,
-                        "oid": 101,
-                        "sku": 4567
-                    }
-                ]
-            },
-            {
-                "oid": 102,
-                "cid": 1,
-                "odate": "2011-03-02 00:00:00"
-            }
-        ],
-        "_id": 1
-    },
-    {
-        "cid": 2,
-        "first_name": "Willy",
-        "last_name": "Jones",
-        "addresses": [
-            {
-                "aid": 201,
-                "cid": 2,
-                "state": "NY",
-                "city": "New York"
-            }
-        ],
-        "orders": [
-            {
-                "oid": 201,
-                "cid": 2,
-                "odate": "2011-03-03 00:00:00",
-                "items": [
-                    {
-                        "iid": 2011,
-                        "oid": 201,
-                        "sku": 9876
-                    }
-                ]
-            }
-        ],
-        "_id": 2
-    }
-]
\ No newline at end of file

=== removed file 'src/test/resources/com/akiban/rest/caoi/builder-implode.expected'
--- src/test/resources/com/akiban/rest/caoi/builder-implode.expected	2013-03-26 20:32:58 +0000
+++ src/test/resources/com/akiban/rest/caoi/builder-implode.expected	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-{
-    "imploded": "customers",
-    "rows":2
-}
\ No newline at end of file

=== removed file 'src/test/resources/com/akiban/rest/caoi/builder-implode.post'
--- src/test/resources/com/akiban/rest/caoi/builder-implode.post	2013-03-26 20:32:58 +0000
+++ src/test/resources/com/akiban/rest/caoi/builder-implode.post	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-/builder/implode/test.customers
\ No newline at end of file

=== removed file 'src/test/resources/com/akiban/rest/caoi/builder-insert.body'
--- src/test/resources/com/akiban/rest/caoi/builder-insert.body	2013-03-26 20:32:58 +0000
+++ src/test/resources/com/akiban/rest/caoi/builder-insert.body	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-{
-    "name": "joe",
-    "age": 30
-}
\ No newline at end of file

=== removed file 'src/test/resources/com/akiban/rest/caoi/builder-insert.check'
--- src/test/resources/com/akiban/rest/caoi/builder-insert.check	2013-04-15 21:43:37 +0000
+++ src/test/resources/com/akiban/rest/caoi/builder-insert.check	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-/builder/entity/test.foo/1
\ No newline at end of file

=== removed file 'src/test/resources/com/akiban/rest/caoi/builder-insert.check_expected'
--- src/test/resources/com/akiban/rest/caoi/builder-insert.check_expected	2013-04-15 21:43:37 +0000
+++ src/test/resources/com/akiban/rest/caoi/builder-insert.check_expected	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-[
-    {
-        "_id": 1,
-        "name": "joe",
-        "age": 30
-    }
-]
\ No newline at end of file

=== removed file 'src/test/resources/com/akiban/rest/caoi/builder-insert.expected'
--- src/test/resources/com/akiban/rest/caoi/builder-insert.expected	2013-03-26 20:32:58 +0000
+++ src/test/resources/com/akiban/rest/caoi/builder-insert.expected	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-{
-    "_id": 1
-}
\ No newline at end of file

=== removed file 'src/test/resources/com/akiban/rest/caoi/builder-insert.post'
--- src/test/resources/com/akiban/rest/caoi/builder-insert.post	2013-03-26 20:32:58 +0000
+++ src/test/resources/com/akiban/rest/caoi/builder-insert.post	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-/builder/entity/test.foo
\ No newline at end of file

=== removed file 'src/test/resources/com/akiban/rest/caoi/c1-jonquil-query.body'
--- src/test/resources/com/akiban/rest/caoi/c1-jonquil-query.body	2013-04-05 15:56:11 +0000
+++ src/test/resources/com/akiban/rest/caoi/c1-jonquil-query.body	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-{
-    "first_name": [],
-    "orders": {
-        "@fields": "all",
-        "items": {
-            "@fields": "all"
-        }
-    }
-}

=== removed file 'src/test/resources/com/akiban/rest/caoi/c1-jonquil-query.expected'
--- src/test/resources/com/akiban/rest/caoi/c1-jonquil-query.expected	2013-04-05 15:56:11 +0000
+++ src/test/resources/com/akiban/rest/caoi/c1-jonquil-query.expected	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-[
-    {
-        "first_name": "John",
-        "orders": [
-            {
-                "items": [
-                    {
-                        "sku": 1234,
-                        "iid": 1011,
-                        "oid": 101
-                    },
-                    {
-                        "sku": 4567,
-                        "iid": 1012,
-                        "oid": 101
-                    }
-                ],
-                "oid": 101,
-                "odate": "2011-03-01 00:00:00",
-                "cid": 1
-            },
-            {
-                "oid": 102,
-                "odate": "2011-03-02 00:00:00",
-                "cid": 1
-            }
-        ]
-    },
-    {
-        "first_name": "Willy",
-        "orders": [
-            {
-                "items": [
-                    {
-                        "sku": 9876,
-                        "iid": 2011,
-                        "oid": 201
-                    }
-                ],
-                "oid": 201,
-                "odate": "2011-03-03 00:00:00",
-                "cid": 2
-            }
-        ]
-    }
-]

=== removed file 'src/test/resources/com/akiban/rest/caoi/c1-jonquil-query.post'
--- src/test/resources/com/akiban/rest/caoi/c1-jonquil-query.post	2013-04-05 15:56:11 +0000
+++ src/test/resources/com/akiban/rest/caoi/c1-jonquil-query.post	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-/entity/test.customers/jonquil/query

=== removed file 'src/test/resources/com/akiban/rest/caoi/c1-jonquil-tosql.body'
--- src/test/resources/com/akiban/rest/caoi/c1-jonquil-tosql.body	2013-04-05 15:56:11 +0000
+++ src/test/resources/com/akiban/rest/caoi/c1-jonquil-tosql.body	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-{
-    "first_name": [], 
-    "orders": {
-        "@fields": "all", 
-        "items": {
-            "sku": 123
-        }
-    }
-}

=== removed file 'src/test/resources/com/akiban/rest/caoi/c1-jonquil-tosql.expected'
--- src/test/resources/com/akiban/rest/caoi/c1-jonquil-tosql.expected	2013-04-05 15:56:11 +0000
+++ src/test/resources/com/akiban/rest/caoi/c1-jonquil-tosql.expected	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-SELECT "first_name", (SELECT "oid", "cid", "odate", (SELECT "sku" FROM "items" WHERE "sku"=123 AND "orders"."oid" = "items"."oid") "items" FROM "orders" WHERE "customers"."cid" = "orders"."cid") "orders" FROM "customers"
\ No newline at end of file

=== removed file 'src/test/resources/com/akiban/rest/caoi/c1-jonquil-tosql.post'
--- src/test/resources/com/akiban/rest/caoi/c1-jonquil-tosql.post	2013-04-05 15:56:11 +0000
+++ src/test/resources/com/akiban/rest/caoi/c1-jonquil-tosql.post	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-/entity/test.customers/jonquil/to-sql