Merge lp:~tjoneslo/akiban-server/json-entity-name-collision-resolution into lp:~akiban-technologies/akiban-server/trunk
Proposed by
Thomas Jones-Low
Status: | Merged |
---|---|
Approved by: | Nathan Williams |
Approved revision: | 2610 |
Merged at revision: | 2608 |
Proposed branch: | lp:~tjoneslo/akiban-server/json-entity-name-collision-resolution |
Merge into: | lp:~akiban-technologies/akiban-server/trunk |
Diff against target: |
255 lines (+135/-26) 4 files modified
src/main/java/com/akiban/ais/model/AISMerge.java (+1/-0) src/main/java/com/akiban/ais/model/UserTable.java (+41/-10) src/main/java/com/akiban/server/service/externaldata/TableRowTracker.java (+1/-16) src/test/java/com/akiban/ais/model/AISBuilderTest.java (+92/-0) |
To merge this branch: | bzr merge lp:~tjoneslo/akiban-server/json-entity-name-collision-resolution |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Thomas Jones-Low | Approve | ||
Nathan Williams | Needs Fixing | ||
Review via email: mp+156724@code.launchpad.net |
Description of the change
Address potential name collision between fields and collections (Tables) in the JSON output. When the AISBuilder completes the process of building an AIS, the UserTable@
AISMerge#
UserTable@
TableRowTracker - Update the tracker to use the UserTable unique name, rather than generating it on the fly.
AISBuilderTest - add tests for the UserTable name generate.
To post a comment you must log in.
Looks pretty good.
I think we can skip the "is same schema" logic. That was really working around the collapsed namespace issue, which this branch does explicitly.
Since they must be unused, can you delete the commented out members on UserTable?