Merge lp:~mmcm/akiban-server/pg-returning-json-with-meta-data into lp:~akiban-technologies/akiban-server/trunk

[Mike McMahon]

OutputFormat json_with_meta_data meets INSERT ... RETURNING.

One line fix. Includes a simple test.

[Thomas Jones-Low (tjoneslo)]

I'm assuming this works correctly with UPDATE...RETURNING and DELETE...RETURNING?

review: Needs Information

[Mike McMahon (mmcm)]

I have no reason to doubt that it does, since they go through the same code path. There was only an INSERT YAML test before for JSON, so I didn't go overboard for JSON w/meta-data.

[Thomas Jones-Low (tjoneslo)]

Good enough for me.

review: Approve

=== modified file 'src/main/java/com/akiban/sql/pg/PostgresModifyOperatorStatement.java'
--- src/main/java/com/akiban/sql/pg/PostgresModifyOperatorStatement.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/sql/pg/PostgresModifyOperatorStatement.java	2013-04-23 20:47:27 +0000
@@ -153,6 +153,7 @@
                 PostgresOutputter<Row> outputter = null;
                 if (outputResult) {
                     outputter = getRowOutputter(context);
+                    outputter.beforeData();
                 }
                 Row row;
                 while ((row = cursor.next()) != null) {

=== modified file 'src/test/resources/com/akiban/sql/pg/yaml/functional/test-json-output-format.yaml'
--- src/test/resources/com/akiban/sql/pg/yaml/functional/test-json-output-format.yaml	2012-09-26 03:50:12 +0000
+++ src/test/resources/com/akiban/sql/pg/yaml/functional/test-json-output-format.yaml	2013-04-23 20:47:27 +0000
@@ -36,5 +36,13 @@
 - Statement: INSERT INTO t2(n) VALUES(5),(6) RETURNING id;
 - output: [['{"id":1}'],['{"id":2}']]
 ---
+- Statement: SET OutputFormat TO 'json_with_meta_data';
+---
+- Statement: SELECT * FROM t ORDER BY id
+- output: [['[{"name":"id","oid":23,"type":"INTEGER NOT NULL"},{"name":"name","oid":1043,"type":"VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL","length":32}]'],['{"id":1,"name":"abc"}'],["{\"id\":2,\"name\":\"abc'xyz\"}"],["{\"id\":3,\"name\":\"abc\\\"xyz\"}"],["{\"id\":4,\"name\":\"abc\\nxyz\"}"],["{\"id\":5,\"name\":\"\\u2603\"}"]]
+---
+- Statement: INSERT INTO t2(n) VALUES(7),(8) RETURNING id;
+- output: [['[{"name":"id","oid":23,"type":"INTEGER NOT NULL"}]'],['{"id":3}'],['{"id":4}']]
+---
 - Statement: SET OutputFormat TO DEFAULT;
 ...
\ No newline at end of file