github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1279 - Change ObjectFactory method to match, tidy format (no real change here)

Browse Source
This commit is contained in:
Rob Bygrave
2018-02-26 14:32:38 +13:00
parent da7bb834e7
commit cec65cc888
4 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java
-1
View File
@@ -77,7 +77,6 @@ public interface TableDdl {
/**
* Writes alter foreign key statements.
* @throws IOException
*/
void generate(DdlWrite writer, AlterForeignKey alterForeignKey) throws IOException;
src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+1 -3
View File
@@ -663,9 +663,7 @@ public class BaseTableDdl implements TableDdl {
@Override
public void generate(DdlWrite writer, AlterForeignKey alterForeignKey) throws IOException {
if (DdlHelp.isDropForeignKey(alterForeignKey.getColumnNames())) {
String ddl = platformDdl.alterTableDropForeignKey(alterForeignKey.getTableName(),
alterForeignKey.getName());
String ddl = platformDdl.alterTableDropForeignKey(alterForeignKey.getTableName(), alterForeignKey.getName());
if (hasValue(ddl)) {
writer.apply().append(ddl).endOfStatement();
}
src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java
+2 -2
View File
@@ -195,9 +195,9 @@ public class ObjectFactory {
}
/**
* Create an instance of {@link CompoundUniqueConstraint }
* Create an instance of {@link AddUniqueConstraint }
*/
public AddUniqueConstraint createCompoundUniqueConstraint() {
public AddUniqueConstraint createAddUniqueConstraint() {
return new AddUniqueConstraint();
}
src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
+2 -5
View File
@@ -169,8 +169,7 @@ public class MTable {
}
List<UniqueConstraint> uqConstraints = createTable.getUniqueConstraint();
for (UniqueConstraint uq : uqConstraints) {
MCompoundUniqueConstraint mUq = new MCompoundUniqueConstraint(
SplitColumns.split(uq.getColumnNames()), uq.isOneToOne(), uq.getName());
MCompoundUniqueConstraint mUq = new MCompoundUniqueConstraint(SplitColumns.split(uq.getColumnNames()), uq.isOneToOne(), uq.getName());
mUq.setNullableColumns(SplitColumns.split(uq.getNullableColumns()));
uniqueConstraints.add(mUq);
}
@@ -185,8 +184,7 @@ public class MTable {
}
public void addForeignKey(String name, String refTableName, String indexName, String columnNames,
String refColumnNames) {
public void addForeignKey(String name, String refTableName, String indexName, String columnNames, String refColumnNames) {
MCompoundForeignKey foreignKey = new MCompoundForeignKey(name, refTableName, indexName);
String[] cols = SplitColumns.split(columnNames);
String[] refCols = SplitColumns.split(refColumnNames);
@@ -194,7 +192,6 @@ public class MTable {
foreignKey.addColumnPair(cols[i], refCols[i]);
}
addForeignKey(foreignKey);
}
/**