CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-07-06 21:05:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #603 from yanaga/FIX-601

Browse Source 
Fixes #601 - checking also if foreign key name is empty.
This commit is contained in:
Timo Westkämper 2013-12-19 13:59:47 -08:00
commit 543162b99d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/KeyDataFactory.java
View File

@ -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";
}