antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 5 Projects Releases 5 Activity Actions

* Mark object references as COMPLEX_REFERENCE if the foreign key column is also

Browse source 
mapped as primitive property. Fixes bug 555.
  <http://helma.org/bugs/show_bug.cgi?id=555>
* Get group mapping from parent DbMapping. Fixes bug 553.
  <http://helma.org/bugs/show_bug.cgi?id=553>
This commit is contained in:
hns 2007-09-21 09:31:15 +00:00
parent 9395ebcd06
commit 74b3b217ee
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/helma/objectmodel/db/DbMapping.java
View file

@ -310,9 +310,16 @@ public final class DbMapping {
// check if we're overwriting another relation // check if we're overwriting another relation
// if so, primitive relations get precendence to references // if so, primitive relations get precendence to references
if (old != null) { if (old != null) {
app.logEvent("*** Duplicate mapping for " + typename + "." + rel.columnName); if (rel.isPrimitive() && old.isPrimitive()) {
if (old.isPrimitive()) { app.logEvent("*** Duplicate mapping for " + typename + "." + rel.columnName);
} else if (rel.isReference() && old.isPrimitive()) {
// if a column is used both in a primitive and a reference mapping,
// use primitive mapping as primary one and mark reference as
// complex so it will be fetched separately
d2p.put(old.columnName.toLowerCase(), old); d2p.put(old.columnName.toLowerCase(), old);
rel.reftype = Relation.COMPLEX_REFERENCE;
} else if (rel.isPrimitive() && old.isReference()) {
old.reftype = Relation.COMPLEX_REFERENCE;
} }
} }
} }
@ -738,11 +745,11 @@ public final class DbMapping {
* db-mapping with the right relations to create the group-by nodes * db-mapping with the right relations to create the group-by nodes
*/ */
public synchronized DbMapping getGroupbyMapping() { public synchronized DbMapping getGroupbyMapping() {
if ((subRelation == null) || (subRelation.groupby == null)) { if ((subRelation == null) && (parentMapping != null)) {
return parentMapping.getGroupbyMapping();
} else if (subRelation.groupby == null) {
return null; return null;
} } else if (groupbyMapping == null) {
if (groupbyMapping == null) {
initGroupbyMapping(); initGroupbyMapping();
} }