From b4bfd44b8706dbde49684deb663d88127ed4742d Mon Sep 17 00:00:00 2001 From: Edson Yanaga Date: Thu, 19 Dec 2013 17:19:42 -0200 Subject: [PATCH] Fixes #601 - checking also if foreign key name is empty. --- .../java/com/mysema/query/sql/codegen/KeyDataFactory.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/KeyDataFactory.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/KeyDataFactory.java index 8ac524c7e..1f28c08bf 100644 --- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/KeyDataFactory.java +++ b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/KeyDataFactory.java @@ -77,7 +77,7 @@ public class KeyDataFactory { String foreignSchemaName = foreignKeys.getString(FK_FOREIGN_SCHEMA_NAME); String foreignTableName = foreignKeys.getString(FK_FOREIGN_TABLE_NAME); String foreignColumn = foreignKeys.getString(FK_FOREIGN_COLUMN_NAME); - if (name == null) { + if (name == null || name.isEmpty()) { name = tableName + "_" + foreignTableName + "_IFK"; } @@ -106,7 +106,7 @@ public class KeyDataFactory { String parentTableName = foreignKeys.getString(FK_PARENT_TABLE_NAME); String parentColumnName = foreignKeys.getString(FK_PARENT_COLUMN_NAME); String foreignColumn = foreignKeys.getString(FK_FOREIGN_COLUMN_NAME); - if (name == null) { + if (name == null || name.isEmpty()) { name = tableName + "_" + parentTableName + "_FK"; } @@ -132,7 +132,7 @@ public class KeyDataFactory { while (primaryKeys.next()) { String name = primaryKeys.getString(PK_NAME); String columnName = primaryKeys.getString(PK_COLUMN_NAME); - if (name == null) { + if (name == null || name.isEmpty()) { name = tableName + "_PK"; }