AfflictionNetworks/depot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch from Zell to fix index bits.

Browse Source
This commit is contained in:
Michael Bayne
2007-01-30 20:57:38 +00:00
parent 0a3bcdbfcc
commit d6156c201a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/samskivert/jdbc/depot/DepotMarshaller.java
+4 -2
View File
@@ -761,7 +761,8 @@ public class DepotMarshaller<T extends PersistentRecord>
log.info("Adding primary key to " + getTableName() + ": " + pkdef); log.info("Adding primary key to " + getTableName() + ": " + pkdef);
ctx.invoke(new Modifier.Simple("alter table " + getTableName() + " add " + pkdef)); ctx.invoke(new Modifier.Simple("alter table " + getTableName() + " add " + pkdef));
} else if (!hasPrimaryKey() && indexColumns.remove("PRIMARY") != null) { } else if (!hasPrimaryKey() && indexColumns.containsKey("PRIMARY")) {
indexColumns.remove("PRIMARY");
log.info("Dropping primary from " + getTableName()); log.info("Dropping primary from " + getTableName());
ctx.invoke(new Modifier.Simple("alter table " + getTableName() + " drop primary key")); ctx.invoke(new Modifier.Simple("alter table " + getTableName() + " drop primary key"));
} }
@@ -769,7 +770,8 @@ public class DepotMarshaller<T extends PersistentRecord>
// add any missing indices // add any missing indices
Entity entity = _pclass.getAnnotation(Entity.class); Entity entity = _pclass.getAnnotation(Entity.class);
for (Index index : (entity == null ? new Index[0] : entity.indices())) { for (Index index : (entity == null ? new Index[0] : entity.indices())) {
if (indexColumns.remove(index.name()) != null) { if (indexColumns.containsKey(index.name())) {
indexColumns.remove(index.name());
continue; continue;
} }
String indexdef = "create " + index.type() + " index " + index.name() + String indexdef = "create " + index.type() + " index " + index.name() +