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

* Compute isRelational() at runtime, since in some border cases

Browse source 
it must be available before we used to compute it  in update().
This commit is contained in:
hns 2007-01-31 14:43:15 +00:00
parent a874998ffb
commit 740091f4d8
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -120,9 +120,6 @@ public final class DbMapping {
// Set of mappings that depend on us and should be forwarded last data change events // Set of mappings that depend on us and should be forwarded last data change events
HashSet dependentMappings = new HashSet(); HashSet dependentMappings = new HashSet();
// flag that tells us whether this maps to a relational db
private boolean relational = false;
/** /**
* Create an empty DbMapping * Create an empty DbMapping
*/ */
@ -245,13 +242,9 @@ public final class DbMapping {
dbSourceName = null; dbSourceName = null;
dbSource = null; dbSource = null;
} }
// set/update relational flag
relational = dbSourceName != null || parentMapping.isRelational();
} }
} else { } else {
parentMapping = null; parentMapping = null;
// set/update relational flag
relational = dbSourceName != null;
} }
if (inheritsStorage() && getPrototypeField() == null) { if (inheritsStorage() && getPrototypeField() == null) {
@ -924,7 +917,7 @@ public final class DbMapping {
* not what we want. * not what we want.
*/ */
public boolean isRelational() { public boolean isRelational() {
return relational; return dbSourceName != null || (parentMapping != null && parentMapping.isRelational());
} }
/** /**
@ -1396,7 +1389,7 @@ public final class DbMapping {
// note: tableName and dbSourceName are nulled out in update() if they // note: tableName and dbSourceName are nulled out in update() if they
// are inherited from the parent mapping. This way we know that // are inherited from the parent mapping. This way we know that
// storage is not inherited if either of them is not null. // storage is not inherited if either of them is not null.
return relational && parentMapping != null return isRelational() && parentMapping != null
&& tableName == null && dbSourceName == null; && tableName == null && dbSourceName == null;
} }