Merge lp:~pbeaman/akiban-server/direct-updates-2 into lp:~akiban-technologies/akiban-server/trunk

[Peter Beaman]

Replaces lp:~pbeaman/akiban-server/direct-updates. This branch adds bug fixes from lp:~pbeaman/akiban-server/fix-direct-rest-bugs which is now a prerequisite. This branch also utilizes RestServiceScriptIT to test update functions through REST calls.

Description from original proposal:

Add new functionality so that Akiban Direct can insert and update entities. Note that this branch does not delete rows - another branch will add support for delete.

Add new test class com.akiban.direct.DirectUpdateIT. Much of the new functionality is exercised there.

Primary changes are in com.akiban.direct.AbstractDirectObject which now supplies methods to set and store updated fields, to invoke SQL INSERT and UPDATE statements, to hold metadata about the underlying table, etc. Corresponding changes in the classes written by com.akiban.direct.ClassBuilder utilize these new methods.

Also now supported: com.akiban.direct.DirectIterable#newInstance (allows creation of a new member of a collection, e.g., a new Customer), and com.akiban.direct.DirectObject#copy() (creates a close of a direct object which is detached from the original object's cursor).

Add two potentially controversial methods to JDBCResultSet: a protected copy-constructor and a protected method needed to stuff the private values field into a copied AbstractDataObject. I would like this methods to be invisible, but at least they don't need to be public. Suggestions for less bizarre plumbing would be welcome.

[Mike McMahon (mmcm)]

JDBCResultSet already has a getEntity method that knows some details of AbstractDirectObject. So, rather than having each know the other's insides, I think it would be cleaner to have a new method on JDBCResultSet that returns a clone as a AbstractDirectObject or an argument to getEntity that says to freeze the values or something there. copyInstance will still needs to copy pending updates into the result.

It isn't okay to just keep the same Row instance in something intended to be a static copy. That's likely to change when the Cursor is advanced. That Project does not share today is a performance bug in the operator. A ShareHolder is needed and perhaps conversion to ImmutableRow, since bindings from which calculations are done could change, too, if arbitrary projections are allowed.

[Mike McMahon (mmcm)]

It seems that all AbstractDirectObject really wants is a ServerJavaValues. So perhaps it would be simplest to give that out via JDBCResultSet.unwrap(). The other method, DirectResultSet.hasRow(), only serves to change an error message from "Past end" to "No more rows." This would eliminate a lot of forward knowledge of Direct.

It would then seem perfectly reasonable for ServerJavaValues (or a related interface) to have a method to "freeze" values for the purpose of copy. This could be unimplemented or a noop for most implementers and do what's needed for JDBCResultSet.

[Peter Beaman (pbeaman)]

Yes, AbstractDirectObject merely wants a way to produce column values from some kind of row-like object.

So I think the best option is to remove the copy() method from ADO - I think that gets rid of the ugly copy constructor, etc. The hypothetical use case was to allow a procedure to hold copies of different instances found within a loop - for example, to traverse all the members of Salary and to hold copies of Salary objects representing the minimum and maximum values. However, I have not yet written any code that requires this, and when that case becomes clearly necessary we can figure out how we want to clone a row.

The code as written is broken because the JDBCResultSet's copy constructor does not construct a copy of the actual Row, as you pointed out. To satisfy my hypothetical use case would require doing so somewhere. Freezing the Row would not allow the original object to be reused in the loop, which is part of the (unwritten and unreviewed) contract.

The new code I added to populate a ResultSet for an instance created through save() probably does not need to make a copy - to my knowledge there is no other reference to the JDBCResultSet acquired from executing the prepared INSERT statement with RETURNING clause, and therefore its single-row result should be stable. Please correct me if I'm wrong.

[Peter Beaman (pbeaman)]

The branch is updated to reflect these changes; the copy() method is gone.

Also changed a couple of throw statements in DirectServiceImpl to throw
newly added InvalidOperationException instances rather than
WebApplicationException. This makes handling in
RestResponseBuilder.wrapException cleaner and results in the correct status
being returned.

On Wed, Apr 24, 2013 at 10:40 AM, Peter Beaman <email address hidden> wrote:

> Yes, AbstractDirectObject merely wants a way to produce column values from
> some kind of row-like object.
>
> So I think the best option is to remove the copy() method from ADO - I
> think that gets rid of the ugly copy constructor, etc. The hypothetical
> use case was to allow a procedure to hold copies of different instances
> found within a loop - for example, to traverse all the members of Salary
> and to hold copies of Salary objects representing the minimum and maximum
> values. However, I have not yet written any code that requires this, and
> when that case becomes clearly necessary we can figure out how we want to
> clone a row.
>
> The code as written is broken because the JDBCResultSet's copy constructor
> does not construct a copy of the actual Row, as you pointed out. To
> satisfy my hypothetical use case would require doing so somewhere. Freezing
> the Row would not allow the original object to be reused in the loop, which
> is part of the (unwritten and unreviewed) contract.
>
> The new code I added to populate a ResultSet for an instance created
> through save() probably does not need to make a copy - to my knowledge
> there is no other reference to the JDBCResultSet acquired from executing
> the prepared INSERT statement with RETURNING clause, and therefore its
> single-row result should be stable. Please correct me if I'm wrong.
>
>
> --
>
> https://code.launchpad.net/~pbeaman/akiban-server/direct-updates-2/+merge/160248
> You are the owner of lp:~pbeaman/akiban-server/direct-updates-2.
>

[Peter Beaman (pbeaman)]

Done. Also replaced erroneous use of WebApplicationException in DirectServiceImpl. Simplifies and cleans up RestResponseBuilder.

[Mike McMahon (mmcm)]

The current plan is to have a new branch for the next phase of this work. So, since I don't see anything dangerous or disruptive outside of Direct in this, approving to keep the number of pending changes down.

review: Approve

[Akiban Build User (build-akiban)]

There were 2 failures during build/test:

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

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

review: Needs Fixing

[lp:~pbeaman/akiban-server/direct-updates-2]

2637. By Peter Beaman on 2013-04-26

Fix broken toString method

[Peter Beaman (pbeaman)]

Forgot to make a compensating change in EndpointMetadata.toString().

Have pushed that change and will re-Approve once the diff is done.

=== modified file 'src/main/java/com/akiban/direct/AbstractDirectObject.java'
--- src/main/java/com/akiban/direct/AbstractDirectObject.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/direct/AbstractDirectObject.java	2013-04-26 02:16:29 +0000
@@ -19,119 +19,570 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.sql.Connection;
 import java.sql.Date;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.sql.Time;
 import java.sql.Timestamp;
-
-import com.akiban.sql.server.ServerJavaValues;
-
-public class AbstractDirectObject implements DirectObject {
-
-    private ServerJavaValues values;
+import java.util.Arrays;
+import java.util.BitSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.WeakHashMap;
+
+public abstract class AbstractDirectObject implements DirectObject {
+
+    private final static Map<Connection, Map<BitSet, PreparedStatement>> updateStatementCache = new WeakHashMap<>();
+    private final static Map<Connection, Map<BitSet, PreparedStatement>> insertStatementCache = new WeakHashMap<>();
+
+    /*
+     * 1. schema_name 2. tableName 3. comma-separated list of column names, 4.
+     * comma-separated list of '?' symbols.
+     */
+    private final static String INSERT_STATEMENT = "insert into \"%s\".\"%s\" (%s) values (%s) returning *";
+
+    /*
+     * 1. schema name 2. table name 3. comma-separated list of column_name=?
+     * pairs 4. predicate: pkcolumn=?, ...
+     */
+    private final static String UPDATE_STATEMENT = "update \"%s\".\"%s\" set %s where %s";
+
+    private final static Object NOT_SET = new Object() {
+        @Override
+        public String toString() {
+            return "NOT_SET";
+        }
+    };
+
+    private static Column[] columns;
+    private static String schemaName;
+    private static String tableName;
+
+    protected static class Column implements DirectColumn {
+
+        final int columnIndex;
+        final String columnName;
+        final String propertyName;
+        final String propertyType;
+        final int primaryKeyFieldIndex;
+        final int parentJoinFieldIndex;
+
+        protected Column(final int columnIndex, final String columnName, final String propertyName,
+                final String propertyType, final int primaryKeyFieldIndex, final int parentJoinFieldIndex) {
+            this.columnIndex = columnIndex;
+            this.columnName = columnName;
+            this.propertyName = propertyName;
+            this.propertyType = propertyType;
+            this.primaryKeyFieldIndex = primaryKeyFieldIndex;
+            this.parentJoinFieldIndex = parentJoinFieldIndex;
+        }
+
+        public int getColumnIndex() {
+            return columnIndex;
+        }
+
+        public String getColumnName() {
+            return columnName;
+        }
+
+        public String getPropertyName() {
+            return propertyName;
+        }
+
+        public String getPropertyType() {
+            return propertyType;
+        }
+    }
+
+    /**
+     * Static initializer of subclass passes a string declaring the columns.
+     * Format is columnName:propertyName:propertyType:primaryKeyFieldIndex:
+     * parentjoinField,...
+     * 
+     * @param columnSpecs
+     */
+    protected static void __init(final String sName, final String tName, final String columnSpecs) {
+        try {
+            schemaName = sName;
+            tableName = tName;
+            String[] columnArray = columnSpecs.split(",");
+            columns = new Column[columnArray.length];
+            for (int index = 0; index < columnArray.length; index++) {
+                String[] v = columnArray[index].split(":");
+                columns[index] = new Column(index, v[0], v[1], v[2], Integer.parseInt(v[3]), Integer.parseInt(v[4]));
+            }
+        } catch (Exception e) {
+            throw new DirectException(e);
+        }
+    }
+
+    private Object[] updates;
     private DirectResultSet rs;
 
-    public void setResults(ServerJavaValues values, DirectResultSet rs) {
-        this.values = values;
+    public void setResults(DirectResultSet rs) {
+        if (updates != null) {
+            throw new IllegalStateException("Updates not saved: " + updates);
+        }
         this.rs = rs;
-    }
-    
-    public ServerJavaValues values() {
-        if (rs.hasRow()) {
-            return values;
-        }
-        throw new IllegalStateException("No more rows");
-    }
-
-    public void save() {
-        // TODO
+        updates = null;
+    }
+
+    private Object[] updates() {
+        if (updates == null) {
+            updates = new Object[columns.length];
+            Arrays.fill(updates, NOT_SET);
+        }
+        return updates;
+    }
+
+    /**
+     * Instantiates (update) values for parent join fields. This method is
+     * invoked from {@link DirectIterableImpl#newInstance()}.
+     * 
+     * @param parent
+     */
+    void populateJoinFields(DirectObject parent) {
+        if (parent instanceof AbstractDirectObject) {
+            AbstractDirectObject ado = (AbstractDirectObject) parent;
+            if (parent != null) {
+                for (int index = 0; index < columns.length; index++) {
+                    Column c = columns[index];
+                    if (c.parentJoinFieldIndex >= 0) {
+                        updates()[index] = ado.__getObject(c.parentJoinFieldIndex);
+                    }
+                }
+            }
+        }
     }
 
     protected boolean __getBOOL(int p) {
-        return values().getBoolean(p);
+        if (updates == null || updates[p] == NOT_SET) {
+            try {
+                return rs.getBoolean(p + 1);
+            } catch (SQLException e) {
+                throw (RuntimeException)e.getCause();
+            }
+        } else {
+            return (boolean) updates[p];
+        }
+    }
+
+    protected void __setBOOL(int p, boolean v) {
+        updates()[p] = v;
     }
 
     protected Date __getDATE(int p) {
-        return values().getDate(p);
-    }
-
-    protected Date __getDATETIME(int p) {
-        return values().getDate(p);
+        if (updates == null || updates[p] == NOT_SET) {
+            try {
+                return rs.getDate(p + 1);
+            } catch (SQLException e) {
+                throw (RuntimeException)e.getCause();
+            }
+        } else {
+            return (Date) updates[p];
+        }
+    }
+
+    protected void __setDATE(int p, Date v) {
+        updates()[p] = v;
+    }
+
+    protected Timestamp __getDATETIME(int p) {
+        if (updates == null || updates[p] == NOT_SET) {
+            try {
+                return rs.getTimestamp(p + 1);
+            } catch (SQLException e) {
+                throw (RuntimeException)e.getCause();
+            }
+        } else {
+            return (Timestamp) updates[p];
+        }
+    }
+
+    protected void __setDATETIME(int p, Timestamp v) {
+        updates()[p] = v;
     }
 
     protected BigDecimal __getDECIMAL(int p) {
-        return values().getBigDecimal(p);
+        if (updates == null || updates[p] == NOT_SET) {
+            try {
+                return rs.getBigDecimal(p + 1);
+            } catch (SQLException e) {
+                throw (RuntimeException)e.getCause();
+            }
+        } else {
+            return (BigDecimal) updates[p];
+        }
+    }
+
+    protected void __setDECIMAL(int p, BigDecimal v) {
+        updates()[p] = v;
     }
 
     protected double __getDOUBLE(int p) {
-        return values().getDouble(p);
+        if (updates == null || updates[p] == NOT_SET) {
+            try {
+                return rs.getDouble(p + 1);
+            } catch (SQLException e) {
+                throw (RuntimeException)e.getCause();
+            }
+        } else {
+            return (double) updates[p];
+        }
+    }
+
+    protected void __setDOUBLE(int p, double v) {
+        updates()[p] = v;
     }
 
     protected float __getFLOAT(int p) {
-        return values().getFloat(p);
+        if (updates == null || updates[p] == NOT_SET) {
+            try {
+                return rs.getFloat(p + 1);
+            } catch (SQLException e) {
+                throw (RuntimeException)e.getCause();
+            }
+        } else {
+            return (float) updates[p];
+        }
+    }
+
+    protected void __setFLOAT(int p, float v) {
+        updates()[p] = v;
     }
 
     protected int __getINT(int p) {
-        return values().getInt(p);
+        if (updates == null || updates[p] == NOT_SET) {
+            try {
+                return rs.getInt(p + 1);
+            } catch (SQLException e) {
+                throw (RuntimeException)e.getCause();
+            }
+        } else {
+            return (int) updates[p];
+        }
+    }
+
+    protected void __setINT(int p, int v) {
+        updates()[p] = v;
     }
 
     protected int __getINTERVAL_MILLIS(int p) {
-        throw new UnsupportedOperationException("Don't know how to convert a INTERVAL_MILLIS from a ValueSource");
+        throw new UnsupportedOperationException("Don't know how to convert an INTERVAL_MILLIS from a ValueSource");
+    }
+
+    protected void __setINTERVAL_MILLIS(int p, int v) {
+        throw new UnsupportedOperationException("Don't know how to store an INTERVAL_MILLIS");
     }
 
     protected int __getINTERVAL_MONTH(int p) {
-        throw new UnsupportedOperationException("Don't know how to convert a INTERVAL_MONTH from a ValueSource");
+        throw new UnsupportedOperationException("Don't know how to convert an INTERVAL_MONTH from a ValueSource");
+    }
+
+    protected void __setINTERVAL_MONTH(int p, int v) {
+        throw new UnsupportedOperationException("Don't know how to store an INTERVAL_MONTH");
     }
 
     protected long __getLONG(int p) {
-        return values().getLong(p);
-    }
-
-    protected Object __getNULL(int p) {
-        throw new UnsupportedOperationException("Don't know how to convert a NULL from a ValueSource");
-    }
-
-    protected Object __getRESULT_SET(int p) {
-        throw new UnsupportedOperationException("Don't know how to convert a RESULT_SET from a ValueSource");
+        if (updates == null || updates[p] == NOT_SET) {
+            try {
+                return rs.getLong(p + 1);
+            } catch (SQLException e) {
+                throw (RuntimeException)e.getCause();
+            }
+        } else {
+            return (long) updates[p];
+        }
+    }
+
+    protected void __setLONG(int p, long v) {
+        updates()[p] = v;
     }
 
     protected String __getTEXT(int p) {
-        return values().getString(p);
+        if (updates == null || updates[p] == NOT_SET) {
+            try {
+                return rs.getString(p + 1);
+            } catch (SQLException e) {
+                throw (RuntimeException)e.getCause();
+            }
+        } else {
+            return (String) updates[p];
+        }
+    }
+
+    protected void __setTEXT(int p, String v) {
+        updates()[p] = v;
     }
 
     protected Time __getTIME(int p) {
-        return values().getTime(p);
+        if (updates == null || updates[p] == NOT_SET) {
+            try {
+                return rs.getTime(p + 1);
+            } catch (SQLException e) {
+                throw (RuntimeException)e.getCause();
+            }
+        } else {
+            return (Time) updates[p];
+        }
+    }
+
+    protected void __setTIME(int p, Time v) {
+        updates()[p] = v;
     }
 
     protected Timestamp __getTIMESTAMP(int p) {
-        return values().getTimestamp(p);
+        if (updates == null || updates[p] == NOT_SET) {
+            try {
+                return rs.getTimestamp(p + 1);
+            } catch (SQLException e) {
+                throw (RuntimeException)e.getCause();
+            }
+        } else {
+            return (Timestamp) updates[p];
+        }
+    }
+
+    protected Object __getObject(int p) {
+        if (updates == null || updates[p] == NOT_SET) {
+            try {
+                return rs.getObject(p + 1);
+            } catch (SQLException e) {
+                throw (RuntimeException)e.getCause();
+            }
+        } else {
+            return updates[p];
+        }
+    }
+
+    protected void __setTIMESTAMP(int p, Timestamp v) {
+        updates()[p] = v;
     }
 
     protected long __getU_INT(int p) {
         throw new UnsupportedOperationException("Don't know how to convert a U_INT from a ValueSource");
     }
 
+    protected void __setU_INT(int p, long v) {
+        throw new UnsupportedOperationException("Don't know how to store a U_INT");
+    }
+
     protected BigInteger __getU_BIGINT(int p) {
         throw new UnsupportedOperationException("Don't know how to convert a U_BIGINT from a ValueSource");
     }
 
+    protected void __setU_BIGINT(int p, BigInteger v) {
+        throw new UnsupportedOperationException("Don't know how to store a U_BIGINT");
+    }
+
     protected BigDecimal __getU_DOUBLE(int p) {
         throw new UnsupportedOperationException("Don't know how to convert a U_DOUBLE from a ValueSource");
     }
 
+    protected void __setU_DOUBLE(int p, BigDecimal v) {
+        throw new UnsupportedOperationException("Don't know how to store a U_DOUBLE");
+    }
+
     protected double __getU_FLOAT(int p) {
         throw new UnsupportedOperationException("Don't know how to convert a U_FLOAT from a ValueSource");
     }
 
+    protected void __setU_FLOAT(int p, double v) {
+        throw new UnsupportedOperationException("Don't know how to store a U_FLOAT");
+    }
+
     protected String __getVARCHAR(int p) {
-        return values().getString(p);
+        if (updates == null || updates[p] == NOT_SET) {
+            try {
+                return rs.getString(p + 1);
+            } catch (SQLException e) {
+                throw (RuntimeException)e.getCause();
+            }
+        } else {
+            return (String) updates[p];
+        }
+    }
+
+    protected void __setVARCHAR(int p, String v) {
+        updates()[p] = v;
     }
 
     protected byte[] __getVARBINARY(int p) {
-        return values().getBytes(p);
+        if (updates == null || updates[p] == NOT_SET) {
+            try {
+                return rs.getBytes(p + 1);
+            } catch (SQLException e) {
+                throw (RuntimeException)e.getCause();
+            }
+        } else {
+            return (byte[]) updates[p];
+        }
+    }
+
+    protected void __setVARBINARY(int p, byte[] v) {
+        updates()[p] = v;
     }
 
     protected int __getYEAR(int p) {
-        return values().getInt(p);
+        if (updates == null || updates[p] == NOT_SET) {
+            try {
+                return rs.getInt(p + 1);
+            } catch (SQLException e) {
+                throw (RuntimeException)e.getCause();
+            }
+        } else {
+            return (int) updates[p];
+        }
+    }
+
+    protected void __setYEAR(int p, int v) {
+        updates()[p] = v;
+    }
+
+    /**
+     * Issue either an INSERT or an UPDATE statement depending on whether this
+     * instance is bound to a result set.
+     */
+    public void save() {
+        try {
+            /*
+             * If rs == null then this instance was created via the
+             * DirectIterable#newInstance method and the intention is to INSERT
+             * it. If rs is not null, then this instance was selected from an
+             * existing table and the intention is to UPDATE it.
+             */
+            if (rs == null) {
+                PreparedStatement stmt = __insertStatement();
+                stmt.execute();
+                rs = (DirectResultSet)stmt.getGeneratedKeys();
+                try {
+                    rs.next();
+                } catch (SQLException e) {
+                    throw new DirectException(e);
+                }
+                updates = null;
+            } else {
+                PreparedStatement stmt = __updateStatement();
+                stmt.execute();
+                updates = null;
+            }
+
+        } catch (SQLException e) {
+            throw new DirectException(e);
+        }
+    }
+
+    private PreparedStatement __insertStatement() throws SQLException {
+        assert updates != null : "No updates to save";
+        BitSet bs = new BitSet(columns.length);
+        for (int index = 0; index < updates.length; index++) {
+            if (updates[index] != NOT_SET) {
+                bs.set(index);
+            }
+        }
+        Connection conn = Direct.getContext().getConnection();
+        Map<BitSet, PreparedStatement> map = insertStatementCache.get(conn);
+        PreparedStatement stmt = null;
+        if (map == null) {
+            map = new HashMap<>();
+            insertStatementCache.put(conn, map);
+        } else {
+            stmt = map.get(bs);
+        }
+        if (stmt == null) {
+            StringBuilder updateColumns = new StringBuilder();
+            StringBuilder updateValues = new StringBuilder();
+
+            for (int index = 0; index < columns.length; index++) {
+                if (updates[index] != NOT_SET) {
+                    if (updateColumns.length() > 0) {
+                        updateColumns.append(',');
+                        updateValues.append(',');
+                    }
+                    updateColumns.append(columns[index].columnName);
+                    updateValues.append('?');
+                }
+            }
+            final String sql = String.format(INSERT_STATEMENT, schemaName, tableName, updateColumns, updateValues);
+            stmt = conn.prepareStatement(sql);
+            map.put(bs, stmt);
+        } else {
+            // Just in case
+            stmt.clearParameters();
+        }
+        int statementIndex = 1;
+        for (int index = 0; index < columns.length; index++) {
+            if (updates[index] != NOT_SET) {
+                stmt.setObject(statementIndex, updates[index]);
+                statementIndex++;
+            }
+        }
+        return stmt;
+    }
+
+    private PreparedStatement __updateStatement() throws SQLException {
+        assert updates != null : "No updates to save";
+        BitSet bs = new BitSet(columns.length);
+        for (int index = 0; index < updates.length; index++) {
+            if (updates[index] != NOT_SET) {
+                bs.set(index);
+            }
+        }
+        Connection conn = Direct.getContext().getConnection();
+
+        Map<BitSet, PreparedStatement> map = updateStatementCache.get(conn);
+        synchronized (this) {
+            if (map == null) {
+                map = new HashMap<>();
+                updateStatementCache.put(conn, map);
+            }
+        }
+
+        PreparedStatement stmt = map.get(bs);
+        if (stmt == null) {
+            StringBuilder updateColumns = new StringBuilder();
+            StringBuilder pkColumns = new StringBuilder();
+
+            for (int index = 0; index < columns.length; index++) {
+                if (columns[index].parentJoinFieldIndex >= 0 || columns[index].primaryKeyFieldIndex >= 0) {
+                    if (pkColumns.length() > 0) {
+                        pkColumns.append(" and ");
+                    }
+                    pkColumns.append(columns[index].columnName).append("=?");
+                }
+                if (updates[index] != NOT_SET) {
+                    if (updateColumns.length() > 0) {
+                        updateColumns.append(',');
+                    }
+                    updateColumns.append(columns[index].getColumnName()).append("=?");
+                }
+            }
+            final String sql = String.format(UPDATE_STATEMENT, schemaName, tableName, updateColumns, pkColumns);
+            stmt = conn.prepareStatement(sql);
+            map.put(bs, stmt);
+        } else {
+            // Just in case
+            stmt.clearParameters();
+        }
+        int statementIndex = 1;
+        for (int pass = 0; pass < 2; pass++) {
+            for (int index = 0; index < columns.length; index++) {
+                if (pass == 0) {
+                    if (updates[index] != NOT_SET) {
+                        stmt.setObject(statementIndex, updates[index]);
+                        statementIndex++;
+                    }
+                }
+                if (pass == 1) {
+                    if (columns[index].parentJoinFieldIndex >= 0 || columns[index].primaryKeyFieldIndex >= 0) {
+                        stmt.setObject(statementIndex, __getObject(index));
+                        statementIndex++;
+                    }
+                }
+            }
+        }
+        return stmt;
     }
 
 }

=== modified file 'src/main/java/com/akiban/direct/ClassBuilder.java'
--- src/main/java/com/akiban/direct/ClassBuilder.java	2013-04-05 14:35:40 +0000
+++ src/main/java/com/akiban/direct/ClassBuilder.java	2013-04-26 02:16:29 +0000
@@ -16,6 +16,7 @@
  */
 package com.akiban.direct;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -53,7 +54,7 @@
     public abstract void addMethod(String name, String returnType, String[] argumentTypes, String[] argumentNames,
             String[] body);
 
-    public abstract void addConstructor(String[] argumentTypes, String[] argumentNames, String[] body);
+    public abstract void addStaticInitializer(final String body);
 
     /*
      * (non-Javadoc)
@@ -89,7 +90,7 @@
     public static String schemaClassName(String schema) {
         return PACKAGE + "." + sanitize(INFLECTOR.classify(schema));
     }
-    
+
     public static String sanitize(final String s) {
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < s.length(); i++) {
@@ -100,7 +101,7 @@
                 }
                 sb.append(ch);
             } else {
-                sb.append(String.format("_u%04h", ch));
+                sb.append(String.format("_u%04x", (int) ch));
             }
         }
         return sb.toString();
@@ -242,7 +243,7 @@
         String className = PACKAGE + ".$$$" + asJavaName(schemaName, true) + "$$$"
                 + asJavaName(table.getName().getTableName(), true);
         startClass(className, false, "com.akiban.direct.AbstractDirectObject", new String[] { typeName }, IMPORTS);
-        addConstructor(NONE, NONE, NONE);
+        addStaticInitializer(columnMetadataString(table));
         addMethods(table, scn, typeName, className, false);
         end();
     }
@@ -250,6 +251,7 @@
     void startExtentClass(String schema, final String scn) throws CannotCompileException, NotFoundException {
         String className = PACKAGE + ".$$" + asJavaName(schema, true);
         startClass(className, false, "com.akiban.direct.AbstractDirectObject", new String[] { scn }, IMPORTS);
+        addStaticInitializer(null);
     }
 
     void addExtentAccessor(UserTable table, String scn, boolean iface) {
@@ -258,7 +260,7 @@
 
         String[] body = null;
         if (!iface) {
-            StringBuilder sb = new StringBuilder(buildDirectIterableExpr(className, tableName));
+            StringBuilder sb = new StringBuilder(buildDirectIterableExpr(className, table));
             body = new String[] { "return " + sb.toString() };
         }
         addMethod("get" + asJavaCollectionName(tableName, true), "com.akiban.direct.DirectIterable<" + className + ">",
@@ -278,7 +280,7 @@
                     names[i] = asJavaName(primaryKeyColumns.get(i).getName(), false);
                 }
 
-                StringBuilder sb = new StringBuilder(buildDirectIterableExpr(className, tableName));
+                StringBuilder sb = new StringBuilder(buildDirectIterableExpr(className, table));
                 for (int i = 0; i < primaryKeyColumns.size(); i++) {
                     sb.append(String.format(".where(\"%s\", %s)", primaryKeyColumns.get(i).getName(),
                             literal(javaClass(primaryKeyColumns.get(i)), "$" + (i + 1)), false));
@@ -300,8 +302,10 @@
             Class<?> javaClass = javaClass(column);
             String[] getBody = new String[] { "return __get" + column.getType().akType() + "(" + column.getPosition()
                     + ")" };
-            String expr = addProperty(column.getName(), javaClass.getName(), asJavaName(column.getName(), false),
-                    iface ? null : getBody, iface ? null : UNSUPPORTED, true);
+            final String paramName = asJavaName(column.getName(), false);
+            String[] setBody = new String[] { "__set" + column.getType().akType() + "(" + column.getPosition() + ",$1)" };
+            String expr = addProperty(column.getName(), javaClass.getName(), paramName, iface ? null : getBody,
+                    iface ? null : setBody, true);
             getterMethods.put(column.getName(), expr);
         }
 
@@ -310,11 +314,12 @@
          */
         Join parentJoin = table.getParentJoin();
         if (parentJoin != null) {
-            String parentTableName = parentJoin.getParent().getName().getTableName();
+            UserTable parentTable = parentJoin.getParent();
+            String parentTableName = parentTable.getName().getTableName();
             String parentClassName = scn + "$" + asJavaName(parentTableName, true);
             String[] body = null;
             if (!iface) {
-                StringBuilder sb = new StringBuilder(buildDirectIterableExpr(parentClassName, parentTableName));
+                StringBuilder sb = new StringBuilder(buildDirectIterableExpr(parentClassName, parentTable));
                 for (final JoinColumn jc : parentJoin.getJoinColumns()) {
                     sb.append(String.format(".where(\"%s\", %s)", jc.getParent().getName(),
                             literal(getterMethods, jc.getParent())));
@@ -353,7 +358,7 @@
                 }
                 String[] body = null;
                 if (!iface) {
-                    StringBuilder sb = new StringBuilder(buildDirectIterableExpr(childClassName, childTableName));
+                    StringBuilder sb = new StringBuilder(buildDirectIterableExpr(childClassName, join.getChild()));
                     for (final JoinColumn jc : join.getJoinColumns()) {
                         sb.append(String.format(".where(\"%s\", %s)", jc.getChild().getName(),
                                 literal(getterMethods, jc.getParent())));
@@ -370,7 +375,7 @@
             if (!primaryKeyColumns.isEmpty()) {
                 String[] body = null;
                 if (!iface) {
-                    StringBuilder sb = new StringBuilder(buildDirectIterableExpr(childClassName, childTableName));
+                    StringBuilder sb = new StringBuilder(buildDirectIterableExpr(childClassName, join.getChild()));
                     for (final JoinColumn jc : join.getJoinColumns()) {
                         sb.append(String.format(".where(\"%s\", %s)", jc.getChild().getName(),
                                 literal(getterMethods, jc.getParent())));
@@ -381,10 +386,56 @@
                         + childClassName + ">", NONE, null, body);
             }
         }
-        /*
-         * Add boilerplate methods
-         */
-        addMethod("copy", typeName, NONE, null, iface ? null : UNSUPPORTED);
+    }
+
+    /**
+     * Generate a Java command that will be executed as a static initializer and
+     * will give the base class metadata about the columns.
+     */
+    @SuppressWarnings("unchecked")
+    private String columnMetadataString(final UserTable table) {
+        String[] columnArray = new String[table == null ? 0 : table.getColumns().size()];
+        if (table != null) {
+            PrimaryKey pk = table.getPrimaryKey();
+            List<Column> pkColumns = pk == null ? Collections.EMPTY_LIST : pk.getColumns();
+            List<JoinColumn> joinColumns = table.getParentJoin() == null ? Collections.EMPTY_LIST : table
+                    .getParentJoin().getJoinColumns();
+            for (Column column : table.getColumns()) {
+                int index = column.getPosition();
+                String columnName = column.getName();
+                String propertyName = asJavaName(columnName, false);
+                String type = javaClass(column).getSimpleName();
+                int pkFieldIndex = -1;
+                int pjFieldIndex = -1;
+                for (int pkindex = 0; pkindex < pkColumns.size(); pkindex++) {
+                    if (pkColumns.get(pkindex) == column) {
+                        pkFieldIndex = pkindex;
+                        break;
+                    }
+                }
+                for (JoinColumn jc : joinColumns) {
+                    if (jc.getChild() == column) {
+                        pjFieldIndex = jc.getParent().getPosition();
+                        break;
+                    }
+                }
+                columnArray[index] = String.format("%s:%s:%s:%d:%d", columnName, propertyName, type, pkFieldIndex,
+                        pjFieldIndex);
+            }
+        }
+        StringBuilder sb = new StringBuilder("__init(");
+        sb.append("\"").append(table.getName().getSchemaName()).append("\", ");
+        sb.append("\"").append(table.getName().getTableName()).append("\", ");
+        sb.append("\"");
+        for (int index = 0; index < columnArray.length; index++) {
+            assert columnArray[index] != null : "Missing column specification: " + index;
+            if (index > 0) {
+                sb.append(',');
+            }
+            sb.append(columnArray[index]);
+        }
+        sb.append("\")");
+        return sb.toString();
     }
 
     private Class<?> javaClass(final Column column) {
@@ -394,7 +445,7 @@
         case DATE:
             return java.sql.Date.class;
         case DATETIME:
-            return java.sql.Date.class;
+            return java.sql.Timestamp.class;
         case DECIMAL:
             return java.math.BigDecimal.class;
         case DOUBLE:
@@ -439,8 +490,9 @@
 
     }
 
-    private String buildDirectIterableExpr(final String className, final String table) {
-        return String.format("(new com.akiban.direct.DirectIterableImpl" + "(%1$s.class, \"%2$s\"))", className, table);
+    private String buildDirectIterableExpr(final String className, final UserTable table) {
+        return String.format("(new com.akiban.direct.DirectIterableImpl" + "(%s.class, \"%s\", this))",
+                className, table.getName().getTableName());
     }
 
     /**

=== modified file 'src/main/java/com/akiban/direct/ClassObjectWriter.java'
--- src/main/java/com/akiban/direct/ClassObjectWriter.java	2013-04-03 13:20:48 +0000
+++ src/main/java/com/akiban/direct/ClassObjectWriter.java	2013-04-26 02:16:29 +0000
@@ -87,28 +87,13 @@
     }
 
     @Override
-    public void addConstructor(String[] argumentTypes, String[] argumentNames, String[] body) {
+    public void addStaticInitializer(final String body) {
         try {
             if (currentCtClass.isInterface()) {
                 return;
             }
-            CtClass[] parameters = new CtClass[argumentTypes.length];
-            for (int i = 0; i < argumentTypes.length; i++) {
-                parameters[i] = getCtClass(simpleName(argumentTypes[i]));
-            }
-            CtConstructor method = new CtConstructor(parameters, currentCtClass);
-            if (body != null) {
-                StringBuilder sb = new StringBuilder("{");
-                for (final String s : body) {
-                    sb.append(s);
-                    sb.append(";");
-                    sb.append('\n');
-                }
-                sb.append("}");
-                method.setBody(sb.toString());
-                method.setModifiers(method.getModifiers() & ~Modifier.ABSTRACT);
-            }
-            currentCtClass.addConstructor(method);
+            CtConstructor initializer = currentCtClass.makeClassInitializer();
+            initializer.setBody(body + ";");
         } catch (CannotCompileException e) {
             e.printStackTrace();
         }

=== modified file 'src/main/java/com/akiban/direct/ClassSourceWriter.java'
--- src/main/java/com/akiban/direct/ClassSourceWriter.java	2013-04-03 13:20:48 +0000
+++ src/main/java/com/akiban/direct/ClassSourceWriter.java	2013-04-26 02:16:29 +0000
@@ -123,43 +123,17 @@
         }
         newLine();
     }
-
+    
     @Override
-    public void addConstructor(final String[] argumentTypes,
-            final String[] argumentNames, final String[] body) {
-        newLine();
-        print("public ", localName(externalName(classNames.firstElement()), classNames.firstElement()),  "(");
-        boolean first = true;
-        int counter = 0;
-        for (final String s : argumentTypes) {
-            if (!first) {
-                append(", ");
-            }
-            String argName;
-            if (argumentTypes != null) {
-                argName = argumentNames[counter];
-                counter++;
-            } else {
-                argName = "z" + ++counter;
-            }
-            append(localName(externalName(s), classNames.firstElement()), " ", argName);
-        }
-        append(")");
-        if (body == null) {
-            append(";");
-        } else {
-            append(" {");
-            newLine();
-            indentation++;
-            for (String s : body) {
-                println(s, ";");
-            }
-            indentation--;
-            println("}");
-        }
+    public void addStaticInitializer(final String body) {
+        println("static {");
+        println(body + ";");
+        println("}");
         newLine();
     }
 
+
+
     /*
      * (non-Javadoc)
      * 
@@ -188,7 +162,7 @@
         }
         boolean shorten = "java.lang.".equals(fqn.substring(0, dotIndex + 1));
 
-        if (!shorten) {
+        if (!shorten && imports != null) {
             for (final String s : imports) {
                 if (s.equals(fqn)) {
                     shorten = true;

=== modified file 'src/main/java/com/akiban/direct/ClassXRefWriter.java'
--- src/main/java/com/akiban/direct/ClassXRefWriter.java	2013-04-03 13:20:48 +0000
+++ src/main/java/com/akiban/direct/ClassXRefWriter.java	2013-04-26 02:16:29 +0000
@@ -97,11 +97,6 @@
     }
 
     @Override
-    public void addConstructor(final String[] argumentTypes, final String[] argumentNames, final String[] body) {
-        // ignore
-    }
-
-    @Override
     public String addProperty(final String name, final String type, final String argName, final String[] getBody,
             final String[] setBody, final boolean hasSetter) {
         String caseConverted = asJavaName(name, false);
@@ -112,6 +107,11 @@
         addMethod(caseConverted, type, null, null, null);
         return super.addProperty(name, type, argName, getBody, setBody, hasSetter);
     }
+    
+    @Override
+    public void addStaticInitializer(final String body) {
+        // ignore
+    }
 
     /*
      * (non-Javadoc)

=== modified file 'src/main/java/com/akiban/direct/Direct.java'
--- src/main/java/com/akiban/direct/Direct.java	2013-04-03 13:20:48 +0000
+++ src/main/java/com/akiban/direct/Direct.java	2013-04-26 02:16:29 +0000
@@ -66,12 +66,7 @@
     public static AbstractDirectObject objectForRow(final Class<?> c) {
         AbstractDirectObject o = instanceMap.get().get(c);
         if (o == null) {
-            try {
-                Class<? extends AbstractDirectObject> cl = classMap.get(c);
-                o = cl.newInstance();
-            } catch (InstantiationException | IllegalAccessException | ClassCastException e) {
-                throw new RuntimeException(e);
-            }
+            o = newInstance(c);
             if (o != null) {
                 instanceMap.get().put(c, o);
             }
@@ -79,6 +74,21 @@
         return o;
     }
     
+    /**
+     * Construct a new instance of an entity object of the given type.
+     * @param c Type (the interface class) of object
+     * @return A newly constructed implementation object
+     */
+    public static AbstractDirectObject newInstance(final Class<?> c) {
+        try {
+            Class<? extends AbstractDirectObject> cl = classMap.get(c);
+            return cl.newInstance();
+        } catch (InstantiationException | IllegalAccessException | ClassCastException e) {
+            throw new RuntimeException(e);
+        }
+        
+    }
+    
     public static void enter(final String schemaName, AkibanInformationSchema ais) {
         DirectClassLoader dcl = ais.getCachedValue(CACHE_KEY, new CacheValueGenerator<DirectClassLoader>() {
 

=== added file 'src/main/java/com/akiban/direct/DirectColumn.java'
--- src/main/java/com/akiban/direct/DirectColumn.java	1970-01-01 00:00:00 +0000
+++ src/main/java/com/akiban/direct/DirectColumn.java	2013-04-26 02:16:29 +0000
@@ -0,0 +1,35 @@
+/**
+ * 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.direct;
+
+
+/**
+ * Metadata supplied by DirectObject 
+ * 
+ * @author peter
+ *
+ */
+public interface DirectColumn {
+
+    int getColumnIndex();
+    String getColumnName();
+    String getPropertyName();
+    String getPropertyType();
+    
+    
+}

=== modified file 'src/main/java/com/akiban/direct/DirectIterable.java'
--- src/main/java/com/akiban/direct/DirectIterable.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/direct/DirectIterable.java	2013-04-26 02:16:29 +0000
@@ -18,7 +18,7 @@
 package com.akiban.direct;
 
 /**
- * A List expanded to accept selection, limit and sort capabilities.
+ * An Iterable expanded to accept selection, limit and sort capabilities.
  * 
  * @author peter
  *
@@ -35,5 +35,6 @@
     
     public DirectIterable<T> limit(String limit);
     
+    public T newInstance();
     
 }

=== modified file 'src/main/java/com/akiban/direct/DirectIterableImpl.java'
--- src/main/java/com/akiban/direct/DirectIterableImpl.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/direct/DirectIterableImpl.java	2013-04-26 02:16:29 +0000
@@ -23,9 +23,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import com.akiban.qp.row.Row;
 import com.akiban.sql.embedded.JDBCResultSet;
-import com.akiban.util.ShareHolder;
 
 /**
  * Very kludgey implementation by constructing SQL strings.
@@ -36,22 +34,24 @@
  */
 public class DirectIterableImpl<T> implements DirectIterable<T> {
 
-    final Class<T> clazz;
-    boolean hasNext;
-
-    final String table;
-    final List<String> predicates = new ArrayList<String>();
-    final List<String> sorts = new ArrayList<String>();
-    String limit;
-
-    boolean initialized;
-    String sql;
-
-    JDBCResultSet resultSet;
-
-    public DirectIterableImpl(Class<T> clazz, String toTable) {
-        this.clazz = clazz;
+    private final Class<T> clazz;
+    private final DirectObject parent;
+    private boolean hasNext;
+
+    private final String table;
+    private final List<String> predicates = new ArrayList<String>();
+    private final List<String> sorts = new ArrayList<String>();
+    private String limit;
+
+    private boolean initialized;
+    private String sql;
+
+    private JDBCResultSet resultSet;
+
+    public DirectIterableImpl(Class<T> ifaceClass, String toTable, DirectObject parent) {
+        this.clazz = ifaceClass;
         this.table = toTable;
+        this.parent = parent;
     }
 
     @Override
@@ -104,7 +104,6 @@
 
     private boolean nextRow() {
         try {
-            
             boolean result = resultSet.next();
             return result;
         } catch (SQLException e) {
@@ -152,7 +151,7 @@
         predicates.add(predicate);
         return this;
     }
-    
+
     @Override
     public DirectIterableImpl<T> where(final String columnName, Object literal) {
         StringBuilder sb = new StringBuilder(columnName).append(" = ");
@@ -164,7 +163,6 @@
         predicates.add(sb.toString());
         return this;
     }
-    
 
     @Override
     public DirectIterableImpl<T> sort(final String column) {
@@ -186,4 +184,16 @@
         }
         throw new IllegalStateException("Limit already specified");
     }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public T newInstance() throws DirectException {
+        try {
+            final AbstractDirectObject newInstance = Direct.newInstance(clazz);
+            newInstance.populateJoinFields(parent);
+            return (T)newInstance;
+        } catch (Exception e) {
+            throw new DirectException(e);
+        }
+    }
 }

=== modified file 'src/main/java/com/akiban/rest/RestResponseBuilder.java'
--- src/main/java/com/akiban/rest/RestResponseBuilder.java	2013-04-20 11:38:26 +0000
+++ src/main/java/com/akiban/rest/RestResponseBuilder.java	2013-04-26 02:16:29 +0000
@@ -19,6 +19,8 @@
 
 import com.akiban.rest.resources.ResourceHelper;
 import com.akiban.server.Quote;
+import com.akiban.server.error.DirectEndpointNotFoundException;
+import com.akiban.server.error.DirectTransactionFailedException;
 import com.akiban.server.error.ErrorCode;
 import com.akiban.server.error.InvalidOperationException;
 import com.akiban.server.error.NoSuchRoutineException;
@@ -145,9 +147,8 @@
 
     public WebApplicationException wrapException(Throwable e) {
         final ErrorCode code;
-        if (e instanceof WebApplicationException) {
-            return (WebApplicationException)e;
-        } else if(e instanceof InvalidOperationException) {
+
+        if(e instanceof InvalidOperationException) {
             code = ((InvalidOperationException)e).getCode();
         } else if(e instanceof SQLException) {
             code = ErrorCode.valueOfCode(((SQLException)e).getSQLState());
@@ -204,6 +205,8 @@
         Map<Class, Response.Status> map = new HashMap<>();
         map.put(NoSuchTableException.class, Response.Status.NOT_FOUND);
         map.put(NoSuchRoutineException.class, Response.Status.NOT_FOUND);
+        map.put(DirectEndpointNotFoundException.class, Response.Status.NOT_FOUND);
+        map.put(DirectTransactionFailedException.class, Response.Status.INTERNAL_SERVER_ERROR);
         map.put(JsonParseException.class, Response.Status.BAD_REQUEST);
         return map;
     }

=== modified file 'src/main/java/com/akiban/rest/resources/DirectResource.java'
--- src/main/java/com/akiban/rest/resources/DirectResource.java	2013-04-20 11:44:31 +0000
+++ src/main/java/com/akiban/rest/resources/DirectResource.java	2013-04-26 02:16:29 +0000
@@ -18,14 +18,8 @@
 package com.akiban.rest.resources;
 
 import static com.akiban.rest.resources.ResourceHelper.JSONP_ARG_NAME;
-import static com.akiban.rest.resources.ResourceHelper.checkSchemaAccessible;
-import static com.akiban.rest.resources.ResourceHelper.checkTableAccessible;
-import static com.akiban.util.JsonUtils.createJsonGenerator;
 
-import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.List;
-import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.DELETE;
@@ -66,8 +60,6 @@
     private final static String LANGUAGE = "language";
     private final static String FUNCTIONS = "functions";
 
-
-
     private final ResourceRequirements reqs;
 
     public DirectResource(ResourceRequirements reqs) {

=== added file 'src/main/java/com/akiban/server/error/DirectEndpointNotFoundException.java'
--- src/main/java/com/akiban/server/error/DirectEndpointNotFoundException.java	1970-01-01 00:00:00 +0000
+++ src/main/java/com/akiban/server/error/DirectEndpointNotFoundException.java	2013-04-26 02:16:29 +0000
@@ -0,0 +1,25 @@
+/**
+ * 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;
+
+
+public class DirectEndpointNotFoundException extends InvalidOperationException {
+    public DirectEndpointNotFoundException(Object... args) {
+        super(ErrorCode.DIRECT_ENDPOINT_NOT_FOUND, args);
+    }
+}

=== added file 'src/main/java/com/akiban/server/error/DirectTransactionFailedException.java'
--- src/main/java/com/akiban/server/error/DirectTransactionFailedException.java	1970-01-01 00:00:00 +0000
+++ src/main/java/com/akiban/server/error/DirectTransactionFailedException.java	2013-04-26 02:16:29 +0000
@@ -0,0 +1,25 @@
+/**
+ * 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;
+
+
+public class DirectTransactionFailedException extends InvalidOperationException {
+    public DirectTransactionFailedException(Object... args) {
+        super(ErrorCode.DIRECT_TRANSACTION_FAILED, args);
+    }
+}

=== modified file 'src/main/java/com/akiban/server/error/ErrorCode.java'
--- src/main/java/com/akiban/server/error/ErrorCode.java	2013-04-14 03:16:25 +0000
+++ src/main/java/com/akiban/server/error/ErrorCode.java	2013-04-26 02:16:29 +0000
@@ -284,6 +284,8 @@
     // Class 42/800 - Akiba Direct errors
     CANT_CALL_SCRIPT_LIBRARY ("42", "800", Importance.DEBUG, CantCallScriptLibraryException.class),
     SCRIPT_REGISTRATION_EXCEPTION ("42", "801", Importance.DEBUG, ScriptLibraryRegistrationException.class),
+    DIRECT_ENDPOINT_NOT_FOUND ("42", "802", Importance.DEBUG, DirectEndpointNotFoundException.class),
+    DIRECT_TRANSACTION_FAILED ("42", "803", Importance.ERROR, DirectTransactionFailedException.class),
         
     // Class 44 - with check option violation
 

=== modified file 'src/main/java/com/akiban/server/service/restdml/DirectServiceImpl.java'
--- src/main/java/com/akiban/server/service/restdml/DirectServiceImpl.java	2013-04-23 01:07:03 +0000
+++ src/main/java/com/akiban/server/service/restdml/DirectServiceImpl.java	2013-04-26 02:16:29 +0000
@@ -52,6 +52,8 @@
 import com.akiban.rest.RestFunctionRegistrar;
 import com.akiban.rest.RestServiceImpl;
 import com.akiban.rest.resources.ResourceHelper;
+import com.akiban.server.error.DirectEndpointNotFoundException;
+import com.akiban.server.error.DirectTransactionFailedException;
 import com.akiban.server.error.ExternalRoutineInvocationException;
 import com.akiban.server.error.NoSuchRoutineException;
 import com.akiban.server.error.ScriptLibraryRegistrationException;
@@ -94,6 +96,7 @@
     private final static String IS_RESULT = "is_result";
 
     private final static int TRANSACTION_RETRY_COUNT = 3;
+
     private final static String DISTINGUISHED_REGISTRATION_METHOD_NAME = "_register";
 
     private final static String CREATE_PROCEDURE_FORMAT = "CREATE OR REPLACE PROCEDURE \"%s\".\"%s\" ()"
@@ -336,7 +339,7 @@
             final TableName procName, final String pathParams, final MultivaluedMap<String, String> queryParameters,
             final byte[] content, final MediaType[] responseType) throws Exception {
         try (JDBCConnection conn = jdbcConnection(request, procName.getSchemaName());) {
-            LOG.debug("Invoking {} {}", request.getMethod(), request.getRequestURI());
+            LOG.debug("Invoking {} {}", method, request.getRequestURI());
             conn.setAutoCommit(false);
 
             boolean completed = false;
@@ -348,7 +351,7 @@
                     Direct.getContext().setConnection(conn);
                     conn.beginTransaction();
                     invokeRestFunction(writer, conn, method, procName, pathParams, queryParameters, content,
-                            request.getContentType(), responseType);
+                            request, responseType);
                     conn.commitTransaction();
                     completed = true;
                     return;
@@ -356,7 +359,7 @@
                     if (repeat == 0) {
                         LOG.error("Transaction failed " + TRANSACTION_RETRY_COUNT + " times: "
                                 + request.getRequestURI());
-                        throw new WebApplicationException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+                        throw new DirectTransactionFailedException(method, request.getRequestURI());
                     }
                 } catch (RegistrationException e) {
                     throw new ScriptLibraryRegistrationException(e);
@@ -383,7 +386,7 @@
 
     private void invokeRestFunction(final PrintWriter writer, JDBCConnection conn, final String method,
             final TableName procName, final String pathParams, final MultivaluedMap<String, String> queryParameters,
-            final byte[] content, final String requestType, final MediaType[] responseType) throws Exception {
+            final byte[] content, final HttpServletRequest request, final MediaType[] responseType) throws Exception {
 
         ParamCache cache = new ParamCache();
         final EndpointMap endpointMap = getEndpointMap(conn.getSession());
@@ -392,9 +395,9 @@
             list = endpointMap.getMap().get(new EndpointAddress(method, procName));
         }
 
-        EndpointMetadata md = selectEndpoint(list, pathParams, requestType, responseType, cache);
+        EndpointMetadata md = selectEndpoint(list, pathParams, request.getContentType(), responseType, cache);
         if (md == null) {
-            throw new WebApplicationException(HttpServletResponse.SC_NOT_FOUND);
+            throw new DirectEndpointNotFoundException(method, request.getRequestURI());
         }
 
         final Object[] args = createArgsArray(pathParams, queryParameters, content, cache, md);
@@ -603,7 +606,7 @@
                     list.add(em);
                 }
             } catch (Exception e) {
-                String msg = e instanceof IllegalArgumentException ? e.getMessage() : "";
+                String msg = IllegalArgumentException.class.equals(e.getClass()) ? e.getMessage() : e.toString();
                 throw new RegistrationException("Invalid function specification: " + spec + " - " + msg, e);
             }
         }

=== modified file 'src/main/java/com/akiban/server/service/restdml/EndpointMetadata.java'
--- src/main/java/com/akiban/server/service/restdml/EndpointMetadata.java	2013-04-21 01:28:30 +0000
+++ src/main/java/com/akiban/server/service/restdml/EndpointMetadata.java	2013-04-26 02:16:29 +0000
@@ -227,7 +227,7 @@
                     em.name = v;
                 } else {
                     em.name = v.substring(0, p);
-                    em.pattern = Pattern.compile(v.substring(p));
+                    em.pattern = Pattern.compile(v.substring(p + 1));
                 }
                 break;
             }
@@ -576,7 +576,7 @@
         @Override
         public boolean equals(Object other) {
             EndpointAddress ea = (EndpointAddress) other;
-            return name.equals(ea.name) && method.equals(ea.method);
+            return name.equals(ea.name) && method.equals(ea.method) && schema.equals(ea.schema);
         }
 
     }
@@ -774,7 +774,7 @@
         StringBuilder sb = new StringBuilder();
         append(sb, METHOD, "=", method, " ", PATH, "=", name);
         if (pattern != null) {
-            append(sb, pattern.toString());
+            append(sb, "/", pattern.toString());
         }
         append(sb, " ", FUNCTION, "=", function, " ", IN, "=(");
         if (inParams == null) {
@@ -802,7 +802,7 @@
 
     Matcher getParamPathMatcher(final ParamCache cache, final String pathParamString) {
         if (cache.matcher == null) {
-            cache.matcher = pattern.matcher(pathParamString);
+            cache.matcher = pattern.matcher(pathParamString.isEmpty() ? pathParamString : pathParamString.substring(1));
         }
         return cache.matcher;
     }

=== modified file 'src/main/java/com/akiban/server/types3/TClassBase.java'
--- src/main/java/com/akiban/server/types3/TClassBase.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/types3/TClassBase.java	2013-04-26 02:16:29 +0000
@@ -121,6 +121,8 @@
             PValueTargets.copyFrom(in, out);
             return true;
         }
+        
+        
         PUnderlying underlyingType = TInstance.pUnderlying(in.tInstance());
         if (underlyingType == PUnderlying.STRING || underlyingType == PUnderlying.BYTES)
             return false;

=== modified file 'src/main/java/com/akiban/sql/embedded/JDBCResultSet.java'
--- src/main/java/com/akiban/sql/embedded/JDBCResultSet.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/sql/embedded/JDBCResultSet.java	2013-04-26 02:16:29 +0000
@@ -57,7 +57,7 @@
         context = new EmbeddedQueryContext(this);
         values = new Values();
     }
-
+    
     protected class Values extends ServerJavaValues {
         @Override
         protected int size() {
@@ -1517,7 +1517,7 @@
 
         AbstractDirectObject o = Direct.objectForRow(c);
         if (o != null) {
-            o.setResults(values, this);
+            o.setResults(this);
             return o;
         }
         throw new JDBCException("No entity class for row");
@@ -1526,4 +1526,5 @@
     public boolean hasRow() {
         return row != null;
     }
+
 }

=== modified file 'src/main/resources/com/akiban/server/error/error_code.properties'
--- src/main/resources/com/akiban/server/error/error_code.properties	2013-04-14 03:16:25 +0000
+++ src/main/resources/com/akiban/server/error/error_code.properties	2013-04-26 02:16:29 +0000
@@ -160,6 +160,8 @@
 #
 CANT_CALL_SCRIPT_LIBRARY = Cannot call a script library directly: {0} 
 SCRIPT_REGISTRATION_EXCEPTION = Script library registration error: {0}
+DIRECT_ENDPOINT_NOT_FOUND = Endpoint not found {0} {1}
+DIRECT_TRANSACTION_FAILED = Transaction failed in {0} {1}
 #
 # Class 46 - SQL/J
 #

=== added directory 'src/test/java/com/akiban/direct'
=== added file 'src/test/java/com/akiban/direct/COIDirectClasses.java'
--- src/test/java/com/akiban/direct/COIDirectClasses.java	1970-01-01 00:00:00 +0000
+++ src/test/java/com/akiban/direct/COIDirectClasses.java	2013-04-26 02:16:29 +0000
@@ -0,0 +1,288 @@
+/**
+ * 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.direct;
+
+public class COIDirectClasses {
+
+    //
+    // Interfaces and classes are adapted from source code generated by {@link
+    // com.akiban.direct.ClassBuilder}.
+    // ------------------------------------------------------------------------------------------
+    //
+    interface Iface extends DirectObject {
+        interface Address {
+            public int getAid();
+
+            public void setAid(int aid);
+
+            public int getCid();
+
+            public void setCid(int cid);
+
+            public String getState();
+
+            public void setState(String state);
+
+            public String getCity();
+
+            public void setCity(String city);
+
+            public Customer getCustomer();
+
+            public void save();
+        }
+
+        interface Customer extends DirectObject {
+            public int getCid();
+
+            public void setCid(int cid);
+
+            public String getName();
+
+            public void setName(String name);
+
+            public Address getAddress(int aid);
+
+            public DirectIterable<Address> getAddresses();
+
+            public Order getOrder(int oid);
+
+            public DirectIterable<Order> getOrders();
+
+            public void save();
+        }
+
+        interface Item extends DirectObject {
+            public int getIid();
+
+            public void setIid(int iid);
+
+            public int getOid();
+
+            public void setOid(int oid);
+
+            public String getSku();
+
+            public void setSku(String sku);
+
+            public Order getOrder();
+
+            public void save();
+        }
+
+        interface Order extends DirectObject {
+            public int getOid();
+
+            public void setOid(int oid);
+
+            public int getCid();
+
+            public void setCid(int cid);
+
+            public java.sql.Date getOdate();
+
+            public void setOdate(java.sql.Date odate);
+
+            public Customer getCustomer();
+
+            public Item getItem(int iid);
+
+            public DirectIterable<Item> getItems();
+
+            public void save();
+        }
+    }
+
+    static class Test$Customer extends com.akiban.direct.AbstractDirectObject implements Iface.Customer {
+        static {
+            __init("test", "customers", "cid:cid:int:0:-1,name:name:String:-1:-1");
+        }
+
+        public int getCid() {
+            return __getINT(0);
+        }
+
+        public void setCid(int cid) {
+            __setINT(0, cid);
+        }
+
+        public String getName() {
+            return __getVARCHAR(1);
+        }
+
+        public void setName(String name) {
+            __setVARCHAR(1, name);
+        }
+
+        public Iface.Address getAddress(int aid) {
+            return (new com.akiban.direct.DirectIterableImpl<Iface.Address>(Iface.Address.class, "addresses", this))
+                    .where("cid", Integer.valueOf(getCid())).where("aid", Integer.valueOf(aid)).single();
+        }
+
+        public com.akiban.direct.DirectIterable<Iface.Address> getAddresses() {
+            return (new com.akiban.direct.DirectIterableImpl<Iface.Address>(Iface.Address.class, "addresses", this)).where("cid",
+                    Integer.valueOf(getCid()));
+        }
+
+        public Iface.Order getOrder(int oid) {
+            return (new com.akiban.direct.DirectIterableImpl<Iface.Order>(Iface.Order.class, "orders", this))
+                    .where("cid", Integer.valueOf(getCid())).where("oid", Integer.valueOf(oid)).single();
+        }
+
+        public com.akiban.direct.DirectIterable<Iface.Order> getOrders() {
+            return (new com.akiban.direct.DirectIterableImpl<Iface.Order>(Iface.Order.class, "orders", this)).where("cid",
+                    Integer.valueOf(getCid()));
+        }
+
+    }
+
+    static class Test$Order extends com.akiban.direct.AbstractDirectObject implements Iface.Order {
+        static {
+            __init("test", "orders", "oid:oid:int:0:-1,cid:cid:int:-1:0,odate:odate:Date:-1:-1");
+        }
+
+        public int getOid() {
+            return __getINT(0);
+        }
+
+        public void setOid(int oid) {
+            __setINT(0, oid);
+        }
+
+        public int getCid() {
+            return __getINT(1);
+        }
+
+        public void setCid(int cid) {
+            __setINT(1, cid);
+        }
+
+        public java.sql.Date getOdate() {
+            return __getDATE(2);
+        }
+
+        public void setOdate(java.sql.Date odate) {
+            __setDATE(2, odate);
+        }
+
+        public Iface.Item getItem(int iid) {
+            return (new com.akiban.direct.DirectIterableImpl<Iface.Item>(Iface.Item.class, "items", this))
+                    .where("oid", Integer.valueOf(getOid())).where("iid", Integer.valueOf(iid)).single();
+        }
+
+        public com.akiban.direct.DirectIterable<Iface.Item> getItems() {
+            return (new com.akiban.direct.DirectIterableImpl<Iface.Item>(Iface.Item.class, "items", this)).where("oid",
+                    Integer.valueOf(getOid()));
+        }
+
+        public Iface.Customer getCustomer() {
+            return (new com.akiban.direct.DirectIterableImpl<Iface.Customer>(Iface.Customer.class, "customers", this))
+                    .where("cid", Integer.valueOf(getCid())).single();
+        }
+
+    }
+
+    static class Test$Item extends com.akiban.direct.AbstractDirectObject implements Iface.Item {
+        static {
+            __init("test", "items", "iid:iid:int:0:-1,oid:oid:int:-1:0,sku:sku:String:-1:-1");
+        }
+
+        public int getIid() {
+            return __getINT(0);
+        }
+
+        public void setIid(int iid) {
+            __setINT(0, iid);
+        }
+
+        public int getOid() {
+            return __getINT(1);
+        }
+
+        public void setOid(int oid) {
+            __setINT(1, oid);
+        }
+
+        public String getSku() {
+            return __getVARCHAR(2);
+        }
+
+        public void setSku(String sku) {
+            __setVARCHAR(2, sku);
+        }
+
+        public Iface.Order getOrder() {
+            return (new com.akiban.direct.DirectIterableImpl<Iface.Order>(Iface.Order.class, "orders", this)).where(
+                    "oid", Integer.valueOf(getOid())).single();
+        }
+
+    }
+
+    static class Test$Address extends com.akiban.direct.AbstractDirectObject implements Iface.Address {
+        static {
+            __init("test", "addresses",
+                    "aid:aid:int:0:-1,cid:cid:int:-1:0,state:state:String:-1:-1,city:city:String:-1:-1");
+        }
+
+        public int getAid() {
+            return __getINT(0);
+        }
+
+        public void setAid(int aid) {
+            __setINT(0, aid);
+        }
+
+        public int getCid() {
+            return __getINT(1);
+        }
+
+        public void setCid(int cid) {
+            __setINT(1, cid);
+        }
+
+        public String getState() {
+            return __getVARCHAR(2);
+        }
+
+        public void setState(String state) {
+            __setVARCHAR(2, state);
+        }
+
+        public String getCity() {
+            return __getVARCHAR(3);
+        }
+
+        public void setCity(String city) {
+            __setVARCHAR(3, city);
+        }
+
+        public Iface.Customer getCustomer() {
+            return (new com.akiban.direct.DirectIterableImpl<Iface.Customer>(Iface.Customer.class, "customers", this))
+                    .where("cid", Integer.valueOf(getCid())).single();
+        }
+
+    }
+    
+    static void registerDirect() {
+        Direct.registerDirectObjectClass(Iface.Address.class, Test$Address.class);
+        Direct.registerDirectObjectClass(Iface.Customer.class, Test$Customer.class);
+        Direct.registerDirectObjectClass(Iface.Order.class, Test$Order.class);
+        Direct.registerDirectObjectClass(Iface.Item.class, Test$Item.class);
+    }
+
+}

=== added file 'src/test/java/com/akiban/direct/DirectUpdateIT.java'
--- src/test/java/com/akiban/direct/DirectUpdateIT.java	1970-01-01 00:00:00 +0000
+++ src/test/java/com/akiban/direct/DirectUpdateIT.java	2013-04-26 02:16:29 +0000
@@ -0,0 +1,215 @@
+/**
+ * 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.direct;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.sql.Date;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.akiban.direct.COIDirectClasses.Iface.Customer;
+import com.akiban.direct.COIDirectClasses.Iface.Order;
+import com.akiban.server.service.servicemanager.GuicedServiceManager;
+import com.akiban.server.test.it.ITBase;
+import com.akiban.sql.RegexFilenameFilter;
+import com.akiban.sql.embedded.EmbeddedJDBCService;
+import com.akiban.sql.embedded.EmbeddedJDBCServiceImpl;
+import com.akiban.sql.embedded.JDBCConnection;
+
+public final class DirectUpdateIT extends ITBase {
+
+    private static final Logger LOG = LoggerFactory.getLogger(DirectUpdateIT.class.getName());
+
+    private static final File RESOURCE_DIR = new File("src/test/resources/"
+            + DirectUpdateIT.class.getPackage().getName().replace('.', '/'));
+
+    public static final String SCHEMA_NAME = "test";
+
+    @Override
+    protected GuicedServiceManager.BindingsConfigurationProvider serviceBindingsProvider() {
+        // JDBC service is not in test-services.
+        return super.serviceBindingsProvider().bindAndRequire(EmbeddedJDBCService.class, EmbeddedJDBCServiceImpl.class);
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        startTestServices();
+        loadDatabase();
+        Direct.enter("test", ais());
+        COIDirectClasses.registerDirect();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        Direct.unregisterDirectObjectClasses();
+        Direct.leave();
+        super.tearDownAllTables();
+    }
+
+    @Test
+    public void testGetCustomerAndInterate() throws Exception {
+        test(new TestExec() {
+            public boolean exec() throws Exception {
+                final Customer customer = new DirectIterableImpl<Customer>(
+                        Customer.class, "customers", this).where("cid=1").single();
+                assertEquals("Customer has cid", 1, customer.getCid());
+                int orderCount = 0;
+                for (Order order : customer.getOrders()) {
+                    orderCount++;
+                    assertEquals("Customer's Order's Customer is correct", customer, order.getCustomer());
+                }
+                assertEquals("Customer 1 has 2 orders", 2, orderCount);
+                return true;
+            }
+        });
+    }
+
+    @Test
+    public void insertNewOrderExpectSuccess() throws Exception {
+        test(new TestExec() {
+            public boolean exec() throws Exception {
+                final Customer customer = new DirectIterableImpl<Customer>(
+                        Customer.class, "customers", this).where("cid=1").single();
+                final Order newOrder = customer.getOrders().newInstance();
+
+                newOrder.setOid(103);
+                newOrder.setOdate(java.sql.Date.valueOf("2011-03-03"));
+                newOrder.save();
+
+                int orderCount = 0;
+                for (Order o : customer.getOrders()) {
+                    orderCount++;
+                    assertEquals("Customer's Order's Customer is correct", customer, o.getCustomer());
+                }
+                assertEquals("Customer 1 now has 3 orders", 3, orderCount);
+                return true;
+            }
+        });
+    }
+
+    @Test
+    public void updateOrderOnce() throws Exception {
+        test(new TestExec() {
+            public boolean exec() throws Exception {
+                final Customer customer = new DirectIterableImpl<Customer>(
+                        Customer.class, "customers", this).where("cid=1").single();
+                final Order order = customer.getOrder(101);
+                assertNotNull("Customer 1 has an order with oid=101", order);
+
+                order.setOid(103);
+                order.setOdate(java.sql.Date.valueOf("2011-03-03"));
+                order.save();
+
+                int orderCount = 0;
+                for (Order o : customer.getOrders()) {
+                    orderCount++;
+                    assertEquals("Customer's Order's Customer is correct", customer, o.getCustomer());
+                }
+                assertEquals("Customer 1 now has 2 orders", 2, orderCount);
+                return true;
+            }
+        });
+    }
+
+    @Test
+    public void updateMultipleOrders() throws Exception {
+        test(new TestExec() {
+            public boolean exec() throws Exception {
+                final Customer customer = new DirectIterableImpl<Customer>(
+                        Customer.class, "customers", this).where("cid=1").single();
+                for (final Order order : customer.getOrders()) {
+                    Date newDate = Date.valueOf("2013-01-" + order.getOdate().toString().substring(8));
+                    order.setOdate(newDate);
+                    order.save();
+                }
+                int orderCount = 0;
+                Timestamp after = Timestamp.valueOf("2012-12-31 23:59:59");
+                for (Order o : customer.getOrders()) {
+                    if (o.getOdate().after(after)) {
+                        orderCount++;
+                    }
+                }
+                assertEquals("Customer 1 now has 2 orders in 2013", 2, orderCount);
+                return true;
+            }
+        });
+    }
+
+    @Test
+    public void insertNewOrderExpectFailure() throws Exception {
+        test(new TestExec() {
+            public boolean exec() throws Exception {
+                final Customer customer = new DirectIterableImpl<Customer>(
+                        Customer.class, "customers", this).where("cid=1").single();
+                final Order newOrder = customer.getOrders().newInstance();
+                newOrder.setOid(101); // will collide
+                newOrder.setOdate(new java.sql.Date(System.currentTimeMillis()));
+                try {
+                    newOrder.save();
+                    fail("Should have failed");
+                } catch (DirectException e) {
+                    assertTrue("Should wrap a SQLException",
+                            SQLException.class.isAssignableFrom(e.getCause().getClass()));
+                } catch (Exception e) {
+                    fail("Wrong type of exception: " + e);
+                }
+                return false;
+            }
+        });
+    }
+
+    private void test(TestExec te) throws Exception {
+        JDBCConnection conn = (JDBCConnection) Direct.getContext().getConnection();
+        conn.beginTransaction();
+        boolean commit = false;
+        try {
+            commit = te.exec();
+        } finally {
+            if (commit) {
+                conn.commitTransaction();
+            }
+        }
+    }
+
+    interface TestExec extends DirectObject {
+        boolean exec() throws Exception;
+    }
+
+    private void loadDatabase() throws Exception {
+        File schemaFile = new File(RESOURCE_DIR, "schema.ddl");
+        if (schemaFile.exists()) {
+            LOG.info("Loading " + schemaFile);
+            loadSchemaFile(SCHEMA_NAME, schemaFile);
+        }
+        for (File data : RESOURCE_DIR.listFiles(new RegexFilenameFilter(".*\\.dat"))) {
+            LOG.info("Loading " + data);
+            loadDataFile(SCHEMA_NAME, data);
+        }
+    }
+}

=== modified file 'src/test/java/com/akiban/rest/RestServiceScriptsIT.java'
--- src/test/java/com/akiban/rest/RestServiceScriptsIT.java	2013-04-23 01:07:03 +0000
+++ src/test/java/com/akiban/rest/RestServiceScriptsIT.java	2013-04-26 02:16:29 +0000
@@ -61,7 +61,8 @@
 /**
  * Scripted tests for REST end-points. Code was largely copied from
  * RestServiceFilesIT. Difference is that this version finds files with the
- * suffix ".script" and executes the command stream located in them. Commands are:
+ * suffix ".script" and executes the command stream located in them. Commands
+ * are:
  * 
  * <pre>
  * GET address
@@ -77,6 +78,8 @@
  * HEADERS expected
  * EMPTY
  * NOTEMPTY
+ * SHOW
+ * DEBUG
  * </pre>
  * 
  * where address is a path relative the resource end-point, content is a string
@@ -93,10 +96,21 @@
  * POST    /builder/implode/test.customers @
  * </pre>
  * 
+ * The SHOW and DEBUG commands are useful for debugging. SHOW simply prints out
+ * the actual content of the last REST response. The DEBUG command calls the
+ * static method {@link #debug(int)}. You can set a debugger breakpoint inside
+ * that method.
+ * 
  * @author peter
  */
 @RunWith(NamedParameterizedRunner.class)
 public class RestServiceScriptsIT extends ITBase {
+
+    private static void debug(int lineNumber) {
+        // Set a breakpoint here to debug on DEBUG statements
+        System.out.println("DEBUG executed on line " + lineNumber);
+    }
+
     private static final Logger LOG = LoggerFactory.getLogger(RestServiceScriptsIT.class.getName());
 
     private static final File RESOURCE_DIR = new File("src/test/resources/"
@@ -241,7 +255,7 @@
 
                 switch (command) {
                 case "DEBUG":
-                    System.out.println("DEBUG executed on line " + lineNumber);
+                    debug(lineNumber);
                     break;
                 case "GET":
                 case "DELETE": {
@@ -278,7 +292,7 @@
                         error("Missing argument");
                         continue;
                     }
-                    String contents  = value(line, 2);
+                    String contents = value(line, 2);
                     executeRestCall(command, pieces[1], contents);
                     break;
                 }
@@ -295,6 +309,7 @@
                         continue;
                     }
                     if (!result.output.contains(value(line, 1))) {
+                        LOG.error("Incorrect value - actual returned value is:\n{}", result.output);
                         error("Incorrect response");
                     }
                     break;
@@ -323,6 +338,11 @@
                         error("Expected empty response");
                     }
                     break;
+                case "SHOW":
+                    int status = result.conn == null ? -1 : ((ContentExchange)result.conn).getResponseStatus(); 
+                    System.out.printf("At line %d the most recent response status is %d. " + "The value is:\n%s\n",
+                            lineNumber, status, result.output);
+                    break;
                 default:
                     result.conn = null;
                     error("Unknown script command '" + command + "'");
@@ -356,10 +376,7 @@
             result.output = getOutput(result.conn);
         } catch (Exception e) {
             result.output = e.toString();
-        } finally {
-            if (result.conn != null) {
-                fullyDisconnect(result.conn);
-            }
+            fullyDisconnect(result.conn);
         }
     }
 
@@ -399,6 +416,7 @@
 
     private void compareStrings(String assertMsg, String expected, String actual) {
         if (!expected.equals(actual)) {
+            LOG.error("Incorrect value - actual returned value is:\n{}", actual);
             error(assertMsg, diff(expected, actual));
         }
     }

=== modified file 'src/test/java/com/akiban/server/service/restdml/DirectServiceTest.java'
--- src/test/java/com/akiban/server/service/restdml/DirectServiceTest.java	2013-04-04 21:46:56 +0000
+++ src/test/java/com/akiban/server/service/restdml/DirectServiceTest.java	2013-04-26 02:16:29 +0000
@@ -19,8 +19,6 @@
 
 import org.junit.Test;
 
-import com.akiban.rest.resources.DirectResource;
-
 public class DirectServiceTest {
 
     @Test

=== added directory 'src/test/resources/com/akiban/direct'
=== added file 'src/test/resources/com/akiban/direct/addresses.dat'
--- src/test/resources/com/akiban/direct/addresses.dat	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/direct/addresses.dat	2013-04-26 02:16:29 +0000
@@ -0,0 +1,2 @@
+101	1	MA	Boston
+201	2	NY	New York

=== added file 'src/test/resources/com/akiban/direct/customers.dat'
--- src/test/resources/com/akiban/direct/customers.dat	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/direct/customers.dat	2013-04-26 02:16:29 +0000
@@ -0,0 +1,4 @@
+1	John Smith
+2	Willy Jones
+3	Jane Smith
+4	Jonathan Smyth

=== added file 'src/test/resources/com/akiban/direct/items.dat'
--- src/test/resources/com/akiban/direct/items.dat	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/direct/items.dat	2013-04-26 02:16:29 +0000
@@ -0,0 +1,3 @@
[phone]
[phone]
[phone]

=== added file 'src/test/resources/com/akiban/direct/orders.dat'
--- src/test/resources/com/akiban/direct/orders.dat	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/direct/orders.dat	2013-04-26 02:16:29 +0000
@@ -0,0 +1,3 @@
[phone]
[phone]
[phone]

=== added file 'src/test/resources/com/akiban/direct/schema.ddl'
--- src/test/resources/com/akiban/direct/schema.ddl	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/direct/schema.ddl	2013-04-26 02:16:29 +0000
@@ -0,0 +1,32 @@
+CREATE TABLE customers(
+    cid INT NOT NULL,
+    name varchar(256) COLLATE en_us_ci,
+    PRIMARY KEY(cid)
+);
+
+CREATE TABLE addresses
+(
+  aid int NOT NULL,
+  cid int NOT NULL,
+  state CHAR(2),
+  city VARCHAR(100),
+  PRIMARY KEY(aid),
+  GROUPING FOREIGN KEY (cid) REFERENCES customers(cid)
+);
+
+CREATE TABLE orders(
+    oid INT NOT NULL,
+    cid INT,
+    odate DATE,
+    PRIMARY KEY(oid),
+    GROUPING FOREIGN KEY(cid) REFERENCES customers(cid)
+);
+
+CREATE TABLE items(
+    iid INT NOT NULL,
+    oid INT,
+    sku VARCHAR(8),
+    PRIMARY KEY(iid),
+    GROUPING FOREIGN KEY(oid) REFERENCES orders(oid)
+);
+

=== modified file 'src/test/resources/com/akiban/rest/direct/direct-create.body'
--- src/test/resources/com/akiban/rest/direct/direct-create.body	2013-04-17 22:35:25 +0000
+++ src/test/resources/com/akiban/rest/direct/direct-create.body	2013-04-26 02:16:29 +0000
@@ -1,26 +1,14 @@
 function _register(registrar) {
     registrar.register(
         "method=GET path=cnames function=customer_Names in=(QP:prefix String required) out=String");
-        
-    registrar.register(
-        "method=GET path=oids/(\\d*) function=order_Numbers in=(pp:1 int required) out=String"); 
 };
 
 function customer_Names(s) {
     var result = s;
     var extent = Packages.com.akiban.direct.Direct.context.extent;
+        
     for (customer in Iterator(extent.customers)) {
       result += "," + customer.name;
     }
     return result;
 }
-
-function order_Numbers(cid) {
-    var result = s;
-    var extent = Packages.com.akiban.direct.Direct.context.extent;
-    var customer = extent.getCustomer(cid); 
-    for (order in customer.orders) {
-       result += "," + order.oid;
-    }    
-    return result;
-}

=== modified file 'src/test/resources/com/akiban/rest/direct/direct-create.expected'
--- src/test/resources/com/akiban/rest/direct/direct-create.expected	2013-04-04 21:46:56 +0000
+++ src/test/resources/com/akiban/rest/direct/direct-create.expected	2013-04-26 02:16:29 +0000
@@ -1,3 +1,3 @@
-{"functions":2}
+{"functions":1}
 
 

=== modified file 'src/test/resources/com/akiban/rest/direct/direct-demo.js'
--- src/test/resources/com/akiban/rest/direct/direct-demo.js	2013-04-04 16:07:24 +0000
+++ src/test/resources/com/akiban/rest/direct/direct-demo.js	2013-04-26 02:16:29 +0000
@@ -38,7 +38,9 @@
 }
 
 function computeTotalCompensation(empno, start, end) {
-	var emp = com.akiban.direct.Direct.context.extent.getEmployee(empno);
+	var extent = com.akiban.direct.Direct.context.extent;
+	var emp = extent.getEmployee(empno);
+	var newSalary = emp.salaries.newInstance();
 	println("Computing total compensation for employee " + empno);
 	var total = 0;
 	var today = new Date();

=== added file 'src/test/resources/com/akiban/rest/direct/direct-update.body'
--- src/test/resources/com/akiban/rest/direct/direct-update.body	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/rest/direct/direct-update.body	2013-04-26 02:16:29 +0000
@@ -0,0 +1,35 @@
+function _register(registrar) {
+    registrar.register(
+        "method=GET path=cnames function=customerNames in=(QP:prefix String required) out=String");
+    registrar.register(
+        "method=PUT path=cadd/(\\\\d+) function=addCustomer in=(PP:1 int required, JSON:name string required) out=void");
+    registrar.register(
+        "method=POST path=cchange function=changeCustomerName in=(JSON:cid int required, JSON:name string required) out=void");
+};
+
+function customerNames(s) {
+    var result = s;
+    var extent = Packages.com.akiban.direct.Direct.context.extent;
+    
+    for (customer in Iterator(extent.customers)) {
+      result += "," + customer.name;
+    }
+    return result;
+}
+
+function addCustomer(cid, name) {
+    var extent = Packages.com.akiban.direct.Direct.context.extent;
+    var customer = extent.customers.newInstance();
+    customer.cid = cid;
+    customer.name = name;
+    customer.save();
+}
+
+function changeCustomerName(cid, name) {
+    var extent = Packages.com.akiban.direct.Direct.context.extent;
+    var customer = extent.getCustomer(cid);
+    customer.setName(name);
+    customer.save();
+}
+    
+

=== modified file 'src/test/resources/com/akiban/rest/direct/direct-xref.expected'
--- src/test/resources/com/akiban/rest/direct/direct-xref.expected	2013-03-20 18:20:17 +0000
+++ src/test/resources/com/akiban/rest/direct/direct-xref.expected	2013-04-26 02:16:29 +0000
@@ -12,6 +12,5 @@
     ["getCustomer()","Customer"],
     ["getItem(iid)","Item"],
     ["getItems()",""],
-    ["copy()","Order"],
     ["save()",""]]
 }

=== modified file 'src/test/resources/com/akiban/rest/direct/test-basic-direct-functions.script'
--- src/test/resources/com/akiban/rest/direct/test-basic-direct-functions.script	2013-04-18 16:27:10 +0000
+++ src/test/resources/com/akiban/rest/direct/test-basic-direct-functions.script	2013-04-26 02:16:29 +0000
@@ -1,11 +1,11 @@
 # Install a library with two endpoints
 #
 PUT     /direct/library?module=test.proc1&language=Javascript @direct-create.body
-EQUALS  {"functions":2}\n
+EQUALS  {"functions":1}\n
 
 # Delete the library
 #
-DELETE  /direct/library?module=test.proc1&language=Javascript
+DELETE  /direct/library?module=test.proc1
 EQUALS  {"functions":0}\n
 
 # Reinstall it
@@ -26,5 +26,4 @@
 # Attempt to invoke end point should return a 404
 #
 GET     /direct/call/test.cnames?prefix=SomeOtherParameterValue
-CONTAINS Not Found
-CONTAINS 404
+HEADERS responseCode:404

=== modified file 'src/test/resources/com/akiban/rest/direct/test-direct-registration-errors.script'
--- src/test/resources/com/akiban/rest/direct/test-direct-registration-errors.script	2013-04-18 03:52:16 +0000
+++ src/test/resources/com/akiban/rest/direct/test-direct-registration-errors.script	2013-04-26 02:16:29 +0000
@@ -1,7 +1,7 @@
 # Normal registration
 #
 PUT     /direct/library?module=test.proc1&language=Javascript @direct-create.body
-EQUALS  {"functions":2}\n
+EQUALS  {"functions":1}\n
 
 # Attempt to register an invalid specification
 #
@@ -11,7 +11,7 @@
 # Register a script with no _register function
 #
 PUT     /direct/library?module=test.proc2&language=Javascript @missing-direct-create.body
-EQUALS  {"functions":2}\n
+EQUALS  {"functions":1}\n
 
 # Verify a valid script is still available
 #

=== modified file 'src/test/resources/com/akiban/rest/direct/test-invalid-endpoint-errors.script'
--- src/test/resources/com/akiban/rest/direct/test-invalid-endpoint-errors.script	2013-04-18 16:27:10 +0000
+++ src/test/resources/com/akiban/rest/direct/test-invalid-endpoint-errors.script	2013-04-26 02:16:29 +0000
@@ -1,45 +1,38 @@
 # Normal registration
 #
 PUT     /direct/library?module=test.proc1&language=Javascript @direct-create.body
-EQUALS  {"functions":2}\n
+EQUALS  {"functions":1}\n
 
 # Try mismatched methods - expect 404 errors
 #
 PUT     /direct/call/test.cnames?prefix=SomeParameterValue @
-CONTAINS 404
-CONTAINS Not Found
+HEADERS responseCode:404
 POST     /direct/call/test.cnames?prefix=SomeParameterValue @
-CONTAINS 404
-CONTAINS Not Found
+HEADERS responseCode:404
 DELETE   /direct/call/test.cnames?prefix=SomeParameterValue @
-CONTAINS 404
-CONTAINS Not Found
+HEADERS responseCode:404
 
 PUT     /direct/library?module=test.proc1&language=Javascript function _register(registrar) {registrar.register("method=GET path=x function=x in=(JSON:prefix String required) out=String");};
 GET     /direct/call/test.x|text/plain
-CONTAINS 404
-CONTAINS Not Found
+HEADERS responseCode:404
 
 # Mismatched method GET / POST
 #
 PUT     /direct/library?module=test.proc1&language=Javascript function _register(registrar) {registrar.register("method=GET path=x function=x in=(JSON:prefix String required) out=String");};
 POST    /direct/call/test.x|text/plain {"prefix": "SomeParamaterValue"}
-CONTAINS 404
-CONTAINS Not Found
+HEADERS responseCode:404
 
 # Mismatched method POST / PUT
 #
 PUT     /direct/library?module=test.proc1&language=Javascript function _register(registrar) {registrar.register("method=POST path=x function=x in=(JSON:prefix String required) out=String");};
 PUT     /direct/call/test.x|application/json {"prefix": "SomeParamaterValue"}
-CONTAINS 404
-CONTAINS Not Found
+HEADERS responseCode:404
 
 # Mismatched request type application/json / text/plain
 #
 PUT     /direct/library?module=test.proc1&language=Javascript function _register(registrar) {registrar.register("method=POST path=x function=x in=(JSON:prefix String required) out=String");};
 POST    /direct/call/test.x|text/plain {"prefix": "SomeParamaterValue"}
-CONTAINS 404
-CONTAINS Not Found
+HEADERS responseCode:404
 
 
 

=== added file 'src/test/resources/com/akiban/rest/direct/test-updates.script'
--- src/test/resources/com/akiban/rest/direct/test-updates.script	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/rest/direct/test-updates.script	2013-04-26 02:16:29 +0000
@@ -0,0 +1,31 @@
+# Install a library
+#
+PUT /direct/library?module=test.updates1&language=javascript @direct-update.body
+EQUALS  {"functions":3}\n
+
+# Verify data access
+#
+GET     /direct/call/test.cnames?prefix=SomeParameterValue
+EQUALS  SomeParameterValue,John Smith,Willy Jones,Jane Smith,Jonathan Smyth\n
+
+# Insert a new customer
+#
+PUT     /direct/call/test.cadd/5 {"name":"Mary Johnson"}
+HEADERS responseCode:200
+GET     /direct/call/test.cnames?prefix=SomeParameterValue
+EQUALS  SomeParameterValue,John Smith,Willy Jones,Jane Smith,Jonathan Smyth,Mary Johnson\n
+
+# Modify customer name
+#
+POST    /direct/call/test.cchange {"cid":5, "name":"Mary Johnston"}
+HEADERS responseCode:200
+GET     /direct/call/test.cnames?prefix=SomeParameterValue
+EQUALS  SomeParameterValue,John Smith,Willy Jones,Jane Smith,Jonathan Smyth,Mary Johnston\n
+
+# Cause a duplicate key error
+#
+PUT     /direct/call/test.cadd/5 {"name":"Mary Johnson"}
+CONTAINS Non-unique key
+HEADERS responseCode:409
+
+