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

Always return our own DbColumns[]. This is needed in order to add/change mappings

Browse source 
in extended prototypes.
This commit is contained in:
hns 2003-11-18 17:36:13 +00:00
parent b97ba99e22
commit 6453f53bd9
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -810,9 +810,9 @@ public final class DbMapping implements Updatable {
this); this);
} }
if ((dbSource == null) && (parentMapping != null)) { /* if ((dbSource == null) && (parentMapping != null)) {
return parentMapping.getColumns(); return parentMapping.getColumns();
} } */
// Use local variable cols to avoid synchronization (schema may be nulled elsewhere) // Use local variable cols to avoid synchronization (schema may be nulled elsewhere)
if (columns == null) { if (columns == null) {
@ -845,9 +845,7 @@ public final class DbMapping implements Updatable {
Relation rel = columnNameToRelation(colName); Relation rel = columnNameToRelation(colName);
DbColumn col = new DbColumn(colName, meta.getColumnType(i + 1), rel, this); DbColumn col = new DbColumn(colName, meta.getColumnType(i + 1), rel, this);
// if (col.isMapped()) {
list.add(col); list.add(col);
// }
} }
columns = new DbColumn[list.size()]; columns = new DbColumn[list.size()];
columns = (DbColumn[]) list.toArray(columns); columns = (DbColumn[]) list.toArray(columns);