mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-19 23:02:24 +00:00
No effective code change: Normalized "DdlWrite write" to "DdlWrite writer"
This commit is contained in:
1 parent
29a5a13dd9
commit
2dfa9d2e77
17 files changed
+228
-224
No files matched your search
+12
-12
@@ -35,7 +35,7 @@ public class CurrentModel {
|
||||
|
||||
private ModelContainer model;
|
||||
private ChangeSet changeSet;
|
||||
private DdlWrite write;
|
||||
private DdlWrite writer;
|
||||
|
||||
/**
|
||||
* Construct with a given EbeanServer instance for DDL create all generation, not migration.
|
||||
@@ -127,10 +127,10 @@ public class CurrentModel {
|
||||
if (jaxbPresent) {
|
||||
addExtraDdl(ddl, ExtraDdlXmlReader.readBuiltin(), "-- init script ");
|
||||
}
|
||||
ddl.append(write.apply().getBuffer());
|
||||
ddl.append(write.applyForeignKeys().getBuffer());
|
||||
ddl.append(write.applyHistoryView().getBuffer());
|
||||
ddl.append(write.applyHistoryTrigger().getBuffer());
|
||||
ddl.append(writer.apply().getBuffer());
|
||||
ddl.append(writer.applyForeignKeys().getBuffer());
|
||||
ddl.append(writer.applyHistoryView().getBuffer());
|
||||
ddl.append(writer.applyHistoryTrigger().getBuffer());
|
||||
return ddl.toString();
|
||||
}
|
||||
|
||||
@@ -157,8 +157,8 @@ public class CurrentModel {
|
||||
if (ddlHeader != null && !ddlHeader.isEmpty()) {
|
||||
ddl.append(ddlHeader).append('\n');
|
||||
}
|
||||
ddl.append(write.dropAllForeignKeys().getBuffer());
|
||||
ddl.append(write.dropAll().getBuffer());
|
||||
ddl.append(writer.dropAllForeignKeys().getBuffer());
|
||||
ddl.append(writer.dropAll().getBuffer());
|
||||
return ddl.toString();
|
||||
}
|
||||
|
||||
@@ -166,13 +166,13 @@ public class CurrentModel {
|
||||
* Create all the DDL based on the changeSet.
|
||||
*/
|
||||
private void createDdl() {
|
||||
if (write == null) {
|
||||
if (writer == null) {
|
||||
ChangeSet createChangeSet = getChangeSet();
|
||||
write = new DdlWrite(new MConfiguration(), model, ddlOptions);
|
||||
writer = new DdlWrite(new MConfiguration(), model, ddlOptions);
|
||||
DdlHandler handler = handler();
|
||||
handler.generateProlog(write);
|
||||
handler.generate(write, createChangeSet);
|
||||
handler.generateEpilog(write);
|
||||
handler.generateProlog(writer);
|
||||
handler.generate(writer, createChangeSet);
|
||||
handler.generateEpilog(writer);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+16
-15
@@ -39,23 +39,24 @@ public class PlatformDdlWriter {
|
||||
/**
|
||||
* Write the migration as platform specific ddl.
|
||||
*/
|
||||
public void processMigration(Migration dbMigration, DdlWrite write, File writePath, String fullVersion) throws IOException {
|
||||
public void processMigration(Migration dbMigration, DdlWrite writer, File writePath, String fullVersion)
|
||||
throws IOException {
|
||||
DdlHandler handler = handler();
|
||||
handler.generateProlog(write);
|
||||
handler.generateProlog(writer);
|
||||
if (lockTimeoutSeconds > 0) {
|
||||
String lockSql = platformDdl.setLockTimeout(lockTimeoutSeconds);
|
||||
if (lockSql != null) {
|
||||
write.apply().append(lockSql).endOfStatement().newLine();
|
||||
writer.apply().append(lockSql).endOfStatement().newLine();
|
||||
}
|
||||
}
|
||||
List<ChangeSet> changeSets = dbMigration.getChangeSet();
|
||||
for (ChangeSet changeSet : changeSets) {
|
||||
if (isApply(changeSet)) {
|
||||
handler.generate(write, changeSet);
|
||||
handler.generate(writer, changeSet);
|
||||
}
|
||||
}
|
||||
handler.generateEpilog(write);
|
||||
writePlatformDdl(write, writePath, fullVersion);
|
||||
handler.generateEpilog(writer);
|
||||
writePlatformDdl(writer, writePath, fullVersion);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -68,10 +69,10 @@ public class PlatformDdlWriter {
|
||||
/**
|
||||
* Write the ddl files.
|
||||
*/
|
||||
protected void writePlatformDdl(DdlWrite write, File resourcePath, String fullVersion) throws IOException {
|
||||
if (!write.isApplyEmpty()) {
|
||||
protected void writePlatformDdl(DdlWrite writer, File resourcePath, String fullVersion) throws IOException {
|
||||
if (!writer.isApplyEmpty()) {
|
||||
try (Writer applyWriter = createWriter(resourcePath, fullVersion, ".sql")) {
|
||||
writeApplyDdl(applyWriter, write);
|
||||
writeApplyDdl(applyWriter, writer);
|
||||
applyWriter.flush();
|
||||
}
|
||||
}
|
||||
@@ -85,18 +86,18 @@ public class PlatformDdlWriter {
|
||||
/**
|
||||
* Write the 'Apply' DDL buffers to the writer.
|
||||
*/
|
||||
protected void writeApplyDdl(Writer writer, DdlWrite write) throws IOException {
|
||||
protected void writeApplyDdl(Writer writer, DdlWrite ddl) throws IOException {
|
||||
String header = databaseConfig.getDdlHeader();
|
||||
if (header != null && !header.isEmpty()) {
|
||||
writer.append(header).append('\n');
|
||||
}
|
||||
// merge the apply buffers in the appropriate order
|
||||
prependDropDependencies(writer, write.applyDropDependencies());
|
||||
prependDropDependencies(writer, ddl.applyDropDependencies());
|
||||
writer.append("-- apply changes\n");
|
||||
writer.append(write.apply().getBuffer());
|
||||
writer.append(write.applyForeignKeys().getBuffer());
|
||||
writer.append(write.applyHistoryView().getBuffer());
|
||||
writer.append(write.applyHistoryTrigger().getBuffer());
|
||||
writer.append(ddl.apply().getBuffer());
|
||||
writer.append(ddl.applyForeignKeys().getBuffer());
|
||||
writer.append(ddl.applyHistoryView().getBuffer());
|
||||
writer.append(ddl.applyHistoryTrigger().getBuffer());
|
||||
}
|
||||
|
||||
private void prependDropDependencies(Writer writer, DdlBuffer buffer) throws IOException {
|
||||
|
||||
Reference in new issue
Block a user