Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TeamCity commits left two files behind 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@880929 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Pinaki Poddar 2009-11-16 19:45:40 +00:00
parent 9c275904f3
commit cbde4958f3
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java
View File

@ -539,7 +539,9 @@ public class MappingDefaultsImpl
else if (_dsIdName != null)
cols[i].setName(_dsIdName + i);
correctName(table, cols[i]);
table.addSubColumn(cols[i].getName());
}
table.resetSubColumns();
}
/**
@ -551,9 +553,7 @@ public class MappingDefaultsImpl
String name = col.getName();
if (_removeHungarianNotation)
name = removeHungarianNotation(name);
String correctedName = dict.getValidColumnName(name, table);
col.setName(correctedName);
table.addCorrectedColumnName(correctedName, true);
col.setName(dict.getValidColumnName(name, table));
}
}
@ -584,7 +584,9 @@ public class MappingDefaultsImpl
} else if (_versName != null)
cols[i].setName(_versName + i);
correctName(table, cols[i]);
table.addSubColumn(cols[i].getName());
}
table.resetSubColumns();
}
public void populateColumns(Discriminator disc, Table table,
@ -595,7 +597,9 @@ public class MappingDefaultsImpl
else if (_discName != null)
cols[i].setName(_discName + i);
correctName(table, cols[i]);
table.addSubColumn(cols[i].getName());
}
table.resetSubColumns();
}
public void populateJoinColumn(ClassMapping cm, Table local, Table foreign,
@ -620,8 +624,11 @@ public class MappingDefaultsImpl
public void populateColumns(ValueMapping vm, String name, Table table,
Column[] cols) {
for (int i = 0; i < cols.length; i++)
for (int i = 0; i < cols.length; i++) {
correctName(table, cols[i]);
table.addSubColumn(cols[i].getName());
}
table.resetSubColumns();
}
public boolean populateOrderColumns(FieldMapping fm, Table table,
@ -632,7 +639,9 @@ public class MappingDefaultsImpl
else if (_orderName != null)
cols[i].setName(_orderName + i);
correctName(table, cols[i]);
table.addSubColumn(cols[i].getName());
}
table.resetSubColumns();
return _orderLists && (JavaTypes.ARRAY == fm.getTypeCode()
|| List.class.isAssignableFrom(fm.getType()));
}
@ -645,7 +654,9 @@ public class MappingDefaultsImpl
else if (_nullIndName != null)
cols[i].setName(_nullIndName + i);
correctName(table, cols[i]);
table.addSubColumn(cols[i].getName());
}
table.resetSubColumns();
return _addNullInd;
}

2
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java
View File

@ -144,7 +144,7 @@ public class SchemaGroup
tab.importIndex(idxs[j]);
unqs = tables[i].getUniques();
for (int j = 0; j < unqs.length; j++)
tab.importUnique(unqs[j], null);
tab.importUnique(unqs[j]);
}
return copy;
}