lp:~pbeaman/akiban-server/direct-updates

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:~akiban-technologies/akiban-server/trunk

Peter Beaman: Disapprove on 2013-04-23

Diff: 1961 lines (+1278/-171)

25 files modified

src/main/java/com/akiban/direct/AbstractDirectObject.java (+449/-33)
src/main/java/com/akiban/direct/ClassBuilder.java (+73/-16)
src/main/java/com/akiban/direct/ClassObjectWriter.java (+3/-18)
src/main/java/com/akiban/direct/ClassSourceWriter.java (+8/-34)
src/main/java/com/akiban/direct/ClassXRefWriter.java (+5/-5)
src/main/java/com/akiban/direct/Direct.java (+16/-6)
src/main/java/com/akiban/direct/DirectColumn.java (+35/-0)
src/main/java/com/akiban/direct/DirectIterable.java (+2/-1)
src/main/java/com/akiban/direct/DirectIterableImpl.java (+31/-20)
src/main/java/com/akiban/rest/resources/DirectResource.java (+0/-17)
src/main/java/com/akiban/server/service/restdml/DirectServiceImpl.java (+0/-4)
src/main/java/com/akiban/server/types3/TClassBase.java (+2/-0)
src/main/java/com/akiban/sql/embedded/JDBCResultSet.java (+19/-0)
src/test/java/com/akiban/direct/COIDirectClasses.java (+314/-0)
src/test/java/com/akiban/direct/DirectUpdateIT.java (+237/-0)
src/test/java/com/akiban/server/service/restdml/DirectServiceTest.java (+0/-2)
src/test/resources/com/akiban/direct/addresses.dat (+2/-0)
src/test/resources/com/akiban/direct/customers.dat (+4/-0)
src/test/resources/com/akiban/direct/items.dat (+3/-0)
src/test/resources/com/akiban/direct/orders.dat (+3/-0)
src/test/resources/com/akiban/direct/schema.ddl (+59/-0)
src/test/resources/com/akiban/rest/direct/direct-create.body (+8/-12)
src/test/resources/com/akiban/rest/direct/direct-create.check_expected (+1/-1)
src/test/resources/com/akiban/rest/direct/direct-create.expected (+1/-1)
src/test/resources/com/akiban/rest/direct/direct-demo.js (+3/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2624. By Peter Beaman on 2013-04-16

Fix breakage in PostgresServerMiscYamlIT

2623. By Peter Beaman on 2013-04-16

Cleanup

2622. By Peter Beaman on 2013-04-16

merge from trunk

2621. By Peter Beaman on 2013-04-16

DirectUpdateIT now passes

2620. By Peter Beaman on 2013-04-16

Passes first test

2619. By Peter Beaman on 2013-04-16

Updates now work a little

2618. By Peter Beaman on 2013-04-12

Progress - but save() not implemented yet

2617. By Akiban Build User on 2013-04-08

merge pbeaman: A lot of tests still need to be done, but I would appreciate a review at this point.

https://code.launchpad.net/~pbeaman/akiban-server/direct-param-handling/+merge/156711

2616. By Akiban Build User on 2013-04-08

merge oontvoo: fix assertion error in boolean expression (bug 1084743)

https://code.launchpad.net/~oontvoo/akiban-server/assertion-error-bug1084743/+merge/157504

2615. By Akiban Build User on 2013-04-07

merge nwilliams: Change ajdax to jonquil.

https://code.launchpad.net/~nwilliams/akiban-server/ajdax-to-jonquil/+merge/157425