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

Make sure we use the up to date metadata when doing our stale column check.

Browse Source
This commit is contained in:
Michael Bayne
2008-10-22 01:09:22 +00:00
parent 19287550f4
commit ba97743754
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/samskivert/jdbc/depot/DepotMarshaller.java
+6 -3
View File
@@ -641,9 +641,10 @@ public class DepotMarshaller<T extends PersistentRecord>
if (!metaData.tableExists) { if (!metaData.tableExists) {
// if the table does not exist, create it // if the table does not exist, create it
createTable(ctx, builder, declarations); createTable(ctx, builder, declarations);
metaData = TableMetaData.load(ctx, getTableName());
} else { } else {
// if it does exist, run our migrations // if it does exist, run our migrations
runMigrations(ctx, metaData, builder, currentVersion); metaData = runMigrations(ctx, metaData, builder, currentVersion);
} }
// check for stale columns now that the table is up to date // check for stale columns now that the table is up to date
@@ -720,8 +721,8 @@ public class DepotMarshaller<T extends PersistentRecord>
}); });
} }
protected void runMigrations (PersistenceContext ctx, TableMetaData metaData, protected TableMetaData runMigrations (PersistenceContext ctx, TableMetaData metaData,
final SQLBuilder builder, int currentVersion) final SQLBuilder builder, int currentVersion)
throws DatabaseException throws DatabaseException
{ {
log.info("Migrating " + getTableName() + " from " + currentVersion + " to " + log.info("Migrating " + getTableName() + " from " + currentVersion + " to " +
@@ -932,6 +933,8 @@ public class DepotMarshaller<T extends PersistentRecord>
} }
}); });
} }
return metaData;
} }
// translate an array of field names to an array of column names // translate an array of field names to an array of column names