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

Added some lowerTableNames

Browse Source
This commit is contained in:
Roland Praml
2022-03-17 15:37:46 +01:00
parent 09727efb66
commit b93775c8be
9 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/AbstractHanaDdl.java
+1 -1
View File
@@ -194,7 +194,7 @@ public abstract class AbstractHanaDdl extends PlatformDdl {
@Override
protected DdlAlterTable alterTable(DdlWrite writer, String tableName) {
return writer.applyAlterTable(tableName, HanaAlterTableWrite::new);
return writer.applyAlterTable(lowerTableName(tableName), HanaAlterTableWrite::new);
}
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+1 -1
View File
@@ -223,7 +223,7 @@ public class BaseTableDdl implements TableDdl {
String partitionMode = createTable.getPartitionMode();
DdlBuffer apply = writer.apply();
apply.append(platformDdl.getCreateTableCommandPrefix()).append(" ").append(tableName).append(" (");
apply.append(platformDdl.getCreateTableCommandPrefix()).append(" ").append(lowerTableName(tableName)).append(" (");
writeTableColumns(apply, columns, identity);
writeUniqueConstraints(apply, createTable);
writeCompoundUniqueConstraints(apply, createTable);
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java
+1 -1
View File
@@ -174,7 +174,7 @@ public class DB2Ddl extends PlatformDdl {
@Override
protected DdlAlterTable alterTable(DdlWrite writer, String tableName) {
return writer.applyAlterTable(tableName, Db2AlterTableWrite::new);
return writer.applyAlterTable(lowerTableName(tableName), Db2AlterTableWrite::new);
};
static class Db2AlterTableWrite extends BaseAlterTableWrite {
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Db2HistoryDdl.java
+2 -1
View File
@@ -39,7 +39,8 @@ public class Db2HistoryDdl implements PlatformHistoryDdl {
String historyTableName = tableName + historySuffix;
DdlBuffer apply = writer.applyPostAlter();
apply.append(platformDdl.getCreateTableCommandPrefix()).append(" ").append(historyTableName).append(" (").newLine();
apply.append(platformDdl.getCreateTableCommandPrefix()).append(" ")
.append(platformDdl.lowerTableName(historyTableName)).append(" (").newLine();
// create history table
Collection<MColumn> cols = table.allColumns();
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
+9 -7
View File
@@ -172,7 +172,8 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
}
protected void createHistoryTableAs(DdlBuffer apply, MTable table) {
apply.append(platformDdl.getCreateTableCommandPrefix()).append(" ").append(table.getName()).append(historySuffix).append("(").newLine();
apply.append(platformDdl.getCreateTableCommandPrefix()).append(" ")
.append(platformDdl.lowerTableName(table.getName() + historySuffix)).append("(").newLine();
for (MColumn column : table.allColumns()) {
if (!column.isDraftOnly()) {
writeColumnDefinition(apply, column.getName(), column.getType());
@@ -202,9 +203,9 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
protected void createWithHistoryView(DdlBuffer apply, String baseTableName) {
apply
.append("create view ").append(baseTableName).append(viewSuffix)
.append(" as select * from ").append(baseTableName)
.append(" union all select * from ").append(baseTableName).append(historySuffix)
.append("create view ").append(platformDdl.lowerTableName(baseTableName)).append(viewSuffix)
.append(" as select * from ").append(platformDdl.lowerTableName(baseTableName))
.append(" union all select * from ").append(platformDdl.lowerTableName(baseTableName + historySuffix))
.endOfStatement();
}
@@ -214,11 +215,11 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
}
protected void dropWithHistoryView(DdlBuffer apply, String baseTableName) {
apply.append("drop view ").append(baseTableName).append(viewSuffix).endOfStatement();
apply.append("drop view ").append(platformDdl.lowerTableName(baseTableName + viewSuffix)).endOfStatement();
}
protected void dropHistoryTable(DdlBuffer apply, String baseTableName) {
apply.append("drop table ").append(baseTableName).append(historySuffix).endOfStatement().end();
apply.append("drop table ").append(platformDdl.lowerTableName(baseTableName + historySuffix)).endOfStatement().end();
}
protected void dropSysPeriodColumns(DdlWrite writer, String baseTableName) {
@@ -228,7 +229,8 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
protected void appendInsertIntoHistory(DdlBuffer buffer, String baseTable, List<String> columns) {
buffer.append(" insert into ").append(baseTable).append(historySuffix).append(" (").append(sysPeriodStart).append(",").append(sysPeriodEnd).append(",");
buffer.append(" insert into ").append(platformDdl.lowerTableName(baseTable + historySuffix))
.append(" (").append(sysPeriodStart).append(",").append(sysPeriodEnd).append(",");
appendColumnNames(buffer, columns, "");
buffer.append(") values (OLD.").append(sysPeriodStart).append(", ").append(sysPeriodEndValue).append(",");
appendColumnNames(buffer, columns, "OLD.");
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaHistoryDdl.java
+5 -3
View File
@@ -32,7 +32,8 @@ public class HanaHistoryDdl implements PlatformHistoryDdl {
String historyTableName = tableName + historySuffix;
DdlBuffer apply = writer.applyPostAlter();
apply.append(platformDdl.getCreateTableCommandPrefix()).append(" ").append(historyTableName).append(" (").newLine();
apply.append(platformDdl.getCreateTableCommandPrefix()).append(" ")
.append(platformDdl.lowerTableName(historyTableName)).append(" (").newLine();
// create history table
Collection<MColumn> cols = table.allColumns();
@@ -126,11 +127,12 @@ public class HanaHistoryDdl implements PlatformHistoryDdl {
}
public void disableSystemVersioning(DdlBuffer apply, String tableName) {
apply.append("alter table ").append(tableName).append(" drop system versioning").endOfStatement();
apply.append("alter table ").append(platformDdl.lowerTableName(tableName)).append(" drop system versioning").endOfStatement();
}
public void enableSystemVersioning(DdlBuffer apply, String tableName, boolean validated) {
apply.append("alter table ").append(tableName).append(" add system versioning history table ").append(tableName).append(historySuffix);
apply.append("alter table ").append(platformDdl.lowerTableName(tableName))
.append(" add system versioning history table ").append(platformDdl.lowerTableName(tableName + historySuffix));
if (!validated) {
apply.append(" not validated");
}
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+6 -6
View File
@@ -389,7 +389,7 @@ public class PlatformDdl {
* Return the drop table statement (potentially with if exists clause).
*/
public String dropTable(String tableName) {
return dropTableIfExists + tableName + dropTableCascade;
return dropTableIfExists + lowerTableName(tableName) + dropTableCascade;
}
/**
@@ -422,7 +422,7 @@ public class PlatformDdl {
if (create.isNotExistsCheck()) {
buffer.append(createIndexIfNotExists);
}
buffer.append(maxConstraintName(create.getIndexName())).append(" on ").append(create.getTableName());
buffer.append(maxConstraintName(create.getIndexName())).append(" on ").append(lowerTableName(create.getTableName()));
appendColumns(create.getColumns(), buffer);
return buffer.toString();
}
@@ -503,14 +503,14 @@ public class PlatformDdl {
* Drop a unique constraint from the table (Sometimes this is an index).
*/
public String alterTableDropUniqueConstraint(String tableName, String uniqueConstraintName) {
return "alter table " + tableName + " " + dropUniqueConstraint + " " + maxConstraintName(uniqueConstraintName);
return "alter table " + lowerTableName(tableName) + " " + dropUniqueConstraint + " " + maxConstraintName(uniqueConstraintName);
}
/**
* Drop a unique constraint from the table.
*/
public String alterTableDropConstraint(String tableName, String constraintName) {
return "alter table " + tableName + " " + dropConstraintIfExists + " " + maxConstraintName(constraintName);
return "alter table " + lowerTableName(tableName) + " " + dropConstraintIfExists + " " + maxConstraintName(constraintName);
}
/**
@@ -619,7 +619,7 @@ public class PlatformDdl {
* Alter table adding the check constraint.
*/
public String alterTableAddCheckConstraint(String tableName, String checkConstraintName, String checkConstraint) {
return "alter table " + tableName + " " + addConstraint + " " + maxConstraintName(checkConstraintName) + " " + checkConstraint;
return "alter table " + lowerTableName(tableName) + " " + addConstraint + " " + maxConstraintName(checkConstraintName) + " " + checkConstraint;
}
/**
@@ -663,7 +663,7 @@ public class PlatformDdl {
* Creates or replace a new DdlAlterTable for given tableName.
*/
protected DdlAlterTable alterTable(DdlWrite writer, String tableName) {
return writer.applyAlterTable(tableName, BaseAlterTableWrite::new);
return writer.applyAlterTable(lowerTableName(tableName), BaseAlterTableWrite::new);
}
protected void appendColumns(String[] columns, StringBuilder buffer) {
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java
+8 -7
View File
@@ -21,8 +21,8 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl {
*/
@Override
protected void createHistoryTable(DdlBuffer apply, MTable table) {
apply.append("create table ").append(table.getName()).append(historySuffix)
.append("(like ").append(table.getName()).append(")").endOfStatement();
apply.append("create table ").append(platformDdl.lowerTableName(table.getName() + historySuffix))
.append("(like ").append(platformDdl.lowerTableName(table.getName())).append(")").endOfStatement();
}
/**
@@ -33,8 +33,8 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl {
platformDdl.alterTableAddColumn(writer, baseTableName, sysPeriod, "tstzrange not null", "tstzrange(" + now + ", null)");
if (whenCreatedColumn != null) {
writer.applyPostAlter()
.append("update ").append(baseTableName).append(" set ")
.append(sysPeriod).append(" = tstzrange(").append(whenCreatedColumn).append(", null)").endOfStatement();
.append("update ").append(platformDdl.lowerTableName(baseTableName)).append(" set ")
.append(sysPeriod).append(" = tstzrange(").append(platformDdl.lowerColumnName(whenCreatedColumn)).append(", null)").endOfStatement();
}
}
@@ -55,14 +55,15 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl {
createOrReplaceFunction(buffer, procedureName, historyTableName(baseTableName), columnNames);
buffer
.append("create trigger ").append(triggerName).newLine()
.append(" before update or delete on ").append(baseTableName).newLine()
.append(" before update or delete on ").append(platformDdl.lowerTableName(baseTableName)).newLine()
.append(" for each row execute procedure ").append(procedureName).append("();").newLine().newLine();
}
@Override
protected void dropTriggers(DdlBuffer buffer, String baseTable) {
// rollback trigger then function
buffer.append("drop trigger if exists ").append(triggerName(baseTable)).append(" on ").append(baseTable).append(" cascade").endOfStatement();
buffer.append("drop trigger if exists ").append(triggerName(baseTable)).append(" on ")
.append(platformDdl.lowerTableName(baseTable)).append(" cascade").endOfStatement();
buffer.append("drop function if exists ").append(procedureName(baseTable)).append("()").endOfStatement();
buffer.end();
}
@@ -100,7 +101,7 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl {
@Override
protected void appendInsertIntoHistory(DdlBuffer buffer, String historyTable, List<String> columns) {
buffer.append(" insert into ").append(historyTable).append(" (").append(sysPeriod).append(",");
buffer.append(" insert into ").append(platformDdl.lowerTableName(historyTable)).append(" (").append(sysPeriod).append(",");
appendColumnNames(buffer, columns, "");
buffer.append(") values (tstzrange(lowerTs,upperTs), ");
appendColumnNames(buffer, columns, "OLD.");
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SQLiteDdl.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class SQLiteDdl extends PlatformDdl {
@Override
protected DdlAlterTable alterTable(DdlWrite writer, String tableName) {
return writer.applyAlterTable(tableName, SQLiteAlterTableWrite::new);
return writer.applyAlterTable(lowerTableName(tableName), SQLiteAlterTableWrite::new);
}
static class SQLiteAlterTableWrite extends BaseAlterTableWrite {